From 91fd3333d01e86a60515e217a7c17e7e7fdb1776 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 17 Dec 2021 15:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9B=B8=E5=85=B3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2UI=E5=AF=B9=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable/bg_secondary_radius_10.xml   |   2 +-
 .../avroom/fragment/HomePartyFragment.java    |   7 +++++--
 .../erban/ui/user/UserInfoActivity.java       |   7 ++++---
 .../main/res/drawable-xhdpi/arrow_left.png    | Bin 0 -> 532 bytes
 .../main/res/drawable-xhdpi/arrow_left.webp   | Bin 234 -> 0 bytes
 .../ic_community_notice_rink.png              | Bin 748 -> 822 bytes
 .../res/drawable-xhdpi/ic_nick_delete.png     | Bin 913 -> 790 bytes
 .../res/layout/activity_common_web_view.xml   |   2 +-
 .../main/res/layout/item_erban_grid_empty.xml |   2 +-
 app/src/main/res/layout/item_home_tab_map.xml |   2 +-
 .../res/layout/user_info_bottom_layout.xml    |   6 +++---
 app/src/main/res/mipmap-xhdpi/icon_chat.png   | Bin 1154 -> 925 bytes
 app/src/main/res/values/colors.xml            |   4 ++--
 .../res/drawable-xhdpi/ic_square_publish.png  | Bin 8201 -> 9417 bytes
 .../res/layout/activity_dynamic_detail.xml    |   4 ++--
 .../res/layout/item_square_dynamic.xml        |   2 +-
 .../res/layout/item_worlds_choose.xml         |   2 +-
 .../miniworld/widget/MWMagicIndicator.java    |   4 ++--
 .../room/bean/RoomModeType.java               |   1 -
 19 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/res/drawable-xhdpi/arrow_left.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/arrow_left.webp

diff --git a/app/src/common/res/drawable/bg_secondary_radius_10.xml b/app/src/common/res/drawable/bg_secondary_radius_10.xml
index f30c12ee2..acc004b9a 100644
--- a/app/src/common/res/drawable/bg_secondary_radius_10.xml
+++ b/app/src/common/res/drawable/bg_secondary_radius_10.xml
@@ -4,6 +4,6 @@
 
     <corners android:radius="10dp"/>
 
-    <solid android:color="@color/bg_edit_e8e8f6"/>
+    <solid android:color="@color/bg_secondary_2a2a39"/>
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
index 03da337c9..de5be2e78 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
@@ -416,9 +416,12 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
             tvFollowRoom.setBackgroundResource(AvRoomDataManager.get().isRoomFans ? R.drawable.bg_room_follow_room_collected : R.drawable.bg_room_follow_room);
 
             setIdOnlineData();
