From 14c8a516901605d83ffe1507109f5cdbebd75f17 Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Wed, 18 Sep 2024 16:28:01 +0800
Subject: [PATCH] =?UTF-8?q?ICON=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/views/LiveRoomViewHolder.java    |   2 +-
 live/src/main/res/layout/view_live_room.xml      |   2 +-
 .../src/main/res/layout/view_live_room_part2.xml |   2 ++
 .../res/layout/view_live_room_part2_item.xml     |   2 +-
 .../res/mipmap-hdpi/ic_live_part2_gift_wall.png  | Bin 0 -> 1442 bytes
 .../res/mipmap-mdpi/ic_live_part2_gift_wall.png  | Bin 0 -> 848 bytes
 .../res/mipmap-xhdpi/ic_live_part2_gift_wall.png | Bin 0 -> 1987 bytes
 .../mipmap-xxxhdpi/ic_live_part2_gift_wall.png   | Bin 0 -> 5930 bytes
 live/src/main/res/values-zh/strings.xml          |   2 +-
 live/src/main/res/values/strings.xml             |   3 ++-
 10 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_part2_gift_wall.png
 create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_part2_gift_wall.png
 create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_part2_gift_wall.png
 create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_part2_gift_wall.png

diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index e406bcdf0..6f0775a87 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -4399,7 +4399,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         newWeekGroup = findViewById(R.id.newWeekGroup);
 
         if (!TextUtils.isEmpty(giftWallLightenNumber) && !TextUtils.isEmpty(giftWallLightenTotal)) {
-            if (isAnchorLive()) {
+            if (isAnchorLive()) { //主播是礼物墙
                 View view = newPart2Flipper.findViewWithTag("giftWall");
                 if (view == null) {
                     view = LayoutInflater.from(mContext).inflate(R.layout.view_live_room_part2_item, null);
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 98bb329ea..548ac0ab8 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -1776,7 +1776,7 @@
         layout="@layout/sim_live_room_anchor_say1"
         android:layout_width="96dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="190dp"
+        android:layout_marginTop="170dp"
         android:layout_marginStart="12dp"
         android:visibility="invisible"
         tools:visibility="visible"/>
diff --git a/live/src/main/res/layout/view_live_room_part2.xml b/live/src/main/res/layout/view_live_room_part2.xml
index 796c390ad..401326a48 100644
--- a/live/src/main/res/layout/view_live_room_part2.xml
+++ b/live/src/main/res/layout/view_live_room_part2.xml
@@ -205,6 +205,8 @@
         android:layout_height="match_parent"
         android:layout_marginEnd="10dp"
         android:flipInterval="5000"
+        android:inAnimation="@anim/anim_marquee_in"
+        android:outAnimation="@anim/anim_marquee_out"
         tools:background="@drawable/bg_live_item_rank"
         app:layout_constraintDimensionRatio="2.4"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/live/src/main/res/layout/view_live_room_part2_item.xml b/live/src/main/res/layout/view_live_room_part2_item.xml
index a3e0114c4..cf91794b8 100644
--- a/live/src/main/res/layout/view_live_room_part2_item.xml
+++ b/live/src/main/res/layout/view_live_room_part2_item.xml
@@ -20,7 +20,7 @@
         android:id="@+id/newItemImg"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:src="@mipmap/ic_live_week_rank"
+        android:src="@mipmap/ic_live_part2_gift_wall"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1.05"
         app:layout_constraintEnd_toEndOf="@+id/newItemBgView"
diff --git a/live/src/main/res/mipmap-hdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-hdpi/ic_live_part2_gift_wall.png
new file mode 100644
index 0000000000000000000000000000000000000000..d903cf237f2054de95ccc60c0b8d574f879665e9
GIT binary patch
literal 1442
zcmV;T1zq}yP)<h;3K|Lk000e1NJLTq001EX001Ef1^@s6SLDKP00001b5ch_0Itp)
z=>Px)TuDShR9Hu?mu-kuWe~@IbMM`&ZnA-ik&%{Bq_tUC_(3b87ZD>dq?Y<pZi2y<
zrU-oyHG;rCxr%5eNqvceQbHr~C1cynR;bMNgOMRhxLD}AyXEfPd#0V|yxeonJ!e(u
zVK4XWJu~zC=RY&g%p>Hj&$P%)UIEqsWjxk1UAE`S$6u(HIK^sUCCUIw8`EV^p04B?
zJ*lmf*nxukGy?r>V1~RkDv+}}j(&E~$cy|7wt*@h!z`pZ8%REgZasrAMLZvaGiHCv
z8k*(ZTp%ZOy9i6wl)_bX%KMoiPiN_k#)Qf+s4rogi$gLV=w%5H$j&;0$8`-i@D2kY
z;u!GJ+sES%?w4uT2jXYlLjwz_L~72YW5hx;KpPLrmgwy-x{k4|w-6X*PB4fhC7{Yi
zX3Cq_2jaNiBf}g}m>l?$&=>Hu!eVC2F1oZ$N^DMqAe8pm_>Bf0p;>yeL3HUt%IubM
z4SA4ExWsaa;5<{cki^#*kP>JGWXQ3f9o_<ru;hm*(06<EQ>DbC!cpy^z@(89j4Z@+
z3JLPTl!NSy<4FG$=0b+3Q}g2)IM(1C=n#%*FG5r3ahk5snEQ?cN@2=mYLr@b_KYEq
zlR~Fn0&dKe52{1dMJ9`kY*j(iI(4iSK&u9#Lwg0997XYn#$zJ2+=zCJQ&c-j;!n}D
zGaG~;^1^;JCLD;v+J`Vc%9v3obot>MOeSDf0>ougVT{tt2hlAY((foT$IRbdvJm+n
zw^xh}cX|i^yRX!9D4LK7#X=TL&x3&i^ces<Nh|CWzR}z9SZ+l$rIBUcU|>JCN%-hW
z&`*r0T+_hPV2m@9i5x0G#p6VOiSMa$nGzd<v{OMuZ#kyw_14adpjSAVA%(%Jb3}_E
zV+wvq!!_u^6~E88q#sv6tYR#55l}-|cFDMDV4f^T{e2U$o%n;Q*H>dA^r|e-dK;{~
z116TC>k_Oz1)UdtS!4CJsjzw)Oen*zeX!yL9J!PVp@qjhsM0>TKvskfBtSHEs;YsA
zg`zM*=eoOKRjT!P3M;x{+Zp)cA$aEI`iy?|N7&mFD{Hgc;PRl|TbKi4T!*S&P9|hy
z5zajY_MKi9g1?5~*0I?owefdY)oo2Cb{bnVtI*D(91t8-r9WwKd<ibkuXV-IDmeYF
z{j>w2R&CaITqPTbVcN-Kf&;4bB~29tHa0_B<|L2}DLh#h9fjS0CVH?^LL3v%<uS3(
zG2ss|v1OI8cMd!;>DqZ{ISQYi^UFCnaQ%)P<OGZJKzx-7M|`RphOM(<*;N?1Qib^)
zaM%*kdP8t>8W86~5!Ax*d>)8BNf23`bM3wG_I=rmoWBAso$&32Xc$a(JOfljTu!v)
zf%r1TM5>7eeS?;%@X4Gckh23Y>ub0$7!5CBYJ`V;#DoL!QXYt10f<;eWDX}D%$)@L
zpM<eR==vMx9YQY-`IJYqMI1(m*`GJ_LCEK-+JBXqAp}^3$0x(XH^IlJ;ru_YHP<C|
zYBKY~QDGA=i}fqF5>+4{sWqnBAb2f9OyF&3C@~slrH)m{5F1!hyF?}Df)Di=!mOy5
z=M9QJ{OB%{9t{(KQZ~e&E8n11HfJ)y2fCUD-lGz`?1Xm+Yu{eLTu^V3*Xh_BK$8s{
ze~k8^WzOYQ>C6W4zTSz@iAP2|s^>PMF`O>~uOlY1nf!?c9-~#FvpE?K+h?1;fU*^(
zDd^IP`$AZziCHm)&xI$j96c))go_NbfY;?%T%{g_z1^bIM=r27@=ZugE}^D>FAZ~|
wHg~3ftI3;24`ueTwEh;B4dU8c#Q!4sANTb~S_RH%WdHyG07*qoM6N<$g3+L>F8}}l

literal 0
HcmV?d00001

diff --git a/live/src/main/res/mipmap-mdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-mdpi/ic_live_part2_gift_wall.png
new file mode 100644
index 0000000000000000000000000000000000000000..195a2e5ca10309d2a8787227839e8b4ef1afcc69
GIT binary patch
literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px&3Q0skR7gv;lu2k5Q4of|>X}Ifvl%riCL$wBG>Ia(926ny#hV~T51vGDIRr&e
zJO&SL2Ne-S6ci64A_#g=Arb`-k$^f8#f`*$Ify2MStgS%ef_%A-El!g>(brtReklp
zdetRFtwkN0SWJTR2svN}wQ@D)6MQ_^brjf--~y|um2A{cVnJE0AxQ_qWXz7sbD)`e
zxfb(#sOwP<kf7T0EAR+qIdkM=;1>r!)EOwxJPn{E5Qcf|!RJb=x7w+zfI~P;$3+nY
zB}ak=>g81kRuyhiObtpuV{q9;5xW`if*^@7M3y18lA;9R7zt__Mm<OxVSw!na+-ef
z9%rTu3LSbIVF~Ix8kh}<n@QuKxW2~tuGMYg?AsNgUGtu<e``76w&oEZ98@fL{(Z8X
zaLWgWP=gDP_9yV51#BryDRV-r-b*^no0>G;<(F6O(<`;w^<cp^45;rDeIEwCIG{qC
z(5A`qJo8IRX?F)be?QV^1pq}{t4IT<7~Jf*yv(I(q><O&Au6tG#wn&t2dz2>STO;P
z%!bMooOuI#pTVSJ*fR@OR>6Z_*p!8AuYY<I<kCG<N*&8&zyqhRYeo_lTu^8zg&T`u
zTxvu-*&Zlzpsp+|`o(w9+zB5BfP@885dm{qGo<JuZ+o$!0@{}%CC2$TcKHLkr4!!w
zAs$%iqMZ5>#U5CEu-N2HHE?br694DJEN}W@^&Pb1lV3Yq<8H=}R_yxVh{9FXaC!k!
zSrnIj_Y1nQ1MYwJ+bd{L1D+TKU(gJRAHk+9jT4cRi(rOd+iUO9ZFk{m&xlf+)pY(a
z-Q=lbgMWFP)ePyd#(tCA02f(Mg&v)cboZgV?!nuy5vAc@YGy<i1?ofaDV;`|7ZiRv
ze$1uVKk;{FJY1dt^Fr`p9ZMNc5vqPM+d}xyl9)ByZWk$IJ!>UzFTF*ROkpQU_Ij!V
zZQ%$F6-W1?CrEj7c?}=AM2om#H=WQ5l!LgeLnw~mM;9PW7tCMyio@~mar@XTefBQ@
alYIkhIYK?@2q2vR0000<MNUMnLSTZD7jlFE

literal 0
HcmV?d00001

diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-xhdpi/ic_live_part2_gift_wall.png
new file mode 100644
index 0000000000000000000000000000000000000000..aeec64429ad2c99a16058462bc663037ddaae89f
GIT binary patch
literal 1987
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
VSumC9QY!!e002ovPDHLkV1m2E-CY0x

literal 0
HcmV?d00001

diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_live_part2_gift_wall.png b/live/src/main/res/mipmap-xxxhdpi/ic_live_part2_gift_wall.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8909414c9508243b49c7d5e7545ffe3f6b73768
GIT binary patch
literal 5930
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
M07*qoM6N<$f>=F<0ssI2

literal 0
HcmV?d00001

diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml
index 4da96c54a..db72d79af 100644
--- a/live/src/main/res/values-zh/strings.xml
+++ b/live/src/main/res/values-zh/strings.xml
@@ -173,6 +173,6 @@
     <string name="live_room_push_new_person_task">完成新人任務，可領多重專屬豪禮！</string>
     <string name="live_room_push_details">詳情</string>
     <string name="live_room_push_like_an">喜歡主播就關注ta吧~</string>
-
+    <string name="trick_up">&lt;整蠱</string>
 
 </resources>
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index 74b8e071a..835cdeea2 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -176,5 +176,6 @@
     <string name="live_room_push_new_person_task">Complete the newcomer tasks and receive multiple gifts</string>
     <string name="live_room_push_details">Details</string>
     <string name="live_room_push_like_an">If you like this anchor, please subscribe to him.</string>
-    <string name="trick_up">整蠱</string>
+    <string name="trick_up">&lt;trick</string>
+
 </resources>
\ No newline at end of file