From f03a1a4eb12f812f83013971fb3c5e35d8e4e7dc Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Fri, 12 Aug 2022 10:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A8=E8=8D=90=E5=B0=8F?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/build.gradle                            |   9 +++------
 .../main/res/layout/item_main_home_lives.xml   |   5 +++--
 .../res/mipmap-xhdpi/icon_main_rest_spot.png   | Bin 138 -> 1191 bytes
 .../res/mipmap-xhdpi/icon_main_rest_work.png   | Bin 138 -> 1607 bytes
 .../main/res/layout/item_main_home_lives.xml   |   5 +++--
 .../main/res/layout/item_main_home_lives2.xml  |   5 +++--
 .../res/mipmap-mdpi/icon_main_rest_spot.png    | Bin 138 -> 1191 bytes
 .../res/mipmap-mdpi/icon_main_rest_work.png    | Bin 138 -> 1607 bytes
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/build.gradle b/common/build.gradle
index b00b2e9f6..dadb2a096 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -172,12 +172,9 @@ dependencies {
     api 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     //gson解析
     api 'com.squareup.retrofit2:converter-gson:2.3.0'
-    //rxjava2库
-    api 'io.reactivex.rxjava2:rxjava:2.0.1'
-    api 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation "io.reactivex.rxjava3:rxjava:3.0.0-RC5"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    api 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
     //loading样式库
     api  'com.wang.avi:library:2.1.3'
-    //黄油刀，注解绑定视图
-    api "com.jakewharton:butterknife:10.0.0"
-    annotationProcessor "com.jakewharton:butterknife-compiler:10.0.0"
 }
diff --git a/live/src/main/res/layout/item_main_home_lives.xml b/live/src/main/res/layout/item_main_home_lives.xml
index 15ddb25d5..cd50ff499 100644
--- a/live/src/main/res/layout/item_main_home_lives.xml
+++ b/live/src/main/res/layout/item_main_home_lives.xml
@@ -56,9 +56,10 @@
 
                 <ImageView
                     android:id="@+id/tv_live_ico"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
                     android:layout_centerVertical="true"
+                    android:layout_marginStart="5dp"
                     android:src="@mipmap/icon_main_rest_work" />
 
                 <TextView