+            //这里的2和4是服务端定义的错误状态 关闭排麦模式和关闭PK模式!
             if (AvRoomDataManager.get().isRoomOwner() &&
-                    currentRoomInfo.getIsPermitRoom() != 1
-                    && currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE) {
+                    currentRoomInfo.getIsPermitRoom() != 1 &&
+                    (currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE ||
+                            currentRoomInfo.getRoomModeType() == 2 ||
+                            currentRoomInfo.getRoomModeType() == 4)) {
                 initRvGame();
                 gameMainBinding.llChangeGame.setVisibility(View.VISIBLE);
                 if (AvRoomDataManager.get().isOpenGame()) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
index e3b3921fb..e6dee0807 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
@@ -232,7 +232,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
     }
 
     private void setBackBottom(boolean isExpanded) {
-        mBinding.ivUserBack.setImageResource(isExpanded ? R.drawable.icon_user_back : R.drawable.icon_user_back_black);
+        mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back_black);
     }
 
     private void setTitleVisible(boolean visible) {
@@ -527,7 +527,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
             } else if (flag == 1 && oldScrollY <= 200) {
                 //合起来
                 flag = 0;
-                mBinding.ivUserBack.setImageResource(R.drawable.icon_user_back);
+                mBinding.ivUserBack.setImageResource(R.drawable.arrow_left);
                 mBinding.tbUserInfo.setBackgroundColor(getResources().getColor(R.color.transparent));
                 setTitleVisible(false);
                 setEditButton(identityState, false);
@@ -542,7 +542,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         } else if (identityState == IdentityState.OTHER) {
             mBinding.ivEdit.setVisibility(View.VISIBLE);
             mBinding.tvEdit.setVisibility(View.GONE);
-            mBinding.ivEdit.setImageResource(isExpanded ? R.drawable.icon_home_page_more : R.drawable.icon_home_page_more_black);
+            mBinding.ivEdit.setImageResource(R.drawable.icon_home_page_more_black);
         } else {
             mBinding.ivEdit.setVisibility(View.GONE);
             mBinding.tvEdit.setVisibility(View.GONE);
@@ -686,6 +686,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
     private void setLikedText(boolean isliked) {
         mIslike = isliked;
+        attentionLayout.setBackgroundResource(isliked?R.drawable.bg_common_cancel:R.drawable.bg_common_confirm);
         attentionLayout.setText(getString((isliked) ? R.string.already_attention : R.string.attention));
     }
 
diff --git a/app/src/main/res/drawable-xhdpi/arrow_left.png b/app/src/main/res/drawable-xhdpi/arrow_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..66cc0fe15db6e0a76990614b64dfce35a7fa0c9b
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq001ih001ip1^@s6;azdS00001b5ch_0Itp)
z=>Px$&PhZ;R9Hvt*iB9XF%$>z|I?M;f-YT7xe80a#jnJ~jVo{94x=KVqHeiL9|tf2
zZlP|pretb}84~Ecj*v{(wEX7Z*Xhd;mT1rtSy5tR?N*s=nJiEqu&gRrNs^>NL<azF
znE4{4RH7fSTCKJ^8jU*E+T9fR!OZImhs}UGV}qH`7YaKC`oPSG0PMnG9dtMxJ^<L6
zK;?qEb;N5ng+2n<mV}C9r$9T*d=$F%ljS0oY!;M=+Qyh;38+}IDf9`zmQO+&DuQ*;
z!C=rOqRp7l+}JFrwYJso_fMp@UZiG=hUQ9EYuyCk4v!!A%zPRn(ckh4xk=m{t@S&A
zwRHZQQfi~u>wSf;H_N=>SC`iM8o=4aq3RlATvzoy%O8jQCK&5(Kdp5Kz<yESJlJu~
zYpvS=T%zMaMBPfIQjbv*d9j6pC9odc0#Ki*#b>3|fn>r`*h0XP*fF?Tt=?N}U4!k%
zi&AP|B4KH4RB#MzG;l2J7@Q<YlZag7?Z>N9YA>`TVq*QFyZh5aG}9hp?n^8-HVgd8
z%)Y0X3tR-&gRk6sn22tTF_&{G{p}bs>A&U_m8{6~l~|D&GZrb6Et8G$VJ=pxZrvXg
W%+)OPZT;B*0000<MNUMnLSTaEz55LS

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/arrow_left.webp b/app/src/main/res/drawable-xhdpi/arrow_left.webp
deleted file mode 100644
index 24514f1e36fbe1f238804f5eb13b55f3b4ec46d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 234
zcmWIYbaQ*ez`zjh>J$(bU=hIuWD5YXHW)ej1bActd5p&wm@rH*JJaS8^{eM<2S>n^
zX$ngoP3i8C7nE0$@SHSdMdbIR5C8kCTI`&o^ef*WbN0;*@d3G~+Y0P*^;(?PZskAp
z;gN9Dhalso7wi5_c&nCRaaa5x-x*)N-ohq_J$pIYq^gzYe06YT1iC>X2x#L37KXWu
zS~?6m40@R!OM;YCmo9B>$nf@HV6PBk%g_6(Ua1#!$t!7F-rW^P7#RNjo>KAuxp(~!
gzfb>XXV1I)FZunSr2lR%?-%^PJ<b1XEYLs(0Bvet*#H0l

diff --git a/app/src/main/res/drawable-xhdpi/ic_community_notice_rink.png b/app/src/main/res/drawable-xhdpi/ic_community_notice_rink.png
index 632b9f8cd0e6e3df6937dfdade1fdb4557efa422..8e742d40e06977c7b242744f0e8ef84d36068027 100644
GIT binary patch
literal 822
zcmV-61Ihe}P)<h;3K|Lk000e1NJLTq001ih001ip1^@s6;azdS00001b5ch_0Itp)
z=>Px%@JU2LR9Hvt*iFb(WfTYSpPCkwUkGI+ZWPh{By!P0)JPE_Td3eh$c3PyD2lB_
z7eS$kL5Qdov<Qt*q*V%0n?Nx_tu$L@n?zAdQz?Ut17~D-nfJXPGXuUbXEQT*p67r5
z_y3%8?m2geL1aS)5m!C3-8!wFvV%$4Vc3M>_y~V=ihMW1U^dPt!R^@lxRHGV)A14(
zV^tFT4xi#8&fs1<#5<wv(>REgcya(T-(xv`t4p{YvY}?ExC5{BA@DGN_r<@04{-=L
ztCFruHj?LKtWJjy@B@zH6oOO`eirlaIu>G7u0Mw*xL$>DU9u6AN1GgN!@dH?LHbKX
z*o1w8HQgrr0=~u+{D*h2E58@{UXk%VE|cxeJdH-!47k6lvSaZrUc_B&$ZRj=ESbd3
zp2Q6Ni&qn~=te6yG7)ESlwrrR0u(xFu^=8AALRA-v9%0HRb|6LI0{?ZM7)fz<~0+u
z_CAw|IVTgcqhSz5{^cw?lW@B#%ck|;U_pk{WLzu4s;cbocpjHAtq8o}|HD|DYo_9t
zBD|_(|HNoqKpb5=7Cl3hys(-0sR*np**h4CDC*G%v}1b^jZWAs{8$9mBU_|U{@+u!
zS*Tvj_7V)841?WxtCOWGCe<-KYIuG{JkO&hMz_?CMO(Qs0p{Zp{=r}Uffm)-Xk6A~
zXaY1oqb01;7Pj&qz8n6dFAj^zAw>AOzYPPa^97c*BVWb6e<#_~b;v%4MNP`K!su@}
z?7KGB6`f=>N?+9tgEGQI6EXrZYWHUoa=M5q<9->?I?5K|Mo)V-lP<FRy%q`bMvgv_
zm^<-y5oouRjZr(=#qsIjGi=U83AH0xKF>}qmc;lHV@xe8ilH)~>#!eD=EAP#BoQNb
zH0n>~^(c2S8QdxZ+Kn)1V8&~qEtuQl6;ez9M{oc)>Jp88olv&nKd@fIyZNjSg-_%=
zg?47ONB7rBvh9dgYHyEhDVb_4>M2`8v{GCC2c4#oEb9uF!~g&Q07*qoM6N<$f=C8>
AZ2$lO

literal 748
zcmV<I0u%j-P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0008BNkl<ZSV!%c
zONdTk7{`DA<dWnT78WBR7A^}Smq^KNAsd&nkcEY!F@`KCV>2Zhl7+IFg@ss<1q*U1
z<rZQ#<Q8RvFeP%SzuxIRb?E!fWxkm~eb46WobP#`_jms9^StMMj_3iiJrP(1oR{>h
zmXNAta5C0*fS3ThkQ9EqZ9N6#gg{bFF}pR`_CR1Uuo{>POixMj2)GHH1FlN?Rz|K;
zK(+?}TY=rcm;w{M1r7kmBz-U7PhlY2lYuk9v?783@OcQVlk_BSY#|`qbAXG$h*ZE=
zz$xGY5R&>mFbW72w-Q(nj7#}{0G3O-n+25%WP1v53m6syeFgT!W%yAoxb6ONd0T-&
z(eG2pIZ2PJjmrdzLGPuO=^e04(t|wdQ(MB!sP5=^FC_geNfjR^4`?TFFa`=qxlq#W
zqA)3_P>I)oP!z#-Njg+1PE{b=LFSMrNi{V|I#L!U1=R$!#p_Ug4VAWpETA>O=@{U3
zNY-jH7lDk+ACkWz`mdD~s`fX_0%`{~M(-9$`-@DR<zssv&=P&xC2cAL)B#M51LjEz
zyKhZqdp>X@2I-KL-r>7$XDQSP42^?FO8Qt64PbjL@FvFTlr+4ILOu4vOeJ<d;Ae7O
z=|!BSP>%xz5Zjq?>p*pd@+z^eP+g%s1@iv?KXb_Tq<A(C=i$F$Ps2GpbiG|Wwe4o0
z;t8$~>6#_AB|!gzLMtRa&+R(;P@(MeP$dxCp@Y~P+9FAzBduz-w*w1+R!R4ZK3FM*
zY+s2zeTd&E>1Y-3Mj&YjE=gM2TR@>D3awFMXJavhRyo)VU|Z~36Q9G9cJvm|VBm86
z;!$Lda1LK0=}Qsk;8SYJ;ubLkI1X&cndBs}MbhV@Fx>)5g4>=AYz7tq<Kz98z;)n+
eq&sCm65n4F7#=h!=3KP^0000<MNUMnLSTY$gh*5X

