From fc61e458e695e75e091c27a86abe402b84f28ff4 Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Fri, 13 May 2022 14:44:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=8A=82=E4=BA=86=E4=B8=AA=E6=92=AD?= =?UTF-8?q?=E6=88=BF=E6=92=AD=E6=94=BE=E9=9F=B3=E4=B9=90=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../room_music_player_enter@2x.png | Bin 429 -> 2061 bytes .../room_music_player_enter@3x.png | Bin 640 -> 2995 bytes .../View/SubViews/XPRoomBackMusicPlayerView.m | 3 +++ .../XPRoomFunctionContainerView.m | 6 ++++-- 4 files changed, 7 insertions(+), 2 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 34510ac74c0ccbbf8677fe9dfc0dc0622457fbda..4ed7618426782a5046775ecd0689cde979ad8ece 100644 GIT binary patch literal 2061 zcmV+o2=e!dP)2Lq&RqfzU>fC4f=4AKgLg3an+s-c4(ro?aMdI0I_~m2vlB z)n4}GG1Ag;`r{hc&mY>*9M{hn)y@~x%@oqi5YWpE%*n|A{1wy94$sOZ-O>`#%pu#+ z4b93U+|eD`(8~Y(c=O~p>DV*n*1i7y*8ls@|NCM3HM{lWkJkoxI`_veB3=6>|$arWd__2E|X z-%at}SMJ_V?%hi6+(PZzJ?Pmv=GZmo*D~SNDd5v8-O?f0&>hvz9M8=d&de0f%ftWu z%>Vqr{`}GZ`>Xl%i}~n?_~&W-=6(3)ZS~`3^x|Xj;Z^nET=L*p@!&%1+eYf!IqTUk z<<>af)-K`HCg0O2)X^H!&A^w>)=K0+(_))O6uHI>D)r-+CA*qKIz#><=Hjp*gNCc zKH=Ci=hrLY)GglBGT78A+tR-L_Otx*ko4}I`|OAM=#Ba4boS+C`Q&i$<6QXSVD#Zz z?%!1B-%Ib^S?k?U>)lN3+)3%&MCIB+<=I2z*goXgIpo(f+|(G*%)tEgqWAKs`|fl5 z=34aPY3<@=?ciGQ-&5}1INQ}O+|(-A(k9o@Akfbd&&t04{<{45vitb1{P2qN>x1&@ zdi&^n@#kUulV?>MJefy0000=bW%=J01N#q{y`h>*ulM>cyezt zECvPs`T6(t_3rKA+t<|5$;P&zii&JrUQ|y)B^Cbp`SIc5-rCX2#l5_(t*EG+iiv}R zdRR_5IX2mztdal#1b#_GK~y-)z13w{Q&AWP@BwyrcXxMpP~t3<9ywV_2?NGp4CY`A z2QpyF9Gw!T=bbw~FtnloqTu8C_l zN&QnwO`X6i!W9=sTYz}AFPMD(uXN^_MIpF|=x9FQf={pnArQO{%^2NYoWKLLC^X;1 zq@cjnR5gYWpFp#=Ix%Y$yKZ|(L_}Kwkgl%x@0*&M-My=A-_7o4-mK~rO2q_-O+dyi+dZnY2WJ?$99^Sp4_w{p7U|?V? zkY+#v8VO{_x9{JR8q#W(Nex}@d|X>|P;*{B-puXx?J!Up83l1?TwGj*G^wHH_z-*` zgqPEtlaF_UGz`cnLok!3ze;XJQj&BXBdunvWQY)4Ud{(RkfCAP=8;i`hB03>LHu2` zI;5pjQ%Q`pWrKJE?sID^-Yqn=u+SXJn9kUr0h$58Y6YjJ*43qFGSWAS?WT|-lRSKA zSfRPOJD?sOv9YB&s0~W0t4}BTkTZSui}7JxxCtIg_a_fLJf6mumR3{*`nv>WXLG;R z69FZ6XOYuo&?_;&INZ%V+}#k+r+`{njj7aeanb6mtxqG8801W57KM`KGX=q$i=xBB zK`Ee~uU}h@8B{PsRV*GjTY|>sh#?xPbydg zA!=_SR?)HdgsZ_*p>k+E32S*<(Kar6tA+dw4}wy+dO-y zre;SEZsF#}8DNcqAsw)nE&+^;F_~IUvq9+d7m4q{v{$U|e9YUS;=flR@#uH-Z#9 zb+|GeEVO=pZ#8^Sd*zZ6u*&-P^j2WR*_%K|)|)|k=VZ*$0Lc}v;X3G5zO1az5}h5u z8!D4+)pdm#_V#5O96vt|4Q{vCDnWbsGFxv6W-u$OZPkSt8Q?b5=Dye922*5Z6^B~Z z?6DFoBVF5|n=$m}K&vFSVB*yh3kIpKCkgFQdkfkt$jS!n^5HM_>C`j^Q*v_@(N9Bd z-{O%^Ysx~O#-3ileSMpnnpmtpz1fpw{{91+wzRA9Wsm3%h@MC^Z}kPt rKO-~k*z)mn=Z;@IY3(^F%>T-7d`Nh?s)qPz00000NkvXXu0mjf0rQ45 literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK;{cx!*Z=?j1DQaQcrf8ph&fP? zU`dc)urGtVt}&;*pbM)MlewywU!os-dmC5UL|epjfwaKPKP>4MvR~My zG5>$1!L1>q%sOR{&2JXtxGDMul3&+8{Jw9~%;zQ!({AKV-=!kIp!t$zc7vw*fn^6H ztvWBVNt9ZqnXb7~>&&oK;@sw{4koSbFABq3mx^_tVp_k$f=SC+t}QC0Ekd~Lp6VYl zPX=dQp)>aJw`U%0y!mv(@x4zRbfZG98ed78D)j5q@rj$*GQ0E`{exICjnxp);)c4-x1O_03r>mdKI;Vst01oZNTmS$7 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 9462fe9a1ad3b3da8b06a36299e80ed1bf1bf343..1b5f0e981ace2d741048bee1c336c71e07310b9c 100644 GIT binary patch literal 2995 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 literal 640 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw3=&b&bO2J80X`wF|Ns97GJzziz{T_GA)rp- zk|4ieUj`Qsc3oycdoCqoD|HJQaS{IM8^U%oFfcy$ba4#vIKFlI?P;qOc-oX14@G|Y zD_^#KTeVKYBH8PI%=fOi-!zBW$Nkd0CQmNL09D}=uU~qwZ&)fIYf@x5VK3A5B@Z05 zt{UIaV~v=4)XPAU#WAC!J)KoO$e1~sSv=*7;2Y(bpfAd6WMigWwtW*Fwyc)>HAlS0 zD>kzaQ_rZ|9G*U_e8!I-NoVwrK9hF+pQs&Ub$fnM;n|~arQ;@~iq<~SJERwLuV7-* zuEX0pJt_}|a-I6JkZ1lX{~Kx-SMRpEuJXIVlk-E}Yeh~`+Xo68@}zw3iK+<*8}IL{ z$yl4`6C|LWRJm#O;r6~)%pM6>!|bMdGc%ohvS>EPSFVI}KHJs=^Kb+ni_A0RoRaWq z*H7-7{~22~qIX{VxF_D_$JAGB#bqbc7vJ-l7I4)4=Si=X>sta^dG&1O@J(`=DdVK) z5j}-<^4SUVB=+20QTjWQ#e#v;IK)hHh5pIDt!`40vBm~}qe7N+Ufre`V|~M0t(B1rxZEuBwfCPZ#DBf^j)A)J>1l}mdKI;Vst0G>H9kN^Mx diff --git a/xplan-ios/Main/Room/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m b/xplan-ios/Main/Room/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m index b92e4b40..c8836bb3 100644 --- a/xplan-ios/Main/Room/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m +++ b/xplan-ios/Main/Room/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m @@ -396,6 +396,9 @@ UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicOrderKey; _playOrderButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_playOrderButton setImage:[UIImage imageNamed:@"room_music_small_player_order"] forState:UIControlStateNormal]; [_playOrderButton setImage:[UIImage imageNamed:@"room_music_small_player_single"] forState:UIControlStateSelected]; + NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; + NSInteger type = [defaults integerForKey:kRoomBackMusicPlayMusicOrderKey]; + _playOrderButton.selected = type == 1; [_playOrderButton addTarget:self action:@selector(playOrderButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _playOrderButton; diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m index abe26af4..27508f4b 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -704,9 +704,10 @@ if (currentUserModel) { if (!self.musicEnterButton.superview) { [self addSubview:self.musicEnterButton]; + CGFloat topOffY = self.delegate.getRoomInfo.type == RoomType_Anchor ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4); [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { make.right.mas_equalTo(0).offset(8); - make.top.mas_equalTo(kNavigationHeight+4); + make.top.mas_equalTo(topOffY); make.width.mas_equalTo(79); make.height.mas_equalTo(22); }]; @@ -1331,9 +1332,10 @@ if (currentUserModel) { if (!self.musicEnterButton.superview) { [self addSubview:self.musicEnterButton]; + CGFloat topOffY = self.delegate.getRoomInfo.type == RoomType_Anchor ? (kNavigationHeight+ 4 + 22 + 18) : (kNavigationHeight+ 4); [self.musicEnterButton mas_makeConstraints:^(MASConstraintMaker *make) { make.right.mas_equalTo(0).offset(8); - make.top.mas_equalTo(kNavigationHeight+4); + make.top.mas_equalTo(topOffY); make.width.mas_equalTo(79); make.height.mas_equalTo(22); }];