diff --git a/live/src/main/res/mipmap-xhdpi/icon_main_rest_spot.png b/live/src/main/res/mipmap-xhdpi/icon_main_rest_spot.png
index 8a542ea4415ca5760670ba25baa1b3d6c43ae03a..f558843543e92388703064cc43a3d27d16caf6ea 100644
GIT binary patch
literal 1191
zcmbVMO=uKX93QhKB&k9yNZ1O^>qr_~obQ=UX2>?#&Ft!yZW`A`7xduUnYYQXJM+ew
zm+mAK94pdP55{`&V(B-Y^w@$2BdF-D1uaxPh`sdI+EB32*1k!yX%9h42WH-T|M&m>
z{@?TA^wi#MeJ}Sh4707Y&#ch3KY4q)>34AD8Kg^^6l&xEZjd$%5R<cU9f6VyXHW$}
zd;ZuRG{!KgIj349wes7Bg<T#dI(+2%6wNSW<B<=oCL*AYW*jfe{(SWs3miMk9@5HU
z*`GwS&c1~J9axyES_@4}x7qPG!B}Ka0v8boBDdv*MwDe&c@4Tx!~zReRY)_-t~pgJ
zPlHJuAdulj&Jx887}0qtqmF3G9w3XdB#5#gX`Cb(nrui4Sbtb*EwCF##VoGdqNgl7
zONeg>Lc87O+X|0^89~x@J>igLj%sk>yhmWfdEu@OgNZ^baD3um4<wARj^{|0rJk;Z
z;QHnA2C)~eCyJ&_h@dY>yePPC64$DBNGj+bH#XG{tMfh*Dk#Krfko@l*wq2k+&$k=
zqDZ|l-U%F96xcGcHRmFal*}wkZ+P3WjrxeHAl+(knqt|U3L6SHsv()n=%aEyqu32y
z9qsUJhR>^-EJ;dUEEY9MDwsJ*%bPh-S5>_r6$%^Jk{1%_S*T;%p|;ntx#wby$pAru
zgDS?YP8UqiVuHh2>;qZm6|lPuEyqhFuP0Sn3))11^DeTB0d~P^nhj?Y7yeuLYk2$r
zrca<w2}!T~t9Lpg+K|b1V-o0LW0sId2PmME@>=fuQ*_F1m&{x>x?g{I?f7_VDDFLT
zp{M`rEl-BPUt4Yt#NYJ3@j+MZ+o#tj#s(ID|L(?bpN<YLo{u9gGZ3p+Zhe+c|B}1+
z!sk0d-;I^{!nq!-<nNt+b?4HH+Qk}EIUKj*!Swb=CtGoMy8F_Pr;GLLf}Qe~;BwYZ
zWzNCngLdjG=E?9&>dCuP6PZUl)Kh;B=U0wjx_{`W6FqNz3@83bpKUB1*?swotzFHy
z*1P!N#M8e1XWfslOuYBX;^9w%=Kha{zWgB#mYEqm+!lZBI-2}CN`)!&a{lQ1e*<34
BgZ=;j

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDUbuaMQj}6Q>wTlF*VJ`{t
z3uc(0uwcGGKdaJCbD)rvr;B3<$Mxg{1@RV3N6AO60d1B&3o~4{tz?+>nMr2(72Quj
ORScf4elF{r5}E+>cQ1_q

diff --git a/live/src/main/res/mipmap-xhdpi/icon_main_rest_work.png b/live/src/main/res/mipmap-xhdpi/icon_main_rest_work.png
index 9c763f30e302ceebd0ca8198d0d8c043e1f75994..e46b7cf39eeefb17103f078d27cf08f12e8840f3 100644
GIT binary patch
literal 1607
zcmbVMTWB0r7@ma~ZDJ&tASH=*oFHD(xo0;!L#FL!XWI;Q)|f6Dp%2cUIkP)tXU=41
zHnYitZBtZKLW_t($&+pKP{BtVF(|b$PZcZ`ygY;|J{F3I6iT3;*&C^}UOLRoxqbil
zU(Wyk?@Z+n^>ht%5d_hrO{&v)?2W%iI`MzcA9oBq?D8gG3kagSFa8q5nU&oH@z8)>
zm<ea}7iEAP#xPM4GBwA;Xo48uU-Jww3q!I9OSY>}H^2CbB5hNlUQOzp?qy-wo?P_d
zk;QxgEY1SSr1tM4$7?bsaA0VVHK*bRa!sM?yfU80+bl)aA>ph-WnzWoj6OwXkq^lf
z!_k1_QskJ#@Tt+Uq_~$9IDuz5f#s7l&&x?c=0&pkP*|I9TJp4du&E2L6sjDCp3JgQ
z6fu#=Aiu=&k|f0(f<R*g9W1z^QKQ{pxW%Bt0Qj~S+Q=niMx%(Tp+aFx8!k9ro7N4Q
zVZs4pYlg@23>Ujp2b!Rb^QwNOuG|DHtUw34VSurG8|#%(h=MY@4|V(aE(JKWy581t
zPg@+Pts)3>^Vp4MK<<eS3JV@&r(uAqK7hG-Z02z6jVEV)XoScwAXI5x)Ktr4QV<xC
zd`>rj?Z!?#ze5D7MhF!O-<v>lX_^-bJSXFq6GphS%yA8<j!fHHxDPbR-37%-V;Z6H
zuV53%7V;efyKFl~39_DBqR4h2<t(ZoA1lVzi97eTY<9{=mR-RI!StaCQp;siyp&4O
z0>jtM)pc2OgV1mR)KrDS;bCmsl#64dB9wqdCq-b=qlP8Y=_C~Bl#~{VDbci~(R52*
zMW7ldK}+8JpYkvHHZDS=^1wWCX~x+jPuc;#*M(;B9D#GqS;Z#n2_qXIE(C=FaRxw>
zYHr&P9DxRHREC)JAM&CB3y>8?h7U6(9IgM5c`P=cjf=M73Hx^^>t{O(yamTyBc8U~
z6<)L(9&~Y+^Km;<*NYvv6<*WSOd-8|{+g1%e4xMMIy*$1Ilc5$B1#N&KX%|$|6E7c
z?V;m+s(X6v;g2V@jl|vy=Q8g5U(Z4yeR%BP&sJp3Z+&_3?0egry({0}SpNMjwEgy<
zZ~oxTAAk9o%u=-S<mcY<v*)V29=|fU;SHp<<R$5q6W?{t9;HV5#-rYkwACAj*KU%`
z+~DBRTin{aJ-5kIJ#Q@T-rnroqddCrr;Bq-=M&DA{=Uzgr?)!Y&0mIBYa6SX^-Cwq
xAAEA`#IKjvujj8`80yY_D{g=Dn|w0=W8&<{3tKgC^@+IEYq`Ao>BQ?xe*uI#3LgLf

delta 121
zcmX@k)5SPJqKJi=fq~)e-A6${N+Q4~#MQmPNAj1Z#D5K`Um61c6@Vm=EA>lLNYBk5
zsD`~H$S;^-g2DoU`TfBGiF`mIDNh&25RU7~2@2vnSRExFwFb0V_AJbB*|w5l)?+3a
T_m84>KvfK$u6{1-oD!M<1UV)?

diff --git a/main/src/main/res/layout/item_main_home_lives.xml b/main/src/main/res/layout/item_main_home_lives.xml
index 83b92968e..cb54ba095 100644
--- a/main/src/main/res/layout/item_main_home_lives.xml
+++ b/main/src/main/res/layout/item_main_home_lives.xml
@@ -56,9 +56,10 @@
 
                 <ImageView
                     android:id="@+id/tv_live_ico"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
                     android:layout_centerVertical="true"
+                    android:layout_marginStart="5dp"
                     android:src="@mipmap/icon_main_rest_work" />
 
                 <TextView
diff --git a/main/src/main/res/layout/item_main_home_lives2.xml b/main/src/main/res/layout/item_main_home_lives2.xml
index e77be7e73..feb152592 100644
--- a/main/src/main/res/layout/item_main_home_lives2.xml
+++ b/main/src/main/res/layout/item_main_home_lives2.xml
@@ -56,9 +56,10 @@
 
                 <ImageView
                     android:id="@+id/tv_live_ico"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="5dp"
+                    android:layout_height="5dp"
                     android:layout_centerVertical="true"
+                    android:layout_marginStart="5dp"
                     android:src="@mipmap/icon_main_rest_work" />
 
                 <TextView
diff --git a/main/src/main/res/mipmap-mdpi/icon_main_rest_spot.png b/main/src/main/res/mipmap-mdpi/icon_main_rest_spot.png
index 8a542ea4415ca5760670ba25baa1b3d6c43ae03a..f558843543e92388703064cc43a3d27d16caf6ea 100644
GIT binary patch
literal 1191
zcmbVMO=uKX93QhKB&k9yNZ1O^>qr_~obQ=UX2>?#&Ft!yZW`A`7xduUnYYQXJM+ew
zm+mAK94pdP55{`&V(B-Y^w@$2BdF-D1uaxPh`sdI+EB32*1k!yX%9h42WH-T|M&m>
z{@?TA^wi#MeJ}Sh4707Y&#ch3KY4q)>34AD8Kg^^6l&xEZjd$%5R<cU9f6VyXHW$}
zd;ZuRG{!KgIj349wes7Bg<T#dI(+2%6wNSW<B<=oCL*AYW*jfe{(SWs3miMk9@5HU
z*`GwS&c1~J9axyES_@4}x7qPG!B}Ka0v8boBDdv*MwDe&c@4Tx!~zReRY)_-t~pgJ
zPlHJuAdulj&Jx887}0qtqmF3G9w3XdB#5#gX`Cb(nrui4Sbtb*EwCF##VoGdqNgl7
zONeg>Lc87O+X|0^89~x@J>igLj%sk>yhmWfdEu@OgNZ^baD3um4<wARj^{|0rJk;Z
z;QHnA2C)~eCyJ&_h@dY>yePPC64$DBNGj+bH#XG{tMfh*Dk#Krfko@l*wq2k+&$k=
zqDZ|l-U%F96xcGcHRmFal*}wkZ+P3WjrxeHAl+(knqt|U3L6SHsv()n=%aEyqu32y
z9qsUJhR>^-EJ;dUEEY9MDwsJ*%bPh-S5>_r6$%^Jk{1%_S*T;%p|;ntx#wby$pAru
zgDS?YP8UqiVuHh2>;qZm6|lPuEyqhFuP0Sn3))11^DeTB0d~P^nhj?Y7yeuLYk2$r
zrca<w2}!T~t9Lpg+K|b1V-o0LW0sId2PmME@>=fuQ*_F1m&{x>x?g{I?f7_VDDFLT
zp{M`rEl-BPUt4Yt#NYJ3@j+MZ+o#tj#s(ID|L(?bpN<YLo{u9gGZ3p+Zhe+c|B}1+
z!sk0d-;I^{!nq!-<nNt+b?4HH+Qk}EIUKj*!Swb=CtGoMy8F_Pr;GLLf}Qe~;BwYZ
zWzNCngLdjG=E?9&>dCuP6PZUl)Kh;B=U0wjx_{`W6FqNz3@83bpKUB1*?swotzFHy
z*1P!N#M8e1XWfslOuYBX;^9w%=Kha{zWgB#mYEqm+!lZBI-2}CN`)!&a{lQ1e*<34
BgZ=;j

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDUbuaMQj}6Q>wTlF*VJ`{t
z3uc(0uwcGGKdaJCbD)rvr;B3<$Mxg{1@RV3N6AO60d1B&3o~4{tz?+>nMr2(72Quj
ORScf4elF{r5}E+>cQ1_q

diff --git a/main/src/main/res/mipmap-mdpi/icon_main_rest_work.png b/main/src/main/res/mipmap-mdpi/icon_main_rest_work.png
index 9c763f30e302ceebd0ca8198d0d8c043e1f75994..e46b7cf39eeefb17103f078d27cf08f12e8840f3 100644
GIT binary patch
literal 1607
zcmbVMTWB0r7@ma~ZDJ&tASH=*oFHD(xo0;!L#FL!XWI;Q)|f6Dp%2cUIkP)tXU=41
zHnYitZBtZKLW_t($&+pKP{BtVF(|b$PZcZ`ygY;|J{F3I6iT3;*&C^}UOLRoxqbil
zU(Wyk?@Z+n^>ht%5d_hrO{&v)?2W%iI`MzcA9oBq?D8gG3kagSFa8q5nU&oH@z8)>
zm<ea}7iEAP#xPM4GBwA;Xo48uU-Jww3q!I9OSY>}H^2CbB5hNlUQOzp?qy-wo?P_d
zk;QxgEY1SSr1tM4$7?bsaA0VVHK*bRa!sM?yfU80+bl)aA>ph-WnzWoj6OwXkq^lf
z!_k1_QskJ#@Tt+Uq_~$9IDuz5f#s7l&&x?c=0&pkP*|I9TJp4du&E2L6sjDCp3JgQ
z6fu#=Aiu=&k|f0(f<R*g9W1z^QKQ{pxW%Bt0Qj~S+Q=niMx%(Tp+aFx8!k9ro7N4Q
zVZs4pYlg@23>Ujp2b!Rb^QwNOuG|DHtUw34VSurG8|#%(h=MY@4|V(aE(JKWy581t
zPg@+Pts)3>^Vp4MK<<eS3JV@&r(uAqK7hG-Z02z6jVEV)XoScwAXI5x)Ktr4QV<xC
zd`>rj?Z!?#ze5D7MhF!O-<v>lX_^-bJSXFq6GphS%yA8<j!fHHxDPbR-37%-V;Z6H
zuV53%7V;efyKFl~39_DBqR4h2<t(ZoA1lVzi97eTY<9{=mR-RI!StaCQp;siyp&4O
z0>jtM)pc2OgV1mR)KrDS;bCmsl#64dB9wqdCq-b=qlP8Y=_C~Bl#~{VDbci~(R52*
zMW7ldK}+8JpYkvHHZDS=^1wWCX~x+jPuc;#*M(;B9D#GqS;Z#n2_qXIE(C=FaRxw>
zYHr&P9DxRHREC)JAM&CB3y>8?h7U6(9IgM5c`P=cjf=M73Hx^^>t{O(yamTyBc8U~
z6<)L(9&~Y+^Km;<*NYvv6<*WSOd-8|{+g1%e4xMMIy*$1Ilc5$B1#N&KX%|$|6E7c
z?V;m+s(X6v;g2V@jl|vy=Q8g5U(Z4yeR%BP&sJp3Z+&_3?0egry({0}SpNMjwEgy<
zZ~oxTAAk9o%u=-S<mcY<v*)V29=|fU;SHp<<R$5q6W?{t9;HV5#-rYkwACAj*KU%`
z+~DBRTin{aJ-5kIJ#Q@T-rnroqddCrr;Bq-=M&DA{=Uzgr?)!Y&0mIBYa6SX^-Cwq
xAAEA`#IKjvujj8`80yY_D{g=Dn|w0=W8&<{3tKgC^@+IEYq`Ao>BQ?xe*uI#3LgLf

delta 121
zcmX@k)5SPJqKJi=fq~)e-A6${N+Q4~#MQmPNAj1Z#D5K`Um61c6@Vm=EA>lLNYBk5
zsD`~H$S;^-g2DoU`TfBGiF`mIDNh&25RU7~2@2vnSRExFwFb0V_AJbB*|w5l)?+3a
T_m84>KvfK$u6{1-oD!M<1UV)?