From 24d8d78b8521520c25a438120436241a6b260a9b Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Fri, 1 Apr 2022 15:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E7=9A=84tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home_hot_section_logo@2x.png | Bin 1468 -> 1414 bytes .../home_hot_section_logo@3x.png | Bin 2355 -> 2220 bytes .../home_nav_open_room.imageset/Contents.json | 22 +++++ .../home_nav_open_room@2x.png | Bin 0 -> 1144 bytes .../home_nav_open_room@3x.png | Bin 0 -> 2061 bytes .../home_nav_rank@2x.png | Bin 1260 -> 1675 bytes .../home_nav_rank@3x.png | Bin 1984 -> 2564 bytes .../home_nav_search.imageset/Contents.json | 22 +++++ .../home_nav_search@2x.png | Bin 0 -> 1181 bytes .../home_nav_search@3x.png | Bin 0 -> 2188 bytes .../Main/Home/View/SubViews/XPHomeNavView.h | 8 +- .../Main/Home/View/SubViews/XPHomeNavView.m | 93 ++++++++++-------- .../Home/View/XPHomePartyViewController.m | 12 ++- .../Main/Home/View/XPHomeViewController.m | 47 ++++++++- 14 files changed, 155 insertions(+), 49 deletions(-) create mode 100644 xplan-ios/Assets.xcassets/Home/home_nav_open_room.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Home/home_nav_open_room.imageset/home_nav_open_room@2x.png create mode 100644 xplan-ios/Assets.xcassets/Home/home_nav_open_room.imageset/home_nav_open_room@3x.png create mode 100644 xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/Contents.json create mode 100644 xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/home_nav_search@2x.png create mode 100644 xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/home_nav_search@3x.png diff --git a/xplan-ios/Assets.xcassets/Home/home_hot_section_logo.imageset/home_hot_section_logo@2x.png b/xplan-ios/Assets.xcassets/Home/home_hot_section_logo.imageset/home_hot_section_logo@2x.png index 19d5d2c2a95453ee38e99990f2225861a0ac6c00..2f35c5d3228d836e824feabf3c03c0b91482907f 100644 GIT binary patch literal 1414 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 KMNUMnLSTXyyk~a+ literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Home/home_nav_open_room.imageset/home_nav_open_room@3x.png b/xplan-ios/Assets.xcassets/Home/home_nav_open_room.imageset/home_nav_open_room@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..8effaedc9cc65d0a40d08c39185fa7a18ca33887 GIT binary patch literal 2061 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 literal 1260 zcmYjQeLT~79RGP(E$cy^%1V}27q_i!G*ZoC7k8o9q13gk2cd}Nq2?e*$)-`DH&{=7er?>|1TZ`wZ3J33P$(MwLI?x`iA2(rH2MFRv|Nj}wzk^- zg$@cu6B3C;E!U!*ot-xS-{J)c?fWvNC3rj@#(oSw_!TH_gU|!ot>Fy==8NECaep}$ zdUk=L2nwG)PageZJAOOU^@B$5!NiZG@ zBd4KrE3_B`Pao!P!bAcLpMw7V(B}a{_XVN9=nE2m7{YWG$kJgd72cl*DF+00&_Mt` z9%gwUtAm*<&>Ic!qhK@~x=+I^D|m&IJ<^BCN*F7H5BV^B6K1c%Ksxj#fHZ=iw-nwL zfwTZ5Iq=$hH_e`EPo_C-i8^YP6tb=~$qdFXgD4qBVx%3xAUF=4Y!DoU_5&lW{w3GF z<@`M*xvtQ$^Kqt8X8~sLK6>CD`a`XrS@KOQ%~hN@-kv_lyu9$kt(6#*j%rBI{CmoY z0ER{Hy*Q?=S@pGy=&++S$IbY$u9r=IiQrTJBTe$BE)S=`^S+bB?#0!R@4(2mIt<`k8x)R1#!;N#zk6 zvW0(!tZopz{Dfiq)X0~{ONAGsnrkpdiz^Q4siUw;ua?3_ub*um*P1F9F(%H&doo?QJ=Bkq=^B7pm4|X-#p@_vyzJ(O8d8Y9)QdjOr768jb1=Usu5?i%c?`#4 z9vL@|dt##d!1Bt}h5S0nd~V)ZmZ@Q-e#&mH;>a^rS11z4sE(cc{F=Uva56O74fpu1=fy%~>JBT*U|?O+FoFF%kXUPMCI}&*JJn^e zagkw`D7niF`jx-rlnlqga0gmZ{-i1CP;`*v4h}WyJ3_~by?#w)9Pk5oqrPLlp|<2^}X>xcEO@;g}&|)$7jhV zl8CD6b*l^5imL87B%DyNfwup7bEd=E7EHH#QD2Elw7%iMwLe3GA5QchuGdx6Su{m* z*!I~G{_pSM-&EdWsFzp7vqkC24!AO=x%MU`F`bsj5L*V2!h0%#yeD z{Hc*nn%P~H&z6lhI`Sq*A_hG(R|v&aqtnShjBecKY{M)0luzP9TljfXBf1oFFCH@Q9f^V4s diff --git a/xplan-ios/Assets.xcassets/Home/home_nav_rank.imageset/home_nav_rank@3x.png b/xplan-ios/Assets.xcassets/Home/home_nav_rank.imageset/home_nav_rank@3x.png index 1969fc16320cef1985f99b7000285f8f859c4e50..a24339de5f4c07f331a4971165e3a5c6b6b354eb 100644 GIT binary patch literal 2564 zcmW-i2{_c<7srR1Y>5V0qe&zgl@_Ic3gbn{QW=^QqO!fV7bz;GMJjJ$EHfE1_L>o6 z%QBHH*=3keh*BaI|Hd-&n>qjKf1l@W=bU?=@8{g}JU7w#n2o%whAaw&lDD(PyNYLf zakrITB_0!3FGrzJl1t7GC#=O=7;{9*Oa(dG!lt9p?zxh?1=e{#l^k8D(}yNUgt2|)i58M0)?ohUNS_1LoAVyY z0DBA6Izf>Xl*&WD6TC7N+y5Zc;YBQ~mHaLId_6>r&vp{iAv8T?_&%g;fI3GJNgbi+ zAXKavABrR(TMp8cfGPu7>mXABo=N~4yYxgI^3c%X33WDt!X2WljgYDe>FXg^N|dPu z;yj4++@QZq(SoWCP%5)XR)N>Y{|I=j0wrh>SsO?gc(n~)s6)YOF*TB>w?x$xrE7@A z2y-?=?M5hE1q?~3vlM1%K-*q;Z3GqTe~Y4(CrT|ZG|-l`9(_bITtuF z@ER{F*b5V67)yl@4`KK=aIe9;0O1=y5%VCtFop_Uc)AvTycBjv!rL(DcYtPl5z7uK zvxJvsP`wpO^#vtZ0dtcmdlL*tLSKlmQCvBDpu|K((E*wgOx%OFCq*m^XgCb7_CT&q z$gO-Oap?#D<9h5kN>a*6R$XD$4lU95$w@Qx^77A-!GZkC1YO-t7{RyC-CY&WlJ9R@ z;r;wJKGM8qU9yt z@87f2pFeTiTbi58i?Xw$ogA`)e$Js#Yn<%x7AM?a&yoC2r?@D$j_*2Bkdu>eef0m0 zNtWAscmL?>T^SLrl=AaS1L_?0oS=I?Qc=;-f>#kg$z*9V{}q-0%R7Asj7MZ&>8aT< zfA(70f08O@$Il7)o|@^*%-xX)y@o?zkSn(YbWO(W+GR6C3i|YE&Lojgelk0_O@TRH zcV+nHR77j?xJev`t6r`cVA=Ilx+eDMYp<*N@0>FYzdUNM+89x>_nb_-83s$m9QZqY zUQywlbEL0{x__YjJ8njdl0M_!-G6QVdPqL>p36n6DL6B5`*5}Rpuk1unCHRh6vQwYV`Jx4}ZChW?P z?(o8~$q`oKgTVMm#j?jKJdcdN`i0q@o#UnkcfT>?7|bGrwu(K@*wi8i*|kRTLEm_9 z(bN9VORV%X76=Nw1s~$o0|yh2`TOIqo3!e)m86@(`Fgr;N8IiWO1_tswZ547Lw*XyLf$5sO zg$n%I)32Q5FeXR!CkCBrtTnFhslh+!xE*Y_PRZ6&al5%(%jPTFm8qNxJ!M(yq->iD z+i#CyN(E+H{AYQ+);1|;26ET0b_8l^AmKK3~he(WRdf$(y-R zBi)9(w!1|p-=(;Di0fVa&qQof?mg}I9pp5xJ^eZ~H&xtFd+`)?=zxI$EpN(v@nLML z-0MW_tOJGjVV(P?q>$=SiX8>bPHPIgwe`_aIrm{XWzHviqfc|CYvmpr@r(^|rPk)= zZnt@tjr_KgDpX7ldpNBbzZL3yF(QHG9u*c$WApBLkDio}`-!8teL!wr?&=VXO2rc_ z5?l+zgK!eW>baoPKkY&PsB5~jGx4tlO#XGVA_eKidE2i_IWs7IT>aDq zGj<}uer71yp>y7`BJrDjYOBSsgruijl%X#t>%NXoP*PU&hq;&%)}=v>O~hU6DHo`h zmBLO{9&FrGw{F&cB>bvUJA2SvbK+q@YU0GzEws<)(tH=<`|^I+Iae9y6yWI}Yi27J zf9-6F^TUlQzMo_q_b)qQK7V}SqiT;gKHatfDZ znh$h+Hdxq8xfHc;H~(w$xkF&((NNe*Z54q!R-qr>&vJ<{))N0|C_C$8 K_!3L68~+1!2U(v0 literal 1984 zcmZ9M3p5niAIE3Mkat={LLQ+tp2HY}Da_;%$$u~@<&k&!lW9hXl#(85S%tCrmr^2W zH~%b3dGzp_VTLiDO+%Q)Q1UG6x6^S>XV2bq?)UzFzx%zPd(XM|+)LhGt_rdmvIqo1 z!QG8S7LRVep#mk{h3)*#|Sq3IgL8mDQ6M#3ntTGoC+UephXQv zqk&6+Rt;FV33E4K`aDd~VJr>=M}Qv)@BF`=fk%X1N9eHwmN5+Z06zc*{{#Jd>})aO zGsEWs5M{zh1Ppk>TqC>>hUv#J%7CE^m_7@`elXw#vvnYP3KPX3$OZltn7IVp<1i8i z!uue)2!p4gKN&b-(C3yKp;LYJ$AwxX%(sBB97e7|PYiShJ;>h|;$y_VEhnmy1W^%8 z6ap^+cr@TdLFYkevvng{?Q=1?dq!=bROV|va+G;&l^+2eWa#jQE{~5LF2HjBjo}=8 zU{}z7e7K+CiJ&elzj3yTAA1Kx=dqixc#&zZf#{gKO`tne{FeTPQdGJ zsjscf{pCz@WPmMBUHYf^EDr<%#d9Y)`T94D^2XA-9o65O?=7O6-aA}B)%LtdFf-HJ zq~0tgzs2JJQNN3`nVB!8@hA7?9wPUmmOn}@*Y}I&<_F*U%m<}iU1eW3*3VzgvAx@^ zbt0-+SP_1oWJZ_wryaCiNs__RcT8~cH@=*&v&B80+<4sAeax7xN_UU)+2G-&$XDx- ze?3fCMjI_ME^(6v=S1kuCJyyf_RxxXY>L}C_Xd8TcYK^lL|a3ejIV*vjfXk~GwqR$u-*#cAV>59z9cn80Vz?WY*@ zzzoNcb`^u4^$LqweMMuhv~&r!CLQ>i1ykCY;8>d6qfp;@>7k!PI97i=P2!T9@MrK- zy+$7}PUz)wK~R0IkJ08HzjC|tPm`Gg5&;QCLHP&sZcqAhb&1AV`W4#N7L~7#Zp`rS z^1jrag@5RtY!R7yv|q|XF5@{vZ_8yR3gTlRHNwf3kUdT@BurV9M(2g~D!Z9cFC>1^ zHIOc6l|;%3Oa{BGk7O+Kr zbHj}{!^{g-$oj{dI89f1Z8kq98c%0kcc|FX`oT0|TRdyWFCR?9oL1%)Il1H#qf7K0 z?2I0N;Kjl50|kNM2`)a$=efv`O{o$5ILiBr)EZAteqzhs*+=ALjf{Dv;nR8tC!Zx{ zlh@q*%^fOr_!zy1lLbV5k1I1Z&xIT27L)_`V8hC?C=`NB9ZfehTsm=i@m*ie(QB0S zn9rXQRgsZ0&5c+O;zJZ+M`lG=XoS79&js(SK0-PXSA0d*+v}5{r1S z;#xaq>HOmG^Vsy39E;9d_XV|*Wv$G{IofB5%&L&H|Jx~**_K_N!Z76Je=)>jLYx{o zjD~5q!;}DIPpe(5MSCr6$}mxmLD}!*T5Rd6FlBHgHcfw~fe_eUsIn=|uVlmUD)m#p zC{pd^>13ojQ}bhM-c)3i!Ex(Wjq!m|71yrL2dwaAU6-Ko-Mh-}9L?pRS-vq&yUbr? zKHJl27pmy8D$FmDdu=SK!W#~qV8^*FHqY%6cBad}l;HHAV=cOrgzintjL5FP@Ono$ zEjqUScKTgfxf{BL(eg<4(QOA+Z*TMiU&)@J&r+6SA5=1}&9hTZC|>KnLo9S(yomPh lV-8tfX&Sqclr+EZPy1LP)%11=Cd7Xz!hN?FsnR(({cnfJ*&P4? diff --git a/xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/Contents.json b/xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/Contents.json new file mode 100644 index 00000000..dfa884f4 --- /dev/null +++ b/xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_nav_search@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_nav_search@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/home_nav_search@2x.png b/xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/home_nav_search@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4c5fab998501eee5372f9b903e617bec82284e8d GIT binary patch literal 1181 zcmWksX;4!K5Dr2iT2zh#+KM<7K}R}xK#Mp?65>FD38!eFaz;@gDn&&`MT~%`=m-Tz z#ff>zqj}*7K0`nbwE+ReiWNb@BaV=2E4C^{te|{Ne(W(jv)_K-?jDN}hRmMz^(+R1 zF`F04jWWfRCR@(5G`0WOJL9fBzowwb$3 zEk~~-rx9B;W_)QYcGN;rhYbW`rYYZ|LPjluNu>UQ+y-RS zfK`LMMyyvNy$*XWgG1ryHSE@5Ujug3p+pZ3jc7SS6xbk#fB=s`7=ev)a1{{A5l$dN zj(7rFDQs4lVUtKCD3R4*o|RGsc9ogc_G+Z5!6Cs>BAZ5_X|4)+SCC$V1C7{KkDVGb zvBNDm)NG~^qy~#Zu)-|a#KfdAl0e@Jv^@gV3!(>=-Dd5-4WqOjacYPtJp2pweK>B~ zi4M^kJbjH$1N2Xz?MFoiiraAIA<{JHlHH#$T_|LClrY+o;psWToHPCNnx)PoCr`$Q zhX(q(O&UiA2Ksxt={lKg-yYv(6BFa(<71<*UK&T95BBwScD6Ovsz{|Yf3GAnJ(~Tpx$Yr}x&QU$ zEEo<5i;{*)Naek5!=cjVDQ{k6Ot?pEN{w@L;&982(_(Fc*UW(T8|-dBUlH%NGIi@s zp)Rh*?b!T_XF5(iyn5bv@?3JI&EM(oPv@7cPx)h&k5r%W{p>Ldu4-&b-eWYjzj5@H=1&==_u26B^1t}^~cUG;rr($6b|}mzk0mQ_x$QO&wTFN zj~{tXD=jV6x*jLC#|>Myx3{gL;G4*k`3*gmNZMKcbhRCkRd9u6 zJh#`8oAYNfn_*$kv`yuYEwIWGJ0CSTRmqs%L*>Q=#T`ElUFdzwk=f6njj?53xl*d) zw(HREVGi`#0@671JT-7X%D(itUx7cf!PEc8GfT=AF3zn`Rwz6i6JPUF1XcU&qaB~I zN)~17HPsKSxcM%fY1@)zTg!u8Is=N^?f8Zh^QlnhFTb6~x1CG+=?h1lR$bOwI}H!m zW$^5BmY4rZ%l+&%O{eeV#U#26S~1^U7PqT)<*!o@(7U*wTDHe{C3!C5ltx<7u0fLi zxJzfNNcZU*i>;r2l4Xem#|yXLRl7YK3DR%7?(@&BWZLtG3zs%of05lq@sf77q^VR3 z1*;SPof7&sl>`|0hRonOoXK;py-!9R0=t&jxxSF{Y%Er_WWTF3)JyM-Bgo_Ptwg1i VYjN-5oh_ypX7JVtxf)KA^nc$|g;D?j literal 0 HcmV?d00001 diff --git a/xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/home_nav_search@3x.png b/xplan-ios/Assets.xcassets/Home/home_nav_search.imageset/home_nav_search@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..58f8e6eff6d6ee94608a6b99863c45cb0afc0212 GIT binary patch literal 2188 zcmW-h3pf+{8^@>4RFqQ~g-*I5m;cd)>iEaDOs=zLB=naobL+TYB8*6pu2fRk#Wvf_ zY;)g;SWDtjDoP=j{*g=oL1rTmX^_?cVO$7cfFBKTOz@`x zfer~GRq{j$#0Vi;0tsR`#fAtWL8>K01eJmsYJsvA-WnO`QS(g%>N}-DuAs3Y9lyQf;}J5 z92H4Y9bnjSwif&=abO!4%*)WzYj_uL$(x72|zIdEpI?N2=%Xk z-2;qnxZV!QA_x=0@C>}3hC6b=2|)G+s-FWz0xmoV%)b(@d}n9kiFmJ-2z`k@QbTOI zL2K3TrdxEEmzPKP@0p*O>Jt}5leZZxf1T@Tl~fg7yclzW`B~I+si_oylG7o(zkmE#TKqQu*UZHD*!$7fgD<-j3Ry#~gm?W~MtX>=izz`$ zTt*;}6cXU3?0*En)m>a1+>ozmkPHaf|Wy5{#T2NY$TzO>VU>`_MA{LAP%!ef3lqx|(&Q--inm|u=5iCN);0!=crVB)g6AJKKNpnRC8l-#etg5;o0A(WV|lgh zz|gMwa8uQy@5YyJrKE%SUA{4Sfn;p_B?s= z_kJp$Lo1IB$ z^t)!gv+U6EZDf!9YJrWRoxg#f-y5k3wgwqvE*uYLY5Hz;GxkpKh)a9O*0Lx*ipP*A zo=kj|NN}V7R9(0BB~`NBS2+rUVR zBK8j?phI*k+DU)p62q{Jr7GTBNS=AptAztbRexL{9=5dlTVqWHF)VV;p8vQ>^#tk> zQJzUxAL5ClVk}87&S%Npyug(~xI9vGa(wh_>P%vMl3i1Sn}W5iP#)qnq%l!T*UsEi zEd9-s(soD-XPe8!B2jt%^^49+{NlNbTy%Zv?KS#4O3s_@2>NJOp*Afqu(prT^e8@& zsKe|chs-}B8DKZr&K-YljjQc{VKaSJ^ZhYSyROLT%kk|oZ6=ia;+A}?@7VfnRTu6id~5YhimAqex7*n(tdqHicCi9d^+@*Y3z&6?7W9cDeS_& z3ozV(bmKgKSab7fn{J)6`Q*@s1?r--?m>O&AjLUnSM28lsNd90^awbwCBC8$eZ5yd zQfog-m$WOg+rm=0xP@~)KX*I6?PcyNdm0pFY36KJINkSo^}Doy3!D}=g~#b&&28Ld zqgi{`V{shQDF^qJ_yj|*oQop=@#RwW!Yz2 zDisY8`-VtGdQTcMmv4olmd-5<-n+a{nw^cUp{6w9ryu3r<@vvpr(5AV6dT`{e8 zuX$n$Q#?F7mhx5OAoBS}4VUl2yl8H&PDOgv@!(Ou;_?a{J8RQvfqH;&E?{P2C%gJeZ=)0z0SEyi~ zIaEf~#F__04|fcN?lw|uD-U@9ukdB@;TU&!EY`g{E9NH4t+mXQyY#iwkmxnA%^ziw zUr@9&&Q?8q+ow&HoBC%F1f3h+g@u@><(3cb+&vw23`x0ucMHN$8^uT3?Dioh?hMro zKNXou{-Rge7+@qtrrOQVU6~N4_eLFlKmPPpN5;=6AIM%<=WT0u;i) - -///点击了搜索按钮 -- (void)xPHomeNavViewDidClickSearch:(XPHomeNavView *)view; - +///点击了搜索房间 +- (void)xPHomeNavView:(XPHomeNavView *)view didClickSearch:(UIButton *)sender; ///点击了榜单按钮 - (void)xPHomeNavView:(XPHomeNavView *)view didClickRank:(UIButton *)sender; +///点击了开房按钮 +- (void)xPHomeNavView:(XPHomeNavView *)view didClickOpenRoom:(UIButton *)sender; @end diff --git a/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m b/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m index a533d44a..c5b1f283 100644 --- a/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m +++ b/xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m @@ -17,8 +17,10 @@ @interface XPHomeNavView () ///排行榜 @property (nonatomic,strong) UIButton *rankButton; -///搜索框 -@property (nonatomic,strong) UITextField *searchTextField; +///开启自己的房间 +@property (nonatomic,strong) UIButton *openRoomButton; +///搜索 +@property (nonatomic,strong) UIButton *searchButton; ///滑块 @property (nonatomic,strong) JXCategoryTitleView *titleView; @end @@ -39,29 +41,33 @@ - (void)initSubViews { self.backgroundColor = [UIColor clearColor]; [self addSubview:self.titleView]; - [self addSubview:self.searchTextField]; [self addSubview:self.rankButton]; + [self addSubview:self.openRoomButton]; + [self addSubview:self.searchButton]; } - (void)initSubViewConstraints { [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(self).offset(12); make.height.mas_equalTo(40); - make.centerY.mas_equalTo(self.searchTextField); - make.width.mas_equalTo(150); - }]; - - [self.searchTextField mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleView.mas_right).offset(2); - make.right.mas_equalTo(self.rankButton.mas_left).offset(-10); - make.height.mas_equalTo(30); - make.top.mas_equalTo(statusbarHeight + 14); + make.centerY.mas_equalTo(self.rankButton); + make.width.mas_equalTo(200); }]; [self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); make.right.mas_equalTo(-14); - make.centerY.mas_equalTo(self.searchTextField); + make.top.mas_equalTo(statusbarHeight + 14); + }]; + + [self.openRoomButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.centerY.mas_equalTo(self.rankButton); + make.right.mas_equalTo(self.rankButton.mas_left).offset(-20); + }]; + + [self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.centerY.mas_equalTo(self.rankButton); + make.right.mas_equalTo(self.openRoomButton.mas_left).offset(-20); }]; } @@ -71,9 +77,9 @@ } #pragma mark - Event Response -- (void)didTapTextFieldRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeNavViewDidClickSearch:)]) { - [self.delegate xPHomeNavViewDidClickSearch:self]; +- (void)searchButtonAction:(UIButton *)sender { + if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeNavView:didClickSearch:)]) { + [self.delegate xPHomeNavView:self didClickSearch:sender]; } } @@ -83,33 +89,14 @@ } } -#pragma mark - Getters And Setters -- (UITextField *)searchTextField { - if (!_searchTextField) { - _searchTextField = [[UITextField alloc] init]; - _searchTextField.layer.cornerRadius = 15; - _searchTextField.layer.masksToBounds = YES; - _searchTextField.backgroundColor = [ThemeColor appCellBackgroundColor]; - _searchTextField.font = [UIFont systemFontOfSize:13]; - _searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:@"搜索昵称或ID" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [ThemeColor textThirdColor]}]; - UIImageView *searchIcon = [[UIImageView alloc] init]; - searchIcon.image = [UIImage imageNamed:@"home_search_input_search"]; - searchIcon.frame = CGRectMake(11, 7, 16, 16); - searchIcon.contentMode = UIViewContentModeCenter; - UIView *searchIconView = [[UIView alloc] init]; - [searchIconView addSubview:searchIcon]; - searchIconView.frame = CGRectMake(0, 0, 34, 30); - _searchTextField.leftView = searchIconView; - _searchTextField.leftViewMode = UITextFieldViewModeAlways; - _searchTextField.clearButtonMode = UITextFieldViewModeWhileEditing; - _searchTextField.returnKeyType = UIReturnKeySearch; - _searchTextField.enablesReturnKeyAutomatically = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapTextFieldRecognizer)]; - [_searchTextField addGestureRecognizer:tap]; +- (void)openRoomButtonAction:(UIButton *)sender { + if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomeNavView:didClickOpenRoom:)]) { + [self.delegate xPHomeNavView:self didClickOpenRoom:sender]; } - return _searchTextField; } +#pragma mark - Getters And Setters + - (UIButton *)rankButton { if (!_rankButton) { _rankButton = [UIButton buttonWithType:UIButtonTypeCustom]; @@ -120,6 +107,26 @@ return _rankButton; } +- (UIButton *)searchButton { + if (!_searchButton) { + _searchButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [_searchButton setImage:[UIImage imageNamed:@"home_nav_search"] forState:UIControlStateNormal]; + [_searchButton setImage:[UIImage imageNamed:@"home_nav_search"] forState:UIControlStateSelected]; + [_searchButton addTarget:self action:@selector(searchButtonAction:) forControlEvents:UIControlEventTouchUpInside]; + } + return _searchButton; +} + +- (UIButton *)openRoomButton { + if (!_openRoomButton) { + _openRoomButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [_openRoomButton setImage:[UIImage imageNamed:@"home_nav_open_room"] forState:UIControlStateNormal]; + [_openRoomButton setImage:[UIImage imageNamed:@"home_nav_open_room"] forState:UIControlStateSelected]; + [_openRoomButton addTarget:self action:@selector(openRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; + } + return _openRoomButton; +} + - (JXCategoryTitleView *)titleView { if (!_titleView) { _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero]; @@ -136,9 +143,11 @@ _titleView.contentEdgeInsetLeft = 15; JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init]; - lineView.indicatorImageViewSize = CGSizeMake(54, 15); + lineView.indicatorImageViewSize = CGSizeMake(48, 12); lineView.verticalMargin = 6; - lineView.indicatorImageView.image = [UIImage imageNamed:@"home_reommend_indicator"]; + lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFC000), UIColorFromRGB(0xFFD15A)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(48, 12)]; + lineView.indicatorImageView.layer.masksToBounds = YES; + lineView.indicatorImageView.layer.cornerRadius = 6; _titleView.indicators = @[lineView]; } return _titleView; diff --git a/xplan-ios/Main/Home/View/XPHomePartyViewController.m b/xplan-ios/Main/Home/View/XPHomePartyViewController.m index a51f7085..802089af 100644 --- a/xplan-ios/Main/Home/View/XPHomePartyViewController.m +++ b/xplan-ios/Main/Home/View/XPHomePartyViewController.m @@ -75,6 +75,7 @@ footer.stateLabel.textColor = [ThemeColor secondTextColor]; footer.stateLabel.font = [UIFont systemFontOfSize:10.0]; self.collectionView.mj_footer = footer; + } #pragma mark - 刷新的fangfa @@ -185,6 +186,16 @@ return self.view; } #pragma mark - Getters And Setters + +- (void)setIsAnchor:(BOOL)isAnchor { + _isAnchor = isAnchor; + if (_isAnchor) { + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self headerRefresh]; + }); + } +} + - (void)setTabId:(NSString *)tabId { _tabId = tabId; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ @@ -192,7 +203,6 @@ }); } - - (UICollectionView *)collectionView{ if (!_collectionView) { UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; diff --git a/xplan-ios/Main/Home/View/XPHomeViewController.m b/xplan-ios/Main/Home/View/XPHomeViewController.m index a6a9c534..d6df530b 100644 --- a/xplan-ios/Main/Home/View/XPHomeViewController.m +++ b/xplan-ios/Main/Home/View/XPHomeViewController.m @@ -14,12 +14,19 @@ #import "XPMacro.h" #import "XPHtmlURL.h" #import "XPConstant.h" +#import "Api+Room.h" +#import "AccountInfoStorage.h" +#import "TTPopup.h" ///View #import "XPHomeNavView.h" #import "XPHomeRecommendViewController.h" #import "XPRoomSearchContainerViewController.h" #import "XPHomePartyContainerViewController.h" +#import "XPHomePartyViewController.h" #import "XPWebViewController.h" +#import "XPHomeHotRoomViewController.h" +#import "XPRoomViewController.h" +#import "XPLittleGameRoomOpenView.h" UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; @@ -34,6 +41,8 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; @property (nonatomic,assign) NSInteger defaultSelectedIndex; @property (nonatomic,strong) XPHomeRecommendViewController *recommendVC; @property (nonatomic,strong) XPHomePartyContainerViewController *partyVC; +///个播房的 +@property (nonatomic,strong) XPHomePartyViewController *anchorRoomListVC; @end @implementation XPHomeViewController @@ -89,12 +98,20 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; return self.recommendVC; }else if (index == 1) { return self.partyVC; + } else if(index == 2) { + return self.anchorRoomListVC; } return nil; } +- (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index { + if (index == 2) { + self.anchorRoomListVC.isAnchor = YES; + } +} + #pragma mark - XPHoneNavViewDelegate -- (void)xPHomeNavViewDidClickSearch:(XPHomeNavView *)view { +- (void)xPHomeNavView:(XPHomeNavView *)view didClickSearch:(UIButton *)sender { XPRoomSearchContainerViewController * searchVC = [[XPRoomSearchContainerViewController alloc] init]; searchVC.modalPresentationStyle = UIModalPresentationFullScreen; [self.navigationController presentViewController:searchVC animated:YES completion:nil]; @@ -106,6 +123,25 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; [self.navigationController pushViewController:webVC animated:YES]; } +- (void)xPHomeNavView:(XPHomeNavView *)view didClickOpenRoom:(UIButton *)sender { + NSString* roomUid = [AccountInfoStorage instance].getUid; + [Api getRoomInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + if (code == 200) { + RoomInfoModel * roomInfo = [RoomInfoModel modelWithJSON:data.data]; + if (roomInfo.isReselect) { + XPLittleGameRoomOpenView * roomOpenView = [[XPLittleGameRoomOpenView alloc] init]; + roomOpenView.roomInfo = roomInfo; + roomOpenView.currentVC = self; + [TTPopup popupView:roomOpenView style:TTPopupStyleActionSheet]; + } else { + [XPRoomViewController openRoom:roomUid viewController:self]; + } + } else { + [self showErrorToast:msg]; + } + } uid:roomUid intoUid:roomUid]; +} + #pragma mark - Event Response - (void)recommendMoreNotification:(NSNotification *)notification { [self.homeNavView.titleView selectItemAtIndex:1]; @@ -141,7 +177,7 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; - (NSArray *)titles { if (!_titles) { - _titles = @[@"推荐",@"派对"]; + _titles = @[@"推荐",@"派对", @"直播"]; } return _titles; } @@ -161,5 +197,12 @@ UIKIT_EXTERN NSString *kHomeMoreScrollPageKey; return _partyVC; } +- (XPHomePartyViewController *)anchorRoomListVC { + if (!_anchorRoomListVC) { + _anchorRoomListVC = [[XPHomePartyViewController alloc] init]; + _anchorRoomListVC.isAnchor = YES; + } + return _anchorRoomListVC; +} @end