diff --git a/app/src/main/res/drawable-xhdpi/ic_nick_delete.png b/app/src/main/res/drawable-xhdpi/ic_nick_delete.png
index 4d032e602372f956ab2853d0ad79bcd626a44830..3886d8f6ef6a14da3f38b03c053a7216aed7442c 100644
GIT binary patch
literal 790
zcmV+x1L^#UP)<h;3K|Lk000e1NJLTq001ih001ip1^@s6;azdS00001b5ch_0Itp)
z=>Px%&`Cr=R9Hvtm^*XRKoH0O8$YDTMdEnCml-MwC{oiv4KzSO0pTO?$PhjO;S&%@
zGJFM~NCOR_1sduUG*k?cV;qqpie(#?IX?!WNV=080h+N&X&*oB?cMGkAx978h!qpq
ztX69h*-2!9@irJUml_TCGC&sroC9zg!0a%x-vN9E@Dbp*^}6+jh`QrMJyp&+jx*bC
zmzRm?4uBJy0N<E-!!$dq)oNA#Na80ktZloC09FCi6MGvdGyp6MVLeZ(uMNx01>0_~
z5%KM$PQv7w>6sAb5)u8-wWkF;06lz3gzLJ7b>x__Da7;*U0^L(+jiFg+|vO_Dno>g
zdfn2pt%S90_a=bE`IQiQQ3&gWN+%Xp?t0HNJ^?rxG-R3u^m>e5@2AQ~|9i1Gg<_G=
zZilAmu3>m*Ri{KO?9R@?3K2aF1D%;EgBjT0@4)lo_lRK>Amxb$@?pTt{Ahl@vJ&^_
zk+9p_T&~p)zl5EmGD>rEM&G##*bgdY9mhkr8@d|JR%`my!UA=ofFogT```*duc8!#
z5MdG4k@?d;UlpSAIt8rz6u?s4vc$n82km=W7s874853Fe9e@j}-4g~Sbw)X=N|S*7
z4?<XxKI33_b?bf*SOVzeb4VbXLRd#mo{?M}tOua1itOmSA6ULi7}1fLju4iSCTDX6
zo2xW<58%8i4gQx6mZziZpA>~_LR2CPk*eH&1yBp7!Z_u2Z_kTre$tm)37DHkM#3Iv
zi&!d6p-_ly5u1kLof)e|l)!(f`M#wyKq@B%3EXJ7>&&>TI>yp`Ki08kP&#uoF#ZP4
z!6@!u-r*(3ld!o=GYw=Jzps;{L3>&`8&n!zA3Y!<na4-Y;Rxu~@cQVnYS$<3x^$xC
zyO_J=yO^sEbsgWu+*Ye)ZN<%3I{s2cR>yD_G85P=qS_yovND{7-3e?KQI$4-0gAc0
UJBT*7$N&HU07*qoM6N<$g6J@09{>OV

literal 913
zcmV;C18)3@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000A6Nkl<ZSVzTI
zOHUI~6#mYgwzQzM#v0MM09r~Si4u(<y3wt=GseeO`~hxosV>olu6=CPh3?d?u0%*M
zghUO>!v#?ZHKj(Nv@`dZGj*h|=}ZaA-QIi7_ucb81fQp;=ft*LZuzuQbP}LmfIEmd
zD&owP1!xZ739b26INb8${rlIy{HP|cM~TEh(lD%R04_44#p}J?6JZ&^W6LszXJ$sG
z>&dthXm39e4uzI)0CbfZAwR&CZ-|g5!risC=IdX+yw26qQIkM2c`QL>J_XRb5#Sm!
z6IvVRYFVR-Kr(sw5Rvf`!0t@~choE}Tc@U{$KRFeEhA9$xA}&dc5O1at&WHnEh})W
z)DnLQ?AtdGiA1as00;jC__|J-TwPU1=jTUOZBoufcX!{g))@M?;6?39;nvjDm}FLw
zfCQaV=0|1({|5mg6fDcwFRri&q*8tNnK4)k+%OF6*s&XhLLS-d4=Fny90}3rP6UG?
zWHJk|EUV^wB0T)`X>5?XyN_>YE_`z<GKQfLi?u;1g?v8eL81sA3WcGy#?sPvSeAAp
zuuK%(Ly5$Z^GeZ^df$@Yw6?}QNR)$TvuT)SzOJ>j<_nZe9=S(ESG;^*pG4!}g2&AF
zsjI91Ex`R=1mwOp36z=r=g+hqFa8dVQYzKA$c(r@fl3l<c2GJ#Zw%aST4^D$)@ZXS
zwS*9tfNK=ISQ(Mu5CJJ4u~;0zV3Tb)3ARjT(MO7w+u0$|kP8I7G}VaYCw@}2+R3&H
z8VSNma51|a?-X^5FdFrphPA+*X!lnqs!7;s=%*0X19#L00wF}BUd5`Mgk6ZdO0kHD
zVn3-?O`_-`m$RZ&u+3>k514V;?PWZ^7tHXLY7Pkr&UE^#EBfDNBrpC<z8~D$v2;W!
zIBt!l5=9!AxUEhnESM(s%+8K}-l~D*_SDpvJ^WORWLo;d0l#H=WAA9PwbdLLA0J;S
zBe3p@EgDLl-)!kv?vRk6R7yYFJa^Ef*6OUU#l#^Yt65Xi%1vg-YPO+aRfbO@+-Z0<
zD-EvB&i<}IfQOiI2|%--z$1dp{EtkNh9%YN$#`zZj&N~3Up=FgJ_)E^BHaN{ta#5$
n%xVtM6I!cR;c(=+-}U@A*|gV?6IuVd00000NkvXXu0mjff{V93

diff --git a/app/src/main/res/layout/activity_common_web_view.xml b/app/src/main/res/layout/activity_common_web_view.xml
index 92a1150a2..3e3df6723 100644
--- a/app/src/main/res/layout/activity_common_web_view.xml
+++ b/app/src/main/res/layout/activity_common_web_view.xml
@@ -32,7 +32,7 @@
                 android:layout_height="45dp"
                 android:scaleType="center"
                 android:layout_gravity="center_vertical|start"
-                android:src="@drawable/icon_close_labe" />
+                android:src="@drawable/ic_close_black" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_erban_grid_empty.xml b/app/src/main/res/layout/item_erban_grid_empty.xml
index c9bc9bede..3bc2f222f 100644
--- a/app/src/main/res/layout/item_erban_grid_empty.xml
+++ b/app/src/main/res/layout/item_erban_grid_empty.xml
@@ -21,7 +21,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="3dp"
-        android:layout_marginEnd="5dp"
+        android:layout_marginEnd="4.5dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/item_home_tab_map.xml b/app/src/main/res/layout/item_home_tab_map.xml
index e7b642cf2..1baea6846 100644
--- a/app/src/main/res/layout/item_home_tab_map.xml
+++ b/app/src/main/res/layout/item_home_tab_map.xml
@@ -22,7 +22,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="3dp"
-        android:layout_marginEnd="5dp"
+        android:layout_marginEnd="4.5dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml
index 402c91dd3..293a35798 100644
--- a/app/src/main/res/layout/user_info_bottom_layout.xml
+++ b/app/src/main/res/layout/user_info_bottom_layout.xml
@@ -12,7 +12,7 @@
         android:id="@+id/send_msg_layout"
         android:layout_width="150dp"
         android:layout_height="36dp"
-        android:background="@drawable/bg_shape_attention"
+        android:background="@drawable/bg_common_confirm"
         android:drawableLeft="@mipmap/icon_chat"
         android:drawablePadding="5dp"
         android:gravity="center"
@@ -25,12 +25,12 @@
         android:layout_width="150dp"
         android:layout_height="36dp"
         android:layout_marginStart="25dp"
-        android:background="@drawable/bg_shape_send_msg"
+        android:background="@drawable/bg_common_confirm"
         android:drawableStart="@drawable/icon_new_attention"
         android:drawablePadding="5dp"
         android:gravity="center"
         android:text="@string/attention"
-        android:textColor="@color/appColor"
+        android:textColor="@color/white"
         android:textSize="15sp" />
 
 
diff --git a/app/src/main/res/mipmap-xhdpi/icon_chat.png b/app/src/main/res/mipmap-xhdpi/icon_chat.png
index 19fe388772ae166d7c873556239c0bc23aac62a3..e90203b4c72c6e3e708c06a42fd3e58b1bafff62 100644
GIT binary patch
delta 904
zcmV;319$v_37rR!BYyw^b5ch_0Itp)=>Px&S4l)cR9HvNm^-W$br8mXUm++;)F2_)
z7$YWxpco4tMqYLbb{N4{G%+^PNCA;&gB3IcdDLj4jZrEBs05`U1bk4CfQ`oZ2m}ZZ
z10R{2*~|Yf=bYVhxd-kvCuetd=G&S1&&;=CoQcL69{L7k`+qTD8L$+133wKGJYVc0
za1J;L90tCXbh)3GZVkxx3}7v=3V5`olPkb}V4I|~ZJucaWcy)YBd`XT(8g#7og2V*
zV1uM<y=?RZWcxYb%S=sa=X75G0XPHvn>VKbGl7M`3gCsB^GM}ey`t3>knNX&1HiPx
zXaHCzDSjKpc7Fid3M?v={{r5SbfS}ij)1aWjsa8ip$PLwz-~!yL{cc&4j=Dl$|C(C
ze*>>{iqu_zY(E102+YZcFXS7=wNZ=h1##+tC)3C&V7{cQrO{4+wgDffQYbH#bbQoE
zMn-EMa0r-`mp_#hCwEvz0Lmi%4R|OuK9IC)EWlJYY=1}kKFk0A1GCE1)dB4RR;O|l
z?&5xHrU`u3)RCgl_erXJ-s#k~Cj);LO>a@#)6@i_e&6=1Ky^~1c}|yfDfEUTWczL4
z^Qzz^RYl#ezgGITqbF59R!aJ!4rn*<URv8IX;Ul9qg1l}2~hdiBPnWYM1+0<;uM6u
zCMkyFz<<Q{k{rO{<G7^xbwJUqo=OByONx3LnAn~U{E-g+ku=nV%Nn{~49|&@VjvDo
zY{#GupCLCSO?;q$!ny6?F(hdyIAw(HYs%UHy01mu22gqIW0BfCumVcMO)2ZEG1{ID
zd;>hw68P`Ha!Ef|`b~i9qhq0@qurd@j;0pPt$!aG(QtbL%AD>6-c1kR<?7LKAscvv
z5>POUUkAB<l;LcQP=XrRf>r|){BCH%1D7R5$=pp8bA^o-@M0?em&JHbD{Q^cYzNVd
z?J?vRNpVOzGuN?P@_QVLuYou7{tih&BDz!QE;Q(SVEw%=ZnoD0TN2F8;C)p)Xd;SH
z<bPik>8oD2P84HW$9~*ZYzO_Gn+&*$Oz7{F^kMa2TPhtrC#ZC_{P)v)dg(?Dy<Tn>
zjesg^wx3UW^iDxzMhol~5QJh)BQI<6ke_3g*FMKQ(IR@W%%2Ai0(;95Qu=Hip(dbX
eb${Fex(!w&P&5!&H!c7G002ovPDHLkU;%=tx}y^S

delta 1134
zcmV-!1d;ol2Z9NZBYy-*Nkl<ZSVzs5O>7%g5Xb-XoY<*Nysn_2azPa!AygpZKnqez
z!vU1F+Y?snO)6D<L_%DeOM9SdN#RmX<$@q72#I7}WW*t4S3&|x8${a!s6Y`Mkbnzc
z3DoN}PGZM9XuaNa?bzNmi9_Da@6DU}`M>k#y&-I}L7R*REq?<glYiZ^5Ddmmh&}@M
zFk=S+lJ&<JFo^IogRTmg=eHCJS|)S*jaL4&Z=n5y#y!g>A0to-K*VQ|c?PFD1f8B7
zmwxiI#}jDpVeSeq86!kA44~7G(>gW<W<HY-Nhd#lmlm7(XbNPhQYz60AbzOY34aH+
z=FRD45&SW_6o3BPTF-^@w|1C?`@o_X#7_hCKuz$g0fA&QwHgBL8_Ygznxq4`W5p?B
z8UcDq8;?%=Q7S%|>xF5)3eX;x{hvax{Ly&q>v}%w0+p39@g;z5l}(Gxd_+%6qX4lV
zn430Ca>^JYqB8)xD)Tb|fye48wF)Si<SqG*xl69klz$~Ac`6;f)EY>&bt08}l!-L}
zTkR7`-$shvyE7SDa9gedl2h5!M0C_P;srLTPd_JJSqqG_S3YR$B7x5Ugv;KUU(?gE
zV-11&4`lBa0s6r?O-%fPJ`sC!JzyLk{YrL7fZnS7E(QedcYnGng=8f=Mxf_xaWJi=
zqmQ?qGk;$AOz~9i0tmf!7=Bw<V|Gm7W~JW$%uIJ_G5GsR(G#@C?`iTvs9m>DA78A@
z&j-2++b7@IHdh6d7|0%ArgKih>1wp5_Ou$dxxK99z9H~~WeDPfQxmcGtAOIE+$e~j
zw}J4ou1X{8i%{(?o-$5=V8>t@)6&tQYM=q*GJhDm>}}=~n!5FTJAo2|*Y~n1>==YA
z+Jv;b8b~o_0NiFxE{l#kKOT=*`P8=Y)ZqN~4s-dpN`P5SmC8kU<&?!0V+laenhY1C
zp-hGfZKDB@OmZ;anX_VAqoAo$=zj&Wg2xqO<r>mdsVt6Lp$+|H-as3i)ZRd@V-Lnj
zEq^VYYG)340<~Hg<A>&UqGV11xXUN_uLy{Q_Fnfj$G&L})m|OM)H{`qe$gmc|9~+f
z7$<zfl+9`jZc`v@gRErF66jfbGhfhEsjt!H+IEF3h>duDxE1wOsH{>OA82kEtG~;4
zhRQcQfE$`Bbyw9P$Jlzp&UemTc5Y$-|9=ouVy#cu+FXk(*ZTlry&kRcy{1Y#>jGJm
z>-)&BpZ2n1OcJoKlI*YRs&u3wkhM^^4FX?;5Xaa0aFZ3|I03IzP)i7i9;Y05H;N{I
zxVqu1ZWL$3;n}Z7so1OpJbCDkNM|YZ2ty1z%9Pb1yrEA>FFJeuwbDi76fs$n{%6-#
zx)JNA;bK&Fzbrg~98U?wxYq<9C6MB@F|8EE8e5Zz#v+C8Vb8wID@f(ICIIRKxCg)v
z05Kox%>(#_flnwP&bqG<cTC?3d4aCi`lbW=7rglAG@U2Mpa1{>07*qoM6N<$g3ciw
A^8f$<

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 810fae8f6..f69bbe382 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -571,9 +571,9 @@
     <!-- 输入框提示文字颜色 -->
     <color name="text_hint_555574">#B3333333</color>
     <!-- 分隔线颜色 -->
-    <color name="line_353548">#FFF4F4FA</color>
+    <color name="line_353548">#FFE8E8E8</color>
     <!-- 一般用于10xp或20xp的分隔线颜色 -->
-    <color name="line_height_201F27">#FFF4F4FA</color>
+    <color name="line_height_201F27">#FFEFEFEF</color>
     <!-- 弹窗取消按钮文字颜色 -->
     <color name="color_4C5AF1">#FFFFA936</color>
     <!-- 常用渐变按钮开始颜色 -->
diff --git a/app/src/module_community/res/drawable-xhdpi/ic_square_publish.png b/app/src/module_community/res/drawable-xhdpi/ic_square_publish.png
index 672c72da7292d7398171ed297ad07d545afbe3ca..d2132e0672fa8bc229832aa10976ffbde55a97aa 100644
GIT binary patch
literal 9417
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
P00000NkvXXu0mjfy3X?&

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

diff --git a/app/src/module_community/res/layout/activity_dynamic_detail.xml b/app/src/module_community/res/layout/activity_dynamic_detail.xml
index d3a3a9bcc..ec31e2847 100644
--- a/app/src/module_community/res/layout/activity_dynamic_detail.xml
+++ b/app/src/module_community/res/layout/activity_dynamic_detail.xml
@@ -62,7 +62,7 @@
             android:layout_marginEnd="@dimen/dp_10"
             android:layout_marginBottom="5dp"
             android:layout_weight="1"
-            android:background="@drawable/bg_message_input"
+            android:background="@drawable/bg_common_edit"
             android:hint="@string/dy_pub_comment"
             android:maxLength="500"
             android:maxLines="3"
@@ -87,7 +87,7 @@
             android:layout_width="@dimen/dp_60"
             android:layout_height="@dimen/dp_32"
             android:layout_marginEnd="@dimen/dp_15"
-            android:background="@drawable/selector_dy_send_btn"
+            android:background="@drawable/common_btn_bg"
             android:enabled="false"
             android:gravity="center"
             android:text="@string/send"
diff --git a/app/src/module_community/res/layout/item_square_dynamic.xml b/app/src/module_community/res/layout/item_square_dynamic.xml
index 5fb01201a..7f168d73e 100644
--- a/app/src/module_community/res/layout/item_square_dynamic.xml
+++ b/app/src/module_community/res/layout/item_square_dynamic.xml
@@ -11,7 +11,7 @@
         android:id="@+id/view_top_line"
         android:layout_width="match_parent"
         android:layout_height="5dp"
-        android:background="@color/bg_secondary_2a2a39"
+        android:background="@color/line_height_201F27"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/module_community/res/layout/item_worlds_choose.xml b/app/src/module_community/res/layout/item_worlds_choose.xml
index df54bbbb7..dda268d6a 100644
--- a/app/src/module_community/res/layout/item_worlds_choose.xml
+++ b/app/src/module_community/res/layout/item_worlds_choose.xml
@@ -53,7 +53,7 @@
     <View
         android:layout_width="220dp"
         android:layout_height="1dp"
-        android:background="@color/text_secondary_4f516a"
+        android:background="@color/line_353548"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="@id/tv_world_desc"
         app:layout_constraintTop_toBottomOf="@id/rriv_world"
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java
index a5148254b..266fa6541 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java
@@ -38,8 +38,8 @@ public class MWMagicIndicator extends CommonNavigatorAdapter {
     @Override
     public IPagerTitleView getTitleView(Context context, final int i) {
         ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context);
-        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_4f516a));
-        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_white));
+        scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_999999));
+        scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_333333));
         scaleTransitionPagerTitleView.setMinScale(0.85f);
         scaleTransitionPagerTitleView.setTextSize(18);
         scaleTransitionPagerTitleView.setText(mTitleList.get(i).getName());
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java
index 7a9539d7d..ae4b462b9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java
@@ -6,7 +6,6 @@ package com.yizhuan.xchat_android_core.room.bean;
 public interface RoomModeType {
    int NORMAL_MODE = 0; //普通模式
    int OPEN_MICRO_MODE = 1; //开启排麦模式
-   int CLOSE_MICRO_MODE = 2; //关闭排麦模式
    int OPEN_PK_MODE = 3;//开启PK模式
    int OPEN_DATING_MODE = 5;//开启相亲模式
    int OPEN_ANOTHER_PK_MODE = 7;//开启跨房PK模式