From fb1d6c06881d1fae8a765aed15b00e74401372a8 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Fri, 4 Aug 2023 14:58:26 +0800
Subject: [PATCH] =?UTF-8?q?6.5.4=E7=A4=BC=E7=89=A9=E5=86=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/item_gift_without_wall.xml     |  52 ++++++++++++------
 .../background_gift_wall_lock.png             | Bin 0 -> 1061 bytes
 .../background_gift_wall_masking.png          | Bin 0 -> 2028 bytes
 3 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 common/src/main/res/mipmap-xxhdpi/background_gift_wall_lock.png
 create mode 100644 common/src/main/res/mipmap-xxhdpi/background_gift_wall_masking.png

diff --git a/common/src/main/res/layout/item_gift_without_wall.xml b/common/src/main/res/layout/item_gift_without_wall.xml
index 82c8830e8..8a01f826b 100644
--- a/common/src/main/res/layout/item_gift_without_wall.xml
+++ b/common/src/main/res/layout/item_gift_without_wall.xml
@@ -1,25 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="132dp"
     android:layout_margin="5dp"
     android:background="@mipmap/background_gift_without_wall"
     android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/gift_img"
-        android:layout_width="65dp"
-        android:layout_height="65dp"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="20dp" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/gift_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="9dp"
-        android:text="@string/instant_light"
-        android:textColor="#54618F"
-        android:textSize="14sp" />
-</LinearLayout>
\ No newline at end of file
+        <ImageView
+            android:id="@+id/gift_img"
+            android:layout_width="65dp"
+            android:layout_height="65dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp" />
+
+        <TextView
+            android:id="@+id/gift_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="9dp"
+            android:text="@string/instant_light"
+            android:textColor="#54618F"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/background_gift_wall_masking">
+
+        <ImageView
+            android:layout_width="22dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:src="@mipmap/background_gift_wall_lock" />
+    </FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/common/src/main/res/mipmap-xxhdpi/background_gift_wall_lock.png b/common/src/main/res/mipmap-xxhdpi/background_gift_wall_lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f10e9bcf172fea82d9b77b07ec34a4fce7bf19e
GIT binary patch
literal 1061
zcmV+=1ls$FP)<h;3K|Lk000e1NJLTq001ih0027(1^@s6;)`=z00001b5ch_0Itp)
z=>Px&-$_J4RA@u(noFowRTRg6|6YWUJ&Y`EP!PS9$X;4zVh?(m>99$qlOPHjIFO>q
zBnQ&KXjC}}M@=%a2W8RY7A0vxq=JwXJ<LqY5b0qn{&6mxdp!4^eZI3VeIMODyLYes
z-@miIz1LZL?ISw2h&T?o3RnW13!DL*3hV=R16zSNfgwqMbeT@Q4vvW9fqQ`Ez*z}8
zUjeIu7bN|jV1I;3Pp}bj9`F)yK@XGe1Qtr#(ROTW*oe3VSPz`scCwQFufW}sHnh=b
z1sf6bfVY5SYbH4eYy#}DZ-ME+g@DJLSYv+}SRm=WRN!RTh&UVATx_1Q{?EXZz;lx9
zu@NmIP5|yJ*7lT2_g>&KNnfV`w}E{PxVa+w8L&vwH%*g8#F@bBz{M5YS0&xnG~WG5
zun{o__^=}AjdF#gUs5KrO++}PS;rx++~!Gozey(*)*IoDl2`yUBz@U5LCvzTXFmsy
zF7<7YbZ3)RBWy%W0=}<ol68`nHi?hc9}&+3_m=t(0aGRYHkM`z>`lNM6_KkYebfQg
z5#rs-`1z8m{~KYF0=o=&wlwMhFh$Z|9bk_E90|%HZJ8u{eAJc#`zY{ONnx9$i+Tke
z9v2bYDsRA5k{<2~yROIqhIKYex-tXo$3R)<X-N-sg{^LeT(F-w^p)V&N_ubtHp4O)
z7tdDL>{dy$GQe&DE-mRiBkBIG%fOq!Nz8EDC&`(Arxp=60;d!rj!HWuIoIetbaf)i
zJh(B=W}dH;+~C1R#8E|7wb%(or^nAX*e8koz((LjzupxQlYv)&YxB*MU1<oo)v!MN
z-IZNFzu<bq+TC6T{ocZ`&iV(UO~8)V&omyM^?A)jIloG$<pj?O>uStHfKL*KBf_WG
znZQ%PbvdAO!8&le*x|@BqD6#DP40K%(y8Twohj*y(MTd<2H=dUTq|e|o&)wL;B-lU
zj{)mA{$ov@tQBw$SVK%}fOW$3L)W|`2dq7Mj-*{<c=mj6ywuv-XgWDyt^J6kC&qw%
z+%~O#^BUt^u&&ZvQs>=>a4FxHAijg>)N;WZ;$=yTYC@Oe?}AR0#o(N<8ztR70sDXV
zZ0+4ZMD*pFeMiy}8>wGm-<EX!plq;#g54zPhC%VHujuCv3hbwnF0X<80Jx^#-eA7B
zJ+1r!L~%;k1Dw=vu;y6<tdR6)Q9oPhzjJ_EBWG?f%=8_w-8pXJ7aqyaG9IwWleaaT
zfNkrsRQrMRtZ%nxr#{_(Xg6ffde{0Z3V%G-ug%B(x&K~(M1%`yj)(J$f?7Y+Y|Z8u
fjlXqREot{ZOc~Hy)*8<Z00000NkvXXu0mjfvY7qo

literal 0
HcmV?d00001

diff --git a/common/src/main/res/mipmap-xxhdpi/background_gift_wall_masking.png b/common/src/main/res/mipmap-xxhdpi/background_gift_wall_masking.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fbe45955e43667b415db0ad18be6ce0292b16f2
GIT binary patch
literal 2028
zcmeHITTfB}06v^Rk!BFBC`Ba8c*xO<WKCIW8oHL6m!vY(UYzAoikMDCJXCY#mX%Gm
z)NpfMyyPu+6jEVU^QGy7iP}*)sd>XAGUL)t2eRk>0#D!f@I8I|E|1buB!P?|1^@to
z$w>+6yJ!Xg3Z3q^%Z{}$zU%@;kuHe`y2iQd0O0>7IUz2yOoq=GJ4jl{m|gp>RTD4l
zV#6<L3lsPk0@E+{Bgk5wI$o{OL`I$#9SVQ4c$oHDh=@dq=fmRMwM_TJQ+I|}%Z!%Q
zyAw+q{+vQqGjZQlPYk=@W|!kLqMfK{%icdY1(p;M(`|xE?AzWEw}*+SY+t9#kHBce
z_Bb+-D#p&{iwAKI$~!AsA*jMw>=V=t5zB@Gv7oa6A(uf@Oc<=7c?R)QF1GnRDw}oA
z=yhw#f6`WH%y!L7_7#X72dolwL`6yCJu_t=bQ6fBnAmKOl5xznsLb82TX9f@Ntk;T
zYs~(l%#zj>6LzFKm-SQ<F3*6O2<h>9ua=cc$8yP$kN7OawEW5#sx#3TT%#gHt?^o$
zjfZ&oVm+>hQcI#e(jT<|+!(-BKR&luZlhbZQRuc1q;?S<Ej@GoFcE<X%ql;T1Y@xp
zqWLU3{bZ~tIaXR+9n0r;0#nB+`FaWnSNDLK_0$JH{peJ1l#zCc&1wktiG6PPvf*or
zZwme&MsB{i7hi`g-<{I!BPRlK9-AcSg4h#1YS>Z!@kSvkH99R!996IfnV@&pInKGP
zs@$9pF*lR`1Ed@+-TLJJk}pST3l?V$<o!s*bu+BvuG~52D3oolq;ADw6X?Rw208su
zIpiroUm0qc&MV+R78Z(DeZVIhA2{5Ic0hdZx-y0X2h+Jm33&@O8aIdER^1G-RTQE-
zQEqw3QTcV6ryqZB<!v?f@aCNx$WmR<2tCJOvQKU}pwNZe(lJ79z#Fx~jo$%91d3Ri
wpPyM3n0xKZh)x%@qXIenZ7bxBaWv`n<lg9uEZNuN+P!ZeIWZ-nD?U&27r;l=CIA2c

literal 0
HcmV?d00001