From b40a7095bd1b9242d58e9fb0eab11461b1c0e751 Mon Sep 17 00:00:00 2001
From: chenguilong <598604202@qq.com>
Date: Sat, 8 Oct 2022 11:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E3=80=81=E5=B0=8F=E6=97=B6?=
 =?UTF-8?q?=E6=A6=9C=E3=80=81=E6=88=BF=E9=97=B4=E6=A6=9C=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../room_music_player_enter@2x.png            | Bin 2061 -> 1083 bytes
 .../room_music_player_enter@3x.png            | Bin 2995 -> 1936 bytes
 .../XPRoomAnchorRankEnterView.m               |   3 +-
 .../XPRoomFunctionContainerView.m             |  58 +++++++++++-------
 .../XPRoomRankEntranceView.m                  |   3 +-
 5 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@2x.png b/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@2x.png
index 4ed7618426782a5046775ecd0689cde979ad8ece..af5b4cd4b0cfe004108a65f4c93192cfb29d8ab9 100644
GIT binary patch
delta 1063
zcmX|<c}&v>6vsQ}l<7D^fB|#G;lU*vB6LI}28N(=444GOi*a<I;}TtwA!TLg#5JI7
zn4&VAK%5jssj||vj1|g64uj$*NNE8nZGY{r(sC*5cfTyz-XAaTo0ojw=e<0xt;n)+
zJ^PL9n8<y*0MKYOD*qpyAgFrrKivc4EX*?KXYfi2;wfgwV4|c9WI3iem>R^(A-sHo
z*%8c*!l=S)9#nroUxDdH%y99d2YNm<m!Z0V>0(SsK>Q9}7aMx2(GB7O$O@?XKwg5H
zauI^8gH`~;Q!Exh*#b>Fw1+U(30*6+O;DeJ;vNVgv?Z9J99qp9%Kae>_0ZHq&4hv)
ze-GO4F;xpy17^-*^7!B5x1gm6_|V?KOdkvnz$V4ei73ov)nk}yK~zI62FbzXNhq_R
z5QCs#3!%(~;wZ+upr=rpp((-y3(DhAd;$5d&{C6Hp*e@CGnh<;{5KG7&?f(j+YUlx
zCOV+&H0$cj)b=l^HByrYJg9>wonXgBf967Sva_;mU$xfJ!Gq3n|7GvyZ?m%w$H#;O
z`ME6{jRwPu=g+!Cclp<NRbQth#BB=<+_G_Lan3}NYPCWxAMWdwNt*dLukfm?D$jj$
zI)j;ZI6fjGEHpGI@#lFNjb`DtCp36p;KQpwF0e*?ZF_Drs;&Mad_(4=Yp$~O;stp_
zUX4>*`UcyJ1CUrasHfa!>Eo_M)$*yrapNBMK!-}_A*oAzq7APzXI)kM%H1{DUZ1bG
zfM<&7%*h!~@v1K~>MEHll(wc=OQ~N|V{po_pu~!i+Wkb(sbmWqCf|<WZ7l8H>22#r
zZg3C`Bwycte<I&IVomjkCA)0b*xHM2)n^=X>#Z)QTyeJ!?A;u-`nuNvV_uWk@H&!t
zDq~J}mdnks7dHBSXv~bO8|>fulSG%DL&ke?!?c4-ADBO(30v$uFE)~Wmj;hGOA;~#
zNi3m_ZTEQ}yO22lf|gdPVQfJ2X@PTaIQ_=c4Bz}1uamjGkB3DJ54Ov6Zh2*a<o!s3
z+<Ha$Y{jPX^5t?NixJZd`g>YMUw?Y+aqBf=C(pad-g^VKkG@;%&kg^RzEGAk9$eZy
z<j0ZPW!Q}Rn(d?bbbjgXm>z!qouaRL*<5CAR9)elL9yP$(j@Ug*#Wiu9UIT1C672-
zdcv^;TIQ>3-$iAvXZsX}M=cas-|4=fa@%?8ykpo7awh!#_Q*}j{@WEpjsd|QdB;qz
zB9fCt%GZ|~Wj;y^SMUAv@ik54cxcaR*Tnroa#&g@E;_QU<>ovutKI%~Ls{zcG!A1E
zn{jC2px>i3`!KtzT9(q`<GhemLH;wRkK{BTRtd9sHek!*TkGm2BP%=n)16P>n(VN!
Xj$X6lhb0m9nY2B-qC;<mBy;`&FF=L4

delta 2048
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

diff --git a/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@3x.png b/xplan-ios/Assets.xcassets/Room/BackMusic/room_music_player_enter.imageset/room_music_player_enter@3x.png
index 1b5f0e981ace2d741048bee1c336c71e07310b9c..a82a680624554c7ef7340729903991b8dd5e018e 100644
GIT binary patch
literal 1936
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
AL;wH)

delta 2990
zcmV;f3sLlt53?7LBYy(`P)t-s0000}>+50k=|<$*Kj7F^>DFrd=V<-sQ0v|`*ws1P
z);ZhOG}qNQ+to|r)-}}9Q19S6+}3RV=rGmOFV)ja=iD{e)ouOgUi9N%^yE|Q<7xZm
zX!_=C{pdsD+F9`7GS}5=`{!f#<Zu7zVfExW+|^p~;cfrvXn*?TYWwCc)zV$_;#%?H
zPwL%h`sZ%_=vnaLQ0d=b_2W(F-CFVDLE_mq+0`!8(r*6fH`vuM)zoGA=04uoYW(Ow
z-`F$O)mZQ1X8GlC{^)N0=}6?;GS<`+(##Oh%Ny6v9@)?p)6F5=(HPav9N5qq*3TBy
z%_QB@AllJ1=6}}?&C1CC{SMB`!~gx&|NFrI{tV2?%K!bv|NU|E<kJ8ALFn4O|Ne{l
z=soD!G3C}K-_t1I(-zOnLFCys>DbTz{D1Z4cJt(1@Ze4G-ZkOYEY{K_+R+-%&0h22
zRr26b?cPf3+(zr$F5T28($Evl%gq1%V*KT9@Zw<b;D1f+-8t*oG2zuK-P0)9(!2ci
zkoxI{_~&K&<!SEWRQ2Fd@ZLD)*eBf5A=S?w(9RLg%V_=PcKGFU_vLx><Z1QeZu8?|
z_2OCW-bwD<JLK3p;nyzY)gjT(8r04j($3ER`+D}}Vfo}}^5SIh;aT(GRPf(e@83e~
z+dkshzkmJtwfppg`R9N6=Ysd=eE8;Y_vL)`<!$!laq#3`>)%H1+$!PJF4@zF`RIB0
z=7aX;cJ<|7{N!Hw<7M^YPxIeZ>D@!^+ePWyE#lQP-_<kS)h^%Eq4)4>^W$3j;$-sS
zRqo$e>fTQ4-975sKIPdW)6k~+?_TxdW$oZd=zrWz=G#f-+BoUhH0akk<JULd);HVM
zE7Q`~|NF@P_mBJOYwYD&_u^Lf;XLfxMdjHt<JL6U)WrV#wfy<3`u45+@Ll)fN$}lK
z=iEQ++R^^_#Qyc4`|g<g?2`NHJm1)v_VAPR?0oR*ZTsdm<JP<U`;7DKg!1Sn)X|0U
z?SFLc=UM0B%>MU|^X)%Bw$=au07i6DPE!B_3i2lhksI;XqghWi9u*Jv_3Yhvabs0M
z820Mk+|;$8gLiIYI4LFk^X=r{(Z$8FpOj_#`uOkZ#K63=l!RXL@8QIc|BfCw000Oa
zNkl<ZSi{}dcU+8d90zceH0-_i-h1!ujDNTy!g1s%CF(k^P<Oc|Wz=2b92(a!DhbhW
zozd2yXpy#x?9KQ0Jin*Aj>Nyd|9{@E&-eFx?zy{0|NS&+HmH-vv>x5N4Vlw@<cz+Z
z2X}4yPx;1!I`tXZO(2j+B#~uhsb#6DdxlNZ=-l=1g~5G#baN9xJU>6bprF7J#((1c
z`JKah_3iqX4K&)i39N5K-pwb|w}>%ya<Z`S9p1ld;|7Ih{dyqa?%je&!H}cw?h)=s
zPaNN4VOm~ZZfa`j<2!nGlLmxAquRP5;O@J?&AIk4n_&)JGrn}fCoC*XC_G@PIkxp5
zuc7l?Hvs?=_uN+y&qevGhYnqXF@H8T@fG?-Td@-?dkt({ztC?osvwBSeFXx}0|0sB
zOP7uvv+=ZIFaYV*xn4p8EfM*WpHrG^kMaZ%jPu7#OiV%?*i0rPCP8z2JsmXOfe=(>
z@Z^a>3JC-UQw1QuAtc1c#wH3GX_}pXw@cH0(82muRb{1tfk6u71A~Kuaeo2GZ$Nnm
z2ZskyNzO@(v=Lo?Lv)$!cEh?l=X+&kCI98sKn$G0`4BP>6B;ja7BMnLH2d{=m<JtR
zR^{a6V8Hmo1prL01F*q{5<<~LJ$f%<WsFh1+txGS95(Z-s`%B10t17Bf-amnbLP4U
z%AYu4EKf;Ek;~<8Y(hih<A0-~GTwus)<NYsI<*zt2nyiy1MG=B0bC~ln>#i+2Iz<l
zHj4Qn08~^|ux!mlte!3Ft}#kr{VpXSAYe1(0ig0H?%Z*3_+;<|1Ryr<kjGb4q^GB6
znAw{7KO0xK#1L!i&84NK_5ehjxeh}DXV0EHcTNs*QV{b)A)oQ=8Gq|`oSDB`3*`&#
zA&7LZPD!zce1yCE(W6A31orReQ^JlN{CEIZEPwwjj?9ZSM(H&AyGaCr)zz;ei2OxG
z9stjf98!Q1TzNVHczI=UII<eGfr{sHltA(>_hl{#T)cc4@@G+e|IVGBo}a{!CpvKX
z4n*F|?6!<!$H|(YxPO!`-6fKv_E#gw{PE*w&)&O-^Du7^Py|O^`X-76fEfZf92YxT
z&Gc3j(XU%%WJI7l295)O@;iM!J?~pudX|D9{sapoi9}wH0JzQJ*txjyc$_RXb!v}3
zg2*xoxOtNTeD4F0kPs?GJH!L<2<2_#ICcP-!|-G^I@CikQh$<PrU3Tr0RZRO?6e1B
z5TpozylotrU$tb(5_4X7mNxam?jBj-LFPR?0Kf$f9ALApVq!k-5R1jHp+F%CtX#Qt
z6$s102+!_`iGerE96bQ=K*0H(zCJ#dwE%+=05@Tnhw@j9wr*XybSV;+FJHbGYRK9&
z#gC>W-_ZjA$bX;rweazABJ);|XEM_a#awPtT5OyV0<Zu8j4Lm^20x&EJ@Os*5CF<M
z9RR?}%8G#iXXg+u*U+#;WJC%;z!FGUaq1Kh+098p!{fZ8G9V-XCIaa6*B}`Fu*Cq?
zVa1ANKzt6*9zYU(QXOvrVBzFsYAO`6qoe&8iDbTTi+?D<&``hVt3rSdi$PeSs|&`i
z?2aTc76=Lm3-cp@Ogf#uWy_Y6QBp&FeQEqwL=Y8l2VGs-X(d7<)#4Ta<>kV#Xg|Ni
zL}n%eV&X%il4A3U^!4?N{Z%?FTc%5+>7GvB^;`!ZClJse3^sW2;%Vl=?b{#H*>Ct#
zskHdxYkv^d%Z-!{5_ecgqn&o$^&B7P_*D4T6(S(<=|KcMbas%6xnej+$gf{t^cDo_
zaUcX55DRIj1-{gQ@Wm~Rh5`U&q6+l=QZ5$(gs^5!I$nYVhz>BQ#l)ug0Uu^z8W#Nm
z0I0B?{*cb(a}fam>aga63*G`AClF{fBrICA4SxtN>SNZ+$28235@6mcRe*U-2>{>@
zARO5Si)d3H_OZT*zyjQ52_+z4?b<vz22}wOhxdl-)V?}Bfk-@<2?vP;W`I5#46Oa&
zUn}Us765>-`p7;Y+No1Sm*GxAAaIA1jAGmY1eg-pDy7S$k;3ZL`*wRj?%j$anvC{2
zV1JbeB}k&MgaXiPl5<D_mY_NSab(-><VhVHE4~Eo13^90Cu2Y2B_I#;)||RbxC=6`
zr>A!W?a@N%t7y2T6@%%Fh1fLddIXR}afNaRl31swN9>{e#XSB#8wdbExN_ynS1AyX
z$0ZaG6fUujC@~aDD5mS^gczoC;TA$LGJmrDLRNtJ!lOP{)Iox<jwqqssLssRWHX%U
zg&-het6fM*@dsF<B+s0@Ox@ap)FT8a(Y|F}qV<@Bm?Y;yq66`AF#DF5m-j6TjzO^m
z-hwPaU58>?j!0vO-rL5)OA-Lp&lLg|;wA7Jy<7kKb4@cX=@Go@jZ|Nfy3hetpntYN
zg321y#dgqqmShHmi>g4QDJ?-AMDySNbRCz@5}C!>ZFQkuarpIu4pK#Er&G_*@NsG^
zuiJ5UF6OK1yd)I>dZf@6?FQ8QGrj{dIA8#wxC)AZfeO35i7o0ibZQMCa0SK30zTkS
z;jvbWKmIdPpFhDXOJ>J2U*)>^)PJc{<Qhj{Addj=y+gI(Hvc#+JM{F=l5u!Eb5~a|
zPSa@H7H%VEHv%3{)oIf3-#hi0YBkx<!+AWOtE=m2G`nFAANB^IeaBV}0^~N@J=*{h
zzKi$yb8@nGvbT3~^4`6Vhic7I01Y=8psfW8V(_$^x}Z4#|1wQlst=esT_<Zwn~80v
kX!V}eT)kD(M*sQz1TDjC$jeHeI{*Lx07*qoM6N<$g0LA$8UO$Q

diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m
index cd6b860d..ead30169 100644
--- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m
+++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m
@@ -52,8 +52,7 @@
 
 - (void)initSubViewConstraints {
     [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(11);
-        make.top.bottom.left.mas_equalTo(0);
+        make.top.bottom.left.right.mas_equalTo(0);
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self);
diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
index 5c5037c4..56ca91db 100644
--- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
+++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
@@ -237,7 +237,7 @@
 
 - (void)initSubViewConstraints {
 	[self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(0);
+		make.right.mas_equalTo(0);
 		make.top.mas_equalTo(kNavigationHeight+4);
 		make.width.mas_equalTo(116);
 		make.height.mas_equalTo(22);
@@ -931,18 +931,27 @@
 				CGFloat topOffY = self.delegate.getRoomInfo.type == RoomType_Anchor || self.delegate.getRoomInfo.isPermitRoom == PermitRoomType_Licnese ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4);
                 if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐
                     [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
-                        make.right.mas_equalTo(self.hourRankEntranceView.mas_left).offset(-8);
+                        make.left.mas_equalTo(16);
                         make.centerY.mas_equalTo(self.contributeEnterView);
-                        make.width.mas_equalTo(79);
+                        make.width.mas_equalTo(22);
                         make.height.mas_equalTo(22);
                     }];
                 } else {
-                    [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
-                        make.right.mas_equalTo(0).offset(8);
-                        make.top.mas_equalTo(topOffY);
-                        make.width.mas_equalTo(79);
-                        make.height.mas_equalTo(22);
-                    }];
+                    if (self.hourRankEntranceView.superview) {
+                        [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                            make.left.mas_equalTo(self.hourRankEntranceView.mas_right).mas_offset(4);
+                            make.centerY.mas_equalTo(self.contributeEnterView);
+                            make.width.mas_equalTo(22);
+                            make.height.mas_equalTo(22);
+                        }];
+                    } else {
+                        [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                            make.left.mas_equalTo(16);
+                            make.centerY.mas_equalTo(self.contributeEnterView);
+                            make.width.mas_equalTo(22);
+                            make.height.mas_equalTo(22);
+                        }];
+                    }
                 }
 			}
 		} else {
@@ -1476,7 +1485,7 @@
 		if (!self.hourRankEntranceView.superview) {
 			[self insertSubview:self.hourRankEntranceView atIndex:0];
 			[self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.right.mas_equalTo(0);
+				make.left.mas_equalTo(15);
 				make.centerY.mas_equalTo(self.contributeEnterView);
 				make.width.mas_equalTo(69);
 				make.height.mas_equalTo(22);
@@ -1573,18 +1582,27 @@
 				CGFloat topOffY = (self.delegate.getRoomInfo.type == RoomType_Anchor || self.delegate.getRoomInfo.isPermitRoom == PermitRoomType_Licnese) ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4);
                 if (self.delegate.getRoomInfo.roomModeType == RoomModeType_Open_Blind) {//相亲厅播放音乐
                     [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
-                        make.right.mas_equalTo(self.hourRankEntranceView.mas_left).offset(-8);
+                        make.left.mas_equalTo(16);
                         make.centerY.mas_equalTo(self.contributeEnterView);
-                        make.width.mas_equalTo(79);
+                        make.width.mas_equalTo(22);
                         make.height.mas_equalTo(22);
                     }];
                 } else {
-                    [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
-                        make.right.mas_equalTo(0).offset(8);
-                        make.top.mas_equalTo(topOffY);
-                        make.width.mas_equalTo(79);
-                        make.height.mas_equalTo(22);
-                    }];
+                    if (self.hourRankEntranceView.superview) {
+                        [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                            make.left.mas_equalTo(self.hourRankEntranceView.mas_right).mas_offset(4);
+                            make.centerY.mas_equalTo(self.contributeEnterView);
+                            make.width.mas_equalTo(22);
+                            make.height.mas_equalTo(22);
+                        }];
+                    } else {
+                        [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                            make.left.mas_equalTo(16);
+                            make.centerY.mas_equalTo(self.contributeEnterView);
+                            make.width.mas_equalTo(22);
+                            make.height.mas_equalTo(22);
+                        }];
+                    }
                 }
 			}
 		}
@@ -1740,13 +1758,9 @@
 - (UIButton *)musicEnterButton {
 	if (!_musicEnterButton) {
 		_musicEnterButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_musicEnterButton setTitle:@"播放音乐" forState:UIControlStateNormal];
-		[_musicEnterButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-		_musicEnterButton.titleLabel.font = [UIFont systemFontOfSize:10];
 		[_musicEnterButton setImage:[UIImage imageNamed:@"room_music_player_enter"] forState:UIControlStateNormal];
 		_musicEnterButton.layer.masksToBounds = YES;
 		_musicEnterButton.layer.cornerRadius = 11;
-		_musicEnterButton.imageEdgeInsets = UIEdgeInsetsMake(0, -15, 0, 0);
 		_musicEnterButton.backgroundColor = UIColorRGBAlpha(0xffffff, 0.2);
 		[_musicEnterButton addTarget:self action:@selector(musicEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside];
 		CAKeyframeAnimation *lAni = [CAKeyframeAnimation animationWithKeyPath:@"transform.rotation.z"];
diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m
index 6922b849..dd7b410d 100644
--- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m
+++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomRankEntranceView.m
@@ -58,8 +58,7 @@
 
 - (void)initSubViewConstraints {
     [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(-11);
-        make.top.bottom.right.mas_equalTo(0);
+        make.top.bottom.right.left.mas_equalTo(0);
     }];
     [self.rankContentView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self);