From f53710fdf5321cd69a0abc89dfd1618ba3efbadf Mon Sep 17 00:00:00 2001
From: lyr <15622190878@163.com>
Date: Mon, 4 Jan 2021 11:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.6.0-?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E[=E5=85=89=E8=83=BD=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86]=201230=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=20https://git.ghzs.com/pm/halo-app-issues/-/issues/1063#note?=
 =?UTF-8?q?=5F83291?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/common/util/EnergyTaskHelper.kt    |  21 ++++++++++++
 .../java/com/gh/common/util/ShareUtils.java   |  29 +---------------
 .../com/gh/gamecenter/WeiBoShareActivity.java |   2 ++
 .../gh/gamecenter/energy/CommodityAdapter.kt  |   4 +--
 .../com/gh/gamecenter/energy/TaskViewModel.kt |   4 +++
 .../gh/gamecenter/wxapi/WXEntryActivity.java  |   2 ++
 .../drawable-xxhdpi/bg_commodity_tag.9.png    | Bin 0 -> 4181 bytes
 .../res/drawable-xxhdpi/bg_commodity_tag.png  | Bin 7770 -> 0 bytes
 .../res/drawable-xxxhdpi/bg_commodity_tag.png | Bin 13151 -> 0 bytes
 app/src/main/res/layout/commodity_item.xml    |  31 +++++++-----------
 .../res/layout/fragment_commodity_list.xml    |  25 +++++++++++++-
 11 files changed, 67 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/bg_commodity_tag.9.png
 delete mode 100755 app/src/main/res/drawable-xxhdpi/bg_commodity_tag.png
 delete mode 100755 app/src/main/res/drawable-xxxhdpi/bg_commodity_tag.png

diff --git a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt
index acace014b5..0ade757c83 100644
--- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt
+++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt
@@ -46,6 +46,27 @@ object EnergyTaskHelper {
         postEnergyTask(action, null, null, url)
     }
 
+    @JvmStatic
+    fun postEnergyTaskForShare(type: String, id: String, url: String) {
+        when (type) {
+            "游戏详情" -> postEnergyTask("share_game_detail", id)
+
+            "视频" -> postEnergyTask("share_video", id)
+
+            "资讯文章" -> postEnergyTask("share_article", id)
+
+            "问题详情" -> postEnergyTask("share_question", id)
+
+            "回答详情" -> postEnergyTask("share_answer", id)
+
+            "文章详情" -> postEnergyTask("share_community_article", id)
+
+            "工具箱" -> postEnergyTask("share_toolkit", id)
+
+            "web链接" -> postEnergyTaskForWeb("share_web", url)
+        }
+    }
+
     @SuppressLint("CheckResult")
     @JvmStatic
     fun postEnergyTask(action: String, id: String? = null, packageName: String? = null, url: String? = null) {
diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java
index 3b14f7b740..98de9e0aad 100644
--- a/app/src/main/java/com/gh/common/util/ShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/ShareUtils.java
@@ -124,6 +124,7 @@ public class ShareUtils {
             EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
             LogUtils.uploadShareResult(shareType, ShareUtils.shareEntrance.getName(), "success",
                     ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
+            EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl());
         }
 
         @Override
@@ -679,34 +680,6 @@ public class ShareUtils {
                     listener.onItemClick(holder.getAdapterPosition());
                 }
 
-                switch (mShareEntrance) {
-                    case game:
-                    case plugin:
-                        EnergyTaskHelper.postEnergyTask("share_game_detail", resourceId);
-                        break;
-                    case video:
-                        EnergyTaskHelper.postEnergyTask("share_video", resourceId);
-                        break;
-                    case news:
-                        EnergyTaskHelper.postEnergyTask("share_article", resourceId);
-                        break;
-                    case askNormal:
-                        EnergyTaskHelper.postEnergyTask("share_question", resourceId);
-                        break;
-                    case answerNormal:
-                        EnergyTaskHelper.postEnergyTask("share_answer", resourceId);
-                        break;
-                    case communityArticle:
-                        EnergyTaskHelper.postEnergyTask("share_community_article", resourceId);
-                        break;
-                    case tools:
-                        EnergyTaskHelper.postEnergyTask("share_toolkit", resourceId);
-                        break;
-                    case web:
-                        EnergyTaskHelper.postEnergyTaskForWeb("share_web", shareUrl);
-                        break;
-                }
-
                 switch (holder.getPosition()) {
                     case 0:
                         shareType = "wechat_friend";
diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java
index 12064e71bc..87b2e39e73 100644
--- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java
@@ -10,6 +10,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 
 import com.gh.common.util.BiCallback;
+import com.gh.common.util.EnergyTaskHelper;
 import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LogUtils;
 import com.gh.common.util.ShareUtils;
@@ -154,6 +155,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback {
         LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success",
                 ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
         EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
+        EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl());
         finish();
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt
index 064f528cf6..24c3f7dbdd 100644
--- a/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/energy/CommodityAdapter.kt
@@ -64,10 +64,10 @@ class CommodityAdapter(context: Context, val entrance: String): ListAdapter<Comm
                     executePendingBindings()
 
                     if (commodity.tag != null && commodity.tag.id.isNotBlank()) {
-                        tagContainer.visibility = View.VISIBLE
+                        tagTv.visibility = View.VISIBLE
                         tagTv.text = commodity.tag.name
                     } else {
-                        tagContainer.visibility = View.GONE
+                        tagTv.visibility = View.GONE
                     }
 
                     originEnergy.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG
diff --git a/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt
index 4fd8fceff2..a66c16056e 100644
--- a/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/energy/TaskViewModel.kt
@@ -12,6 +12,10 @@ import io.reactivex.schedulers.Schedulers
 class TaskViewModel(application: Application)
     : ListViewModel<TaskEntity, TaskItemData>(application) {
 
+    init {
+        setOverLimitSize(1000) // 该页面不需要分页
+    }
+
     private val mApi = RetrofitManager.getInstance(getApplication()).api
 
     override fun provideDataObservable(page: Int) = null
diff --git a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
index 83dd66911a..cbf327d454 100644
--- a/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java
@@ -8,6 +8,7 @@ import android.widget.TextView;
 
 import com.gh.common.DefaultUrlHandler;
 import com.gh.common.constant.Config;
+import com.gh.common.util.EnergyTaskHelper;
 import com.gh.common.util.LogUtils;
 import com.gh.common.util.LoginHelper;
 import com.gh.common.util.ShareUtils;
@@ -75,6 +76,7 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC
                     EventBus.getDefault().post(new EBShare(ShareUtils.shareEntrance));
                     LogUtils.uploadShareResult(ShareUtils.shareType, ShareUtils.shareEntrance.getName(), "success",
                             ShareUtils.shareEntity.getShareUrl(), ShareUtils.shareEntity.getShareTitle(), ShareUtils.shareEntity.getSummary(), ShareUtils.resourceId);
+                    EnergyTaskHelper.postEnergyTaskForShare(ShareUtils.shareEntrance.getName(), ShareUtils.resourceId, ShareUtils.shareEntity.getShareUrl());
                 } else {
                     if (baseResp instanceof SendAuth.Resp) {
                         SendAuth.Resp resp = (SendAuth.Resp) baseResp;
diff --git a/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.9.png b/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..12dd6bfc0f56ff515f45ec05135cac496a4d7806
GIT binary patch
literal 4181
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.png b/app/src/main/res/drawable-xxhdpi/bg_commodity_tag.png
deleted file mode 100755
index d839a1a7b138f20bafb2346b5fd2ba989c90090b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7770
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

diff --git a/app/src/main/res/drawable-xxxhdpi/bg_commodity_tag.png b/app/src/main/res/drawable-xxxhdpi/bg_commodity_tag.png
deleted file mode 100755
index 5946b055ec5f60966f11b50515d5b677c294cdd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13151
zcmWMtc{~$t92QAMmQ*OLTm33a?ihulT$PG)Oes@hSZsEZA_?hQ#0aI_LUU~+ISQM(
z&&|2HXSNxe@#~NG{l0&`@B4Y5_j#Y^`+Z}tI@#{nzHhsXjLeS9b~e}l#gTu_ZtIqR
zJ@?+~y?<d7{JO1`Od(BkT1G}+<Fd_#8^}%NY2f^yv$x*&4sf>WU6I|E@&4$sN6^Pd
zO0o{v+_NjrIJ^6p(IrLefJwk5+??Io_ZQn@<q!S#wz+W9C+Eo3ffM^2S7IZepeDlw
zJ+@golsr4Q->ITr(rVhI>C+l+$raPqX(W+F4P|XpIw@Vc07I|N_fi*^mX~uNUXb<d
zMr_Oy3>zLU`AQ(sDVKTs1-y;$Jzof&;`j++S?b%us+xM_ilbE0)k{b&O0gv)DpxvB
zzV1W$hbb2jJ#sKD$!gx?!0Cd~Yo1D^56e9yWA)k&eDdlb|2shc;G|Mc`Js<27#mU{
zP#g;JM$yfu8AEq6=)%$NpaF>;WQb>X>21ed<o+8LNCn}rwpVY(cM4@`9!lZRDVTYG
z%YRc9dsfY-Gk&F%DsWSe!ua1rV;DWnGbm~1LKUqKiG92iK$RjR2^+15*|zZ#5p{Ao
z&e)$N>`IdpEy!<<(M!FAz9x5d%7J2+-Pnela<MR&4BbHflGw5I*o)1{;9KO%Xnlp$
zYt>X?qtK69!p%1%n&q$~z{6CL!E7#B@(Sl4Ml>x!krYtqOIc@F`X+|gfTVZ0Va~iI
zhHFe-D`H9WLZlZoHonJ=PRb+X^s1)rOg;YDvy^EZPkl8dI^YK;ti=gZdI?@L7a=YU
z63^B|od187J_WI9{jh9s*#to(`wd=qa>Z{${oO5c{NkhWLYVZZfT^=K&^9)Lc2bB6
zShLW<(J4?mI#cu*Jd{YWWO5h6)7310FJInhnF4eFSUkl{u{cE=XYO|NhB9%ZAS}NH
zwnk&MzoV`%tqzj<S_#d*+DtVo(FgjM(&+NP`_qODM2feoOtKnm8>$v3fRrJynOM;k
zUiJ0|Kcp^2)icc&ZmT^E_Yc#a?_qppBEm^7;^w>nim;n8?oqM(5MAOaRRoOAS5O6)
zn>G$hT|6>)b7v*~zWfCI*K{eG@WMzW$^|-a<62aQ6~_1w=Cw7>t@TPsi~@=Yg-j+>
z)>=htdmP1R@pDl?)?%g-tzS6dS)BT2546%<`3srysz-n_>Zu7fku_RA#jQs7)aRI)
z6zL)PgZ3<Q_?4lW#3ke{tJGEddVD*k@awNNtK4IIm9va_m9F>>()t@0Oe8Mser`p<
zysDJ;IT<d(X5yRN_c7%Z5~L?;ukYNVljD}cejS~&zG$?*ja+UX$Xvc)thI+4!(Rq%
zjHM&Pr320s%=#)q`!*r&vf9xFs<=XHq45(!0aTc2G2)rhQd1w-kb%&p<521#*Cc(-
zx0}n-iHMWVCDO4b!5^HT@-UBr7miGbASSP7t|S=B;ongCYDM@ynPKgh7L5J=L_6yG
zaJ=8bwQ4+zno`ZQ#2~Pk*6ygHUm`l9qlTDZ?AWq!Qx^%(6k*P$U+WHRqfuXJ1JH(b
z#^HyfB2cO6@*(446q6ZeLn?pLAGTrD3Zs5J)PMw>-SS$`vpLDv$uPblwtKDy<=%qs
z?e6iPC3~!%^jcJZMTve%v~}pPv!)*W2>$Rpr3c|GkY0%Pp}sbD?V)22Fj`mbEU`xi
z{g)vqx@Y#nrb$oYY6Em#ZOV9KTKa_>IG(H}(iT4Sub>O+#EK!3$7FCd9(%w5mTy;r
zHuyQ2qJTRmGW#y<pT<;j2I)9D;2*3fSudsY0GC&iYrpbaU6xHmqcvNV2Tb$6LE9Ek
zL8sVX691guMvr<&9ru3?E$BB^AWRY4<Vb>8oORmlw=G`$dYRz2583%$cG%-<%2~q|
zZCS>k)oSUERK!#5lNl0+2~QaR04ng)PI!dTPz@SI)0b-NUJD;2Rr<V|#owkJIL4b<
zLkTRdt}Z%>wzIc=E95ESab{*wx&HT?ORs%~{2Ck-;U_1dcz%q~okk7cciRsaan6PT
z$G(+AWvrxvYgW8tmYi6ugjYE91Au*<A%VfH^Y*<Y*QE^yNkBy*tvN5&PY@|+)MFZf
zAp+M<UL9w=Ukx}CQ^ia;7=Yz1?W}~w#1MC37N}gEHT&uD{;O?7(Vtb7TgDd2EMO1?
zpI#I3;kVRjq#`HAhdVL$S`=7I7knkfa&!cbESY<r(>%H9kbV1%ye7#tnD;$733#3~
zkJSz{Wl=<nA5@};-}hmnCyyRT9ks`^D5#CF1qZ%;)fCCqL}cN^n+ZN$yPgdANuSdR
z!ktmOD`t=;O*MS+`^M(f00uQPB3b*y4?V4BVLef+3h*tX7}_Gqf->pdQElqv(<V7j
zEijKe8hT7^lM^-`#JEDQF5V|+18fDvTw8g5jxp~%T{^xv7W2&dH-hV6A-PdBB{|UX
zef>rv2l>9pFRte*V*LS5@h@c6%ZmoG05$zu=`)o()3a&m%XK7UQE7O|>ppr%bVR9v
z2;=qA<kQaw$VARxmB(c0^d>~mWa+1sw$XEHw--kyx{YH7;S9yO)G<G?Y+Bxs#pH$Y
z8~9vvaxEjWtEqDPfLxVK^Jh>iWz<U$2h}9+;@DvG_uyFN9a?4zt(aGf9w@X`dnG!M
zOn9NK*xLe~{mko!4>XmEdB#C$teXYnpZS5VPZ0NNYTu)F#HE|Bu~wND8%>Fz?0ZSB
z=S&sR+ftwrIs#G>d59TXDNIoZgK0RG$<zd5>$W~GA5*U2c5TfR6vn>!(TyCeofex&
z6LiN3>!jvVoarR0S(Pl!^jD9MNCSv|zBSzgYJ0HZo-SP$8O)EZ{LVw1$T3rqXoD4>
z3ef3wCvOdj%{IJXSUy-pV}-81qD<`WFO?AVxkpp37NMHY5zv}`825$BUzF=>+R~gf
z7|8NyXHeOJmO1`iE$upx0;8ulCpdZEQ}<K*(YNaMU>^pH8vF<yl*p$qaY<cQcF}%^
zIE7-O9P@-S_Ep7~-y7)A&?i6MezrWYM85NJ=MT_pkGdLx=v4v9k=!+vU*#blo!29*
zlOrK)GaEe5sl>hSz#O2+zFSJ+NaB8uo?ZVcI;3<WuoKxcQsyl03T4`sb+sbg6Q_Y<
ziH_#}=k}wDg{VA>mHj-JWf7Gws@~vQPFt$b)58XAFY!X=LcINHqnn37p<da|Q6T!l
z^Cu#DJniu!O&&;p$<W2FmKo!8g9IboW!nsWbZW?qcvk^eH-1uQ*T{UO)}tCl8<^7i
zIdAmB<T``TN=v>5R(auq4aFw1&xqP}xn+G1Tx+_D*FX5^ai3{ML~ZN_4DC$R{a%K;
z56^_`4Gh4d>Fl}cLvwbA)|d_Cea{t^8S7={To*}BFZx>8v$1OGj#2!tNrce2pCuse
zb8D5|t@odi?&Fe#hjFtX1XH>>?pw1j-u|YaJ8e&PcPN-Bg!W9G2)R@`D_{6T&`mQ_
zANk-H8;2{8Cxs`Dg>Tfz41DocSt)T&A+v(6Y;OPFR4ZG1i7;^APV4~VH`Y4917DX*
z?+QF>(!M?CCV3I}^8v@dPHn|$ir3dkjl;5j$u4P!Odkjr<B}xjM>2XVXA>_3sXCy|
zdz9R-76EMN06OlPB1)vVI0=~rg3v9Nqdy>5K-Ws=2BnX0=M(hQuD;DpC;Yy5`^awB
zOmW0bF5w5}jw_5lwRL}DtJjq8#zA>^@z=PJempA%i#Fz?Bgswd7x!P@3zeiHn?C)-
z)Ty=UOZ8$-1X|Ga)$+@?o#mQc_W!k__&qSi8_5(f4aqZgxjKPPiujzF;1RdH-)q}D
zPC^~zA4~O2w5O6szm=Jl6Ng83ADQXY%7>6?ciNLdwRxA^$*TvWPLrqen|YRQQaoPb
zYA6}hR!k=nct6nBP+Q1F$;qnSzaHKn@_5o6fCq~;a_>t_xH7_J)*(L_pZ5@)bbo$O
zQ#S|k-$q6YM-_Fa+qKt?dMOBA8aI1yw<$XgE}G95T6<p%?_QNZB_$*$a^|8l$~!<=
zBD3Lh(<j&LAZx=OteN1AzJbD&tD3n~(H2Pjd+h?^B4#6CABGxZkJ~sove8ZL9)VyS
zrru5X&@#X_q2FugOI`<Si&qpC{FP0?9W(p#U_;_J!}W(z@OS&SD>vyhc9G-Ix%L_?
zJI#)K5yf7_()Y#3{#&aVzD!9)Ar1P3J~is2N6GW!Dxs!6uQ>d;a+e^<3++$8Fy>Yz
zNK5RjQQYoiet9^KBDw1le;S6!XBKOhI%6NV9!8%g>j8q?qcRov#Ze;KjimHw;#c`6
zJ4c4|T!$nq;qs8Tkk{xh5So)$U9N6OFjVQPW$%b3rrFa^qxaeV-Hk8~Wrs9mcUxrH
znWgf$l<)o(m5Nau@S=N;*O#ypaD`Vg+%K$f>?5-9@NJZPPD%OsXko>8;Nzj+C%I>-
z^4Esifm5<I^ep&j%HF`EX#9QV&9=4zPs0L<;uo&pf`$}V)V;GQM|P92YA%ZYnq<8+
z6_X`)5s!{mpE{NZbUed<-=~UOd}*K9Jv914UoML{QQEYAas;*l`6}HDC=VWz-uv;p
z=7?};!Ac_n-`4VcD|;W~Z_7L`;p4=4TPX1!9~FRoVDkjb-ZB&}I$NZFql;5$>rRGm
zJv5jS`NuXV8~qB3T)uENKC39K$xi9>r*OLuluAiUhM7!gpqjOQ71H!Z*9#+{WU;;E
zmTc$Z*>5p2{Nb&*ky1<Zv>Al*Ptjc3=<kFsPNu@$m;$x?pkj8c@VdY99dvHLMJ)KP
z{2b2RUsc9pQ4ri-Pdq;nyL}?j@>w`~^+Ive<lRCSRmcw$)hD~0i1$7iiQNuOZgW5W
z`*0q0dhwH1S5%MMs5vGC<10PJAYpP8+Ao{P)3=(VIY!9#g<s^^z9%NZvu|OJ{L?2I
zorZ=*RL<>(75)v($xP_``I{D$wmsEN=O6CV;aFc=JLa9fBiy(391A-gi^jWOf+Qlu
zlc7r5)y195dA3LRaGQ7#YK6ALOL(3zE`R!ys69OG;=H-cF6^4(;yh#)U;kx8f7jl|
z*YbC`5Bv}j{Bp<D=z$xW*vjEkURO=0J{f=hiQ5<B8n<u{JcN7qE{X}XJJ*vP-V1CT
zg-Pe4Ks&G>Lm7$ZcchpSq^GZE4Xu29yOy~pl<Sn3O#C$DbIS{7+lQX-kj{qo#+*a=
zOq!BRow<-Dio4!Lt}~hZ4ZYEsvbxw834jXz3@+*(RH+)ATptk!MXR>;eA+qIvmXL5
znCGs2O!tzM<_O-TQDrG)X|3e>fi5>joZdT+&(XBH(26MTrf)v+unIxWgL`+DbLrkj
zCh*5<^uHRLdu{&&8mCJy&aBVhMCkI{6QKrh=V$hhwc*c`t#^OHteL@=W>iO0I=3dR
zZO(1dlE1~whL5)8PsN|cN{|Mma7R_>#=__369v!jnmjVm`ES|@0h|p4m<%_lWO>iW
zJC~sWQ{Zk_5_aU3)3)&Pw<j;mhHsjE2>$riM&3L(#viP1TIL<(yGc!koeGIar(y{5
zUh9If_OXwM6osbds4MOl3CSNW@>H7NxSje_VDh(L^fg`aL2ZN1M{D+(Z=i>yY8~;b
ziaXFv$kfJ#ZZRrpe9xbYP~1MGd3W#7-zJ1@rI0T>X>9R25H%~y3hxr8VlCSTq4TuV
zM_f^iWNvPik8Slnu{=lHeyQ(<L{Vl|fo^(K(f^8-*8sDr%3#C+fK}R;zP?8D{+&~-
zmH5d*v4$cY6X6G2VA4js>qdF1etw+Ii;VgbT}-3-qjB?}IL_9YZa3A7*{#!Y6Wspp
zJZlLoov!u*7k+S>M@xfTEzxH?F<_?!&eI|X?s1+c3t!vsWgap!=w~9HFM*pBFxsRd
z=`#YnANFuwZkwmib*^0GTSUmq$&(pqdj9L$rt2s?zUk5OKnfyUz$}0-(h4V4t1SW&
z(CO{m>Tb?)AR@1+bd@fkV@5o2IE^14F4o(&LqSyGCo!<?=A*-whny1jvXyj<k=hdl
zv8~g9OTi!2u>0c${77`~__n$y+mAN*1vf$}(U*FCb}TAdy#<^)^Qeq2SdPgkg=%eH
z{M;myE4}CY9r$Zl{Yz{bU;tF~YC*2aw8YzP`4w02ZBXYclOMUps9#?aN+4_Qs9{Uu
z$1W18cUNgH)cc7g<C8scmAiQ*{ioK<!>i3|)76S&ugU-w{+SjlsEx7W&A4n*tTyr;
zyw}A#Vti9#2J0zh{ox2)Jv-k9v|I1lK1Ziax#uqbq2P+UOphKDrB0OT&hMruX{Pa>
zB!S<mq8eRmdkjd102Q4WbOwB5qV!!#citq18syX6r4|GPpk=!C$2;zz7MU@tZNVDS
z`i^Juy@Wn#Y@<HZ<VyQeCH<aF_%I3naxh&!i|Y527@Z(gakt0y_IeZ`%<2Ntzd4H#
z+VM~SAx6j7*?sCR{_aote9I)CvCH9mkL85&5-CJ>m%i+@@ZU}1Y{A~jQ%e2gc^@z-
zc@7Ct3a!nBQ7iV(0JH;F>*Ep!60JA!VzoP3zaYahMRV$O?MedVT^SP^j?6dE!28~m
zvow9?=8pa2I$Eh`J&SMvo{9;%T-d<QWHgB&VzI-k<a!!mJ<S;@A<GEKNr(;R!?7_k
z8pL~G%u37t=;+*UT81|Ay}Y30G}9;AsTA-Sihw^nMGp7tz!<kYYs!6(@DRqk1K5Z0
zVGniZp|X@L;rR2BeH<_4j+!$kwNp=2$BzZ+GYSMbt`sE)>zIH;6hhp)A~y@okxI8m
zL9`wgrz#<6p<kn8z*TDXn~j8QiRslqFbfe(GSt~{nlO%wquofwR$q$$>o|n6p3h_K
zcJ~_ja_a&ZoqXif%H(rf=kwzLKw9<sxrv}!Bkp1Bsl(^s9yTn*hTGW6En{ggvQ;FF
z`G~&GA>a9gdpP)&n@nUSy$vnu>V8&4mBp<W5D;T(NuOyaclQu%1{EWddT%CG)fkQT
zs4c8qO2otm1Azj##^0_6sPd5JlLoV<>b-Q`;cXVB=-e-b+P_wG!3S21&im*hmDkzR
zjLPLx*EX9lUEJ<YG+ut<OPbU-v)UOBU+m8T-xK)-G8Is8LK4=^0UFXhe%nJOg)9Hz
zPF<7a!DaY?ye+>7$X<8#8gr9l{~>|KZ&>Ic?I(P$7-jNn&u4WH0k~degqY%8uQpXJ
zA636iq;DwP`20e(H(cduDv9(?rL!{C?NuS_!$YQ8cevsCYN0kES@LEQppj8+=-B4a
zF=Ov3IP6(_1!%^?@TLoeHFH25Ioka|F!S<SmCpQi9t$-d@So9hh2UN@gk^0jS#?3Y
z3|o2dBA#xxyxwtu|Iec%Td`(MjAP<1agm+YO848oTxua69qCN<0#qzT?u9NZL=m=n
z4IGZWyDw-?!?V1&k#O(T@s-oxaGP$KxNq|Q_@dc#SMdX@?Oo%0?`-NWbrAlhd_+`z
zbh9tKzjAO8+D5V=o81o=l;TBxWytvtRiDjzTTDvTqe)L)&KP%^1&AVtqw>ckCgH8m
z-N4(r+O_g@!gQK0&X{4<!RF?L9^2DqIMsiK;&2aBc9EUIHC^M(6HV#2C*N9j*WW%u
z?}*ZBbEWHv#k;c+8oR7md%*BZcA1A?m$-8cHzSR9nAigXokCw~asd#ie_Q&&9OEq<
zz+K8{*9-k--@hXJ5`BP)#(gE?8(sFTV)4f&Igj+2KW5{;;Yadd8KKRPY!b-;>?EAR
zfD)ivf467{bVVG`7xNU%3T#1!Z?NrdMJ5tk81dB&+Ch=iraaaF`7Pc%Gg==ynZ~-n
zey|`oQZwZ<fvvf^tf2Nn8F#n_RG@}nH#YtJIMv6`CRD9|E$K{gX0A`#HxzmCbe_OO
znOfM@m+Y^{IQ7ZW_wEE=$+2>Re3#kA5r-HntBB+sn@n<{8cR_`9ghd|Bq$);fYG<o
zrKXJ4Dz4k~l&)(JxrhF|*P`R8kg)#49{LUP-xjpOxIHX(hS_Z;_BKeLA|EbLM=OLp
z9LQs83XA9TsLu}x8%};au@Wdfn>kr3&@#}s`9U(VQ*iYHBRQ_lno46GgPgBLx6#XY
ze<GRbTXK>-+CH@IJ8iH%ZqL+rqg$Ki1@Avxneho19$*aWgbLYr9t=FlN$4vbt#;~M
zwZ{KDDt&d2`y%57$AERWGbfcgWhzE&#+6Ppc0|lZa!h{*LD`MBD4jIYli2`FSS0;B
zsNm1dXQ(jaYl$<XPlMmdRPPC*oKaOq)I_N`6sc?xUQe)fXD{6QeZ+LJCHyPMnNb#G
z`$NEl7{=hRk+P65eVW{lOnk*1McH)IF4G3Kye^pwd3p~K;jX@)(<%$Iu0)(y>sWaI
zGrst^g(y+`G%&IM_x6t^PF!yC=-jH7f!oIR7cr}-is{&<O0|@uoA<|U)dD+#o3R=?
zuFh+qxL^G->$#(0I<pq-=$}uPsng_-n4gr&P^BAIUg;%v0Gwe$ki9b0;Bv&Ma=b@_
znRMxCTp{NT$u4#Eknx6HVm3VX=S~d@ohDzwZ5qpVGST-h_SyC_JHQY&XqICt$y*@4
z(BV3HEt~724m^wxjmVgZ+^!aPf05@CxO$~(|AE<C>D?u!3g>|$z4n7el&VYD`0iJe
zep!yGYsK;NV?q6wE*8YrMW-{#(LEQfc$28hw?=jbe7|2*E~K>)c};m+;`JQWe@Lb3
z&4JOm{q@tnQ_CqH^K3F{QtpZ_mTOrl?(?c>{ae?vcQKdBu?`Hm7kYzvLgF(8K4)^)
z<UH6N_SksbkaEaGr!k_+^tH&Di&H~($As*$>;!=TzwXahNNbvA0=%d){FZA&s7s7T
z)t9lOw=Df5F1w^p@!i|+f}d%3)V*APqeQG5+#2qzQ0@CNh5yuEcCW=blV2+zox6Ar
zb`Pt#w3{qXzwXXm;I9b^n%Dh1FkfR7c*#ugK5<uEb6sAz>Lb>d9T$;lgHz$%adMtt
z5?P<my4!Gl;cg_&g&ynCk;&xNM+=QUI;y>LMW$-wS)0!0NC>G_lKp!bq8vL5!IHB-
zQ$?)Z5e{wZG$vyB799XiER$d5EFQkFSmXYt5)y*^aQ+CRsT^pV*Rv|WwK8zwuxxJf
zn1>13>&01Onokk$+S4#Wn8hKJpHVL6AJMYln6DO}^#5fXYyjpG9fk1`AC~U<%`HvO
zwSm)vO<9_@0&g3;D=(OzVpR8WT8GDco=krpv{k_;SYsR47$nZ;6m;*PHEJC71lH`G
zm7@mqzr~E^?n@JuUNHX?+UUHxax@sU>PbJ#JZ;gv>(jWU!qp+(+IdLuW6yI0?Eqms
z)4GS5c-P;g>O(2MVoJ2Wv#sE~`Lz{WM(R{}bf<Al<2f(8P#?9b_OKHE%zY2+zmaZ(
z&&nLUlMtDoeoyr@ZMa$AXW3QD@5qsHl3;E~8X4dkJl=4W`y+ZqmssEeTk{R303!8^
zv}N1dbW)iCk{kB|k#Jzj(F4CkTgu6zRA8~0MxtgIyR%ftv6``iY%FOi`T{ZA-}hF#
zbo%5ZyM_qZn@@6n0G=5+us=sxR9!mr&E?a|+9-EC*6XqK?HLr!cANPp+2yTsggXnR
zb(8J0af?GUvB;&266n>h6!c)$K3;q1r7P~;3z?)9<o=l5V7)J@OT;<?k;whRMxMSP
zB=0jc?|mpv2=v}ta*wP0CMiclI^rj&GoGG%rf`QFEo0^6!Ug4Pj++aTwPrjS4+p=C
zTizIB5qx6nkF$x$r=|rT!q9uN8zaijbg`MXj^c^d<zc1Tt_#iuE)`<h6ObmiXb5Kz
zh{|Y^EnJ&=m7Lx~-m*n9H;JG@HtpCfcxvuzJ((LIo0PgTu{&Munv-Aw#@+t=aKLn2
z*|(TS8Oy~Qb%tq#9bcf!YC(U#AMA!abTx2tZc34H$5-tf%jyzYz8+l8f>>vQMwS^r
zZT&@IUI}9lqGuKqEW}Hb(+1_0Jgt|zg8aMX(y^AGU0W0avDJeb|ItHse=`2ybK1Il
zC1_*v?US%MOj(aa_5rxk-hI(z81h||b1Ww(M*7FnBnYd}kPOj1CM+H0VbM|{-?esB
zZz>4-%~+<ZztL-{7J6CyecR-@Ev!mV`RYlX)1(r&TfE{lR||>4H{x(gZ(K`YYK^$k
zUbUe>w0=7S`CT}#*|~u7y@(GFe)008mh+P5GpOIF^n!!L8vKS<ggMiOH&(27^bkMn
zk7%@p_?a9rB~roG%#|-`Pe-1#ZSv++TAIQg%;iLB5oS%h!9yg!$zzn>sAn_2;O#wm
zD!VG7cj~OEGNy)^4-ZE~q;ZccRhX7wzxYrfzeWzyWY6YmCpi1wfxP<oxhJ|)I+Wn*
z=RQ4jZbu$7uPbN8r<HL^ZMLIGjZel4fBU^?+fgu<Nvi8_fpm4~fDfV+w9`U6b3&7@
zpHck}%VFrlamSw~s}r9Bs<gT3nW+7U^O$G_3T?!DI$UQ48>#FmE(k?WpH?&B>Y<Kj
zCtNwEpz2nGl3~|;dhm<!Hl%$iS(RT+k<M>hUS78BO@F%m<K(zQe6#h-?)a%j*&ClO
zJx=_BdRfr-(`S*Qejh!}+YP|^-!D`dqRoM7*7~b|`JH9%shmC4#~dj>-oYgflQAUs
zj6boh?*q1f%P71*8+SXqv5-SlJaUnRb}{BMm&a77e`D0Ff}_ug?!l$Aq9cw%ET|;b
zt*YE|$eEX$rbV2aklG)ZabfNEsJ4AJq88d?&5_2{AK}2w!gp{&zfy&8kZ?`|Tt&B#
z+>|0}g@>kY?{wv8VCsB+bzO}=|0UW#)m9;DTCU0Q=yG<?CWLbdiZ34)%s)7q<wksM
z`pUfC8Nc5Z0zodCA+n9ar@(n_t>wp2A?7Pjblj(|4TU^<>m;z)`Fs;Fs#G=TPL8cs
zh6Megm;!vk9{D1NO<&FxNz<no@8c{^4z`<a_GLKGl*xlV^;{g=R?Y}@M)mpo>^?!E
zLX4BZbN7yHi}=a+w}t*TM*QC;IVs+a)~V?4(VgRArn18>o?w;7vw89xYxAxG*V=PE
z%`dHI8!Fo;CVMZdYz;rvTJBguc@;vao2xWmK;21uh^=^!=xb1oe;(t3tt|P7bq6wh
zHhQ{C2V1omhLv*=oQ;I+wx?#@oBhtO!-rklaZt;1rafSnzqJ`v=20J9<(q^UDY-!6
zxQHH{T3u^rl!j>xVe?3?K(CQ767nXC;YKwBPPMtf4Bq~}+qS4VBaG}`{U8o5tB$VU
zPO;p9T?3!!=?#c$UU6yPK&|im`b+tTYP7*h*R$)Pcp1N7tKbAn&ElChz-qGg=)mlh
z43D8eKD^VSO8|dW?#4i_#+E)-s)9YBFRLrVzszFqjXt=fVCy@tGOT!}I+wZHgHSt?
zw1c#-X+F79a`9FiBvd^NSR78eU5jWLnt_r=++n3FXJVoXB}pvd<VQRH*Bn5!0*cmo
zyj^1b+S&A7w;2S?>d!c?vJ(a4{#RSt2?O+B1OlI$3J<e=EciFa9nGsLWX$?f9EU0w
zHbqg&2D_aF!p|@+Knuo{WUN1#Z0=4)h}D0GnCM&xTDX^@-R<(WQ%5j?(;b9yBf_`s
zHU>|2f=`(z(sB-olqR!Weu(<R4UgFlYNb!J9tH$07tus9A1l|Nj!r)zxvWf2imlIJ
zr#TWIm9Xkr;L_?rD?p+xm>g3V^_DiQY*5YQ48B6!u#WdnwraIx?H``|%$(|#MFYhp
zCL-6n{~;~3*OI*23Sgs^1|2qD+DTfLXep>@V~T(ake={US3Y#!YAP$6u&L<w;P2(Q
zoBxCoz;+u}nJ6^eJ!JnnuaX>*fAf0o0d$4#$0=#EFxk^3<{oeEK>NHw-d#2gB(c@p
zHfzrGK^y$pgG~?GtxfqyR6bu_z^N|Ty;_TD!|gfFDLmqBnt-SD2i$E3rGBFL&RhR8
zDf@LS+(aX0;s`e4LPJ4OVAv(E1y$)B{V~8S`%y$-i0S}B<uq!g$Hs=)sck40qZZP>
z`K~T9y>Qz7tNVHGekBol`8y3w&RS|mpVy?%jRc|f>KS{?a{1ZZL~V2<8}|{E6+Vsr
z5Yu9;E?}2!7d<Bdlwson%zv47%znb&i)?pS)a4<>w8&y{5N?sEKx-X6j{hllR@o;y
zFZDK?yBc8{)QR%Ad-rRd+O47%3q)Z2{?mV*{;;NdWgU~u2)-+S{_Qg*Z<jk?#;ne{
zf~^2o1|4BphGRc3Ak?Q@BS@0BFikos-A23)`|Vz=HfS}Os!ImJ&!P7IK0Gu(-Oo#&
z{Gil2AH*KZMJP`nmd?FdoqP6EoQ4K&zS4|Vr$gDB7jc34t6lb~Mvv%o#8#;tgf{0B
z8s_IUZeyTt^rwqqaDXRuopXQ_x3<7qBw3^bBJR+hyr``R0mBfv-Vqt)DbToNH#6li
zRB0X3`{;xH8x<`xGMMG~0(0ot3Qg~$B!`Mkn+@)_6ziT5p;jk*fg6C0+n!R{3G;n_
z{3jN|=i+o%-k@T2Ib*@$g6OBB5OtG87mz9c+-LDp`-7f~5S$OYzbG8ds2-|}xT@1H
zUNWPG8vg$Cz6-Um`B*VZY}N#;*bVkUbq=1-Hk^Hv-gD>5c>`i8zqN`E6*Si1E69r2
zCBzVFti;d^8Z)(npiU#s?_Eo!m|fu<dO`^K$?WS8DehxU)x~{AXj@N|FG}OGZi|!m
zNT;Q5izV(?Q^(mCn{Fdf@ITA7@c(k2um5rcyBYps1n)~D6v;Y@4sxexk#s#ywi;+Q
z3XM~`M9+7gf@YYw!|WeI12K=&hf-Vp0|DDd{qkVh-I}@~49qengx`_>m0}z8L`@p$
zYrz)Y>(R%0bFYVoFE8lYE|BNSXXZ;dL&8P2E&}VwMH)`KQ!B8MIQ$rGI!+}b+TsWM
zlLD^ya8U#CHrbF@pSKQ!ZAd2fQ&)8&Ot>3Hn}3~4EIDQh0snm7vMatUP4P&_{o?YS
zB9%a=;^Bo;nV>?Gk1OmzJ^iuLQAXB@&*m?to{1*6Y?ot<$_xp;;iQ#_e*WfJo*=1r
zI14eW%^nrLZZ-R16wj-}B%MI3o$?D^_v<*WHe?jr?dl2~OKnY+b{A6}ot@}>pWT0M
zi&Vw`9@TW^<)bHb4h+QMUf9Y70B@cAB0<9<g~9P#59M4tAtug{T^yu=)*+CIe{9L?
zrEYXmz52&l(Z@TQN5Hj;-}_(OW#0%<)kH2gI9wD;4xItdo?V>cd}mUw3hmf(w!&7;
zV0Pgu_FyS}?9JG;sy_b%QM-VVSex5YzjqoyRT?d0j?U|J0Mn71BHZ1TD6vf>qX2~R
zyYO@a`|~@&)6yG&e^{Dt<faU$fXp{_t+&_f1E04{qb3LR#n5VW!OM|`f)co{q_%_?
zHTTB$8F!`OaOIToG3M-S(X{JG;@+c_4Qq9TqgQqISJCL0;D@>W8w3nAeCQbaHOFnH
zY1NA9X+y5WEYZ%h|G7e=-KiGO7UThk+!B}Er>nfkpP*K2&xk#mdkX!Xx)fNv&5t0f
zo{4HwUMv%dLMGTMeV82Dp^W4{kBR*9ubAUk@mN$eJUzH}<X}9)|LxN8V=mXZS=pxf
z)!L_i)W^tu8^?A$AwHk=-&OkeLYA}8#{*=D!6&u%CD;o7Vzz8wcs(S6;hJGEOMy6R
zV_~D~DN=eeLqX2oA%UhNoQOn3%+|g1!c1dVyV^v!mDc<zQ0=jN&*cPS;!l*p>=WaR
zKce;pwYKH`jw@LJl5}7-A&*l%R^$wCYUn4bVP7oMWZ-HGRqMYPG3Qh*I$&1VJg(C#
zE7rh8wku1kVq^~Q{<P!l(KN<IsvWgJH(c?exw*S_^L(;AD4cNYlI7Z*W%==8ja>d7
zTTp%_;svOf^``}oSuKHxp}M_3|D?^LoB6Qb-LZ(?nlrmVJ@enP&@&o!J#s?zL;|+M
z&&i*IJ*i<j8wfm=`;fWXkcUWD&_SEGaP0R$JKZu2nZrIyD}iLGFv6^2iFXio%^d!+
za{-V5@0Pq%xE08c^&0u70-=I_A8z<o)GeUXuP<Q2Q+L^G=?h#;x!&>6rK$MYIvn%z
z3f9#?P3}Fru?rJo9-2$yL~gMUXY7w-?)}4{QlyCl*jghHiN(f;?-0AU|2p+7;b@J=
zi~0RUCLVmXOE1G9G{Rr2LI0L>y?w8LW$djZPJ1q^?v?aYnT^x7iGgPxN7W~m`@qL{
z?=3(#C`g9@Ka>Rp)ZHyD#AFz7x)_bP$IfV)Q!+(0xljmMDlaK4MN^AG#aBMe%g)1F
z$nVh{b+eo%i%+(eO&wEO9n~0}$+(dlfQpIVqhlx9E805b+WXO81ET&k@T89H&(<!e
zGIy?**quAtyczXa0A*yMu&Y{zRIZRK{j_0ZbkY<re`<tacaS6v*`ZhGa?E7fDq-Fg
z^k?$W^f<?}#o2Qs)>z5}B!15VO6Kz}G>n=74_LK^_z8W!sbzno#k+`b@j*YCE1o*v
zxj^86JFu^AJc~N$F~fvMzIDnRepfvtx_5nMSrRD1fOZ%4_l^ue4Bs(|Og~(r*L-yw
zA<gdHp96sy!2L3cBF83@S$k8`s!!L7F3T1Cv*50z@A9;-5Ps%taa`=BE{n6M0^knI
zaE#ESX3M?eW}~LfAkeodbEk&mb*9~fKDBE#DA0UCVxhD3?b`KSZiidJdq%orP^i|X
z<KDvOMiimIbU5G%uOAuuy3Opm|K++G>yQ=A;(2#q;#9;ZDE4u&U}Z=s411L!9^gtu
zKiJQT!RT#wG?D1Q%D|Up&^{MHrVy23NWli0dX;XB^<o5Lq0G673yG#DN>UM%9*Ogv
zM=JqP?&Sct#Idfa{W%f&`jWTQ_2$_`>DZbhLIeXy_q3~e1AQKWI_>Pqx+a*>_xA?m
z^AMoTpy$Bf-d?HVFr%2{u5RluMmaE*AT80_PEgWqNBiLrWLLvElDO`qlP3M2dfJ%_
zjb*$m1z#MJrhVF*f%a_PY4Mp<7A-<%^Xsjv-}UX%=IXcgTZ8eo9#6InA^>t)Xc#S$
zqxfyh*aTk|ps~8+Y<s%uAP8JhLc4M*aTjeWFTT0L<P$J1CV1}>ZKtJVn!sHf$NT#M
zkMvSiEFs<>c-|ifcL@iU8}5H4$IC~IzxzffH#rVL+*d;iI?Dj70qZ?kd9LGqGLNy%
z!#NnP`ZZCp!DgQpP9gMCXrGO5Q!@>nLBcp3@42VpiMexRz}8g2`#r8GfV(~{u#R#L
zefesnbNrT!)hvxXb@F;PBt1vZcf7Q0E7Y<k3}lL34x`(H3%UI&J9I2Qd#!QSgR=RL
zGiT6=ypm%=J)M!+mc*L1Rm){;5q>p?(z9&K6V7uek~UvL%c&~0(Kl%o{6)X_t`Da<
zTY$4H<o-hdeE6HataY?nCxNoohdBYpP5rp?rQD)q^G(reH*AzyzuJK>tbsfVAJ=$W
z=MExQo~m{dc9(ZosjL;|xMD*SW~<l1(|P{CA;4P;`8gsG^>+{B#0sX&lGxc&%bc~J
zr*de;t&a<kyzR8qUf1>7$s+Q4z4OLTxG5PE`jWDfdq5vBYIWvup-kXN^DWeB<UU%5
zXx^FIH&AUsruu8k+wrysFLiD6%H0KbKYq(+5Ow-s7r01#Y4+m7HnZS`@3t?sANO0V
z2u5ZYo`<lDx5vIBT#y`UC-f_M<ZcOA{f;?#zI#K)h9iybHYR>>O_o^4k@g4Om%Z;%
zV)9*dh;f2@qa}yjI*fm`aRLlqoai${1xeHC@&FRKfP-yazpkvK=s-q!7Zq)cPo9KG
zDZRk;=YWmc2K10NWQ{Age2@PFJm;JB=IFnqW{S|Nb@>D13*j$Bd3EZ<0xIK+KP4cK
z<l)gN^hTg$8sB_!CXSn>96#Ve|88N9e#ICaI9X#KcZkSc6qg5ovaS|A(Oz%tuheA0
z+kO;ipO1`*i_z0g##dTyPAeafX;2yxFga&VGlvkBWu=xD-z5uB<l0Z|Z=y8r)K>)-
z_m~l2uyu3LKCB@#%le=J?A2)A`Y{Pm+-NC6OB-UuYkPLWl%vv0Uu*)uQ&%{kQ<1Dm
zOb8xZl9^LnXgOOc7EtXVK!3uPwe|Ej?3c}3%jq=ZwmE8Wg=U=7%cckT0ek(*7i~!#
zlo2mKqS5|pzAttB=V>pmo~504&3QX-vHlR0(|I-1(DmmwJd-43BTnt(9pEFf?_MNA
zu?c-lCu3TJe1?_SxGVq32n~^l{ZGaFRAyZ_b>crO(~3tT#j%{4>S2+1?m7M^KgJ8U
z!jhIk@ozn6K<2B^3%%!IzYjhBLF=kZy3u%VBJjjPWvY4P{+NF>;o5d0tW~)YE(upY
z@XOXD{EUf{H4~*8{%jD1kvAwx=&R{ic-cl{+_JnZXc&dH(Rftg?4f0C?R~fSDT>VM
zUjryL_qQ1Tl-@UPO40}TX|knB{gY_)Uxf2)RDvsJ2M9ESz-b&A&={y|7|sZ%d2R$!
z{De>aaWyDoF^5m>-WUYo1t(cNF<@P4DV45|`RGZp=N%>oEY%NiYdalwq;)D19|>v$
zFGA8AlWx%+-?<!nKIVBY-3@!6?e^Bx3`o9>stDhX-m6pixph%0hbOv`p%O-8zx{jG
zO+>cW&qObz!0|w_Wx2K*80p(4{amn$zz7EOFuqf6^bk!HX-GQquRb{kwa7|5<wA3y
z&B>lHar;}jKa}n#^C3E9!RmA8zBY?S`7VEo<$UPqPh4gb0O=c)vpCBl#)7E%h(%{F
z%2JzU$;SIbk8xB^9_}-Go1ACL^R6d$7Ee1<egqhWlgu5Jz5Ys{zSAe=po*a=(cub?
z;Q(%hc52%(?)fCJeL2<U9%}e`i%@X^c<Y98|JrNY!&dy{6W$ADZ1cUyIT9Y3dzanm
zp*W|3Em|}kuCIK_r0<A?8&?Ppj)XrYy6&iO-o<}Q?d;XDo_&Zifa4vk&wwlI9r1gc
zy;^r}``en>JGaHw?eTwzGF@^347c9jwvmZ{Fv@{gNM@WV>%)-6jaR=L#%E8_EVp%n
zCag<C<seF##Zs1O{(SuLTY;4`m*AwFO_xU^;2)R|{4eH=)#;><H-6Wx$iN*OX2BQ4
zdZ;5JY;HQtFlvF{cmXZWJtT-rBfjCa=t{&~WTk!uIZ&*KS6jSJH($PkQ#)sWBjX97
zM=t1=4+FGvP}{8YpssZ8aD{fu&!y>5iYe+9E}Wuzx}Fx{^JkD-Q-f=y9+1qY@GON+
yxSOj*HJIgP2*hin8AMr6OYg+fB~fM@K$rWv6{k}>D*yeMk-2=)$)?cC`|1DaelGC<

diff --git a/app/src/main/res/layout/commodity_item.xml b/app/src/main/res/layout/commodity_item.xml
index 745f7d3599..5a3cd708ba 100644
--- a/app/src/main/res/layout/commodity_item.xml
+++ b/app/src/main/res/layout/commodity_item.xml
@@ -123,28 +123,19 @@
                 android:text="@{`剩` + entity.offShelveTimerBeforeDays + `天`}"
                 tools:text="剩7天" />
 
-            <RelativeLayout
-                android:visibility="gone"
-                android:id="@+id/tagContainer"
+            <TextView
+                android:id="@+id/tagTv"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="18dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:gravity="center"
+                android:background="@drawable/bg_commodity_tag"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                tools:text="限时限量"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:layout_width="56dp"
-                    android:layout_height="18dp"
-                    android:src="@drawable/bg_commodity_tag" />
-
-                <TextView
-                    android:id="@+id/tagTv"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:textColor="@color/white"
-                    android:textSize="10sp"
-                    tools:text="限时限量" />
-            </RelativeLayout>
+                app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_commodity_list.xml b/app/src/main/res/layout/fragment_commodity_list.xml
index 2be4604a2c..4acb6b9214 100644
--- a/app/src/main/res/layout/fragment_commodity_list.xml
+++ b/app/src/main/res/layout/fragment_commodity_list.xml
@@ -78,6 +78,29 @@
 
     <include layout="@layout/reuse_no_connection" />
 
-    <include layout="@layout/reuse_none_data" />
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/reuse_none_data"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
 
+        <ImageView
+            android:id="@+id/reuseNoneDataIv"
+            android:layout_width="148dp"
+            android:layout_height="140dp"
+            android:src="@drawable/pic_no_data" />
+
+        <TextView
+            android:id="@+id/reuse_tv_none_data"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:text="@string/no_data"
+            android:textColor="@color/text_cccccc"
+            android:textSize="15sp" />
+    </LinearLayout>
 </RelativeLayout >
\ No newline at end of file