From 2ff47ed7b53e4a671dc78817a32c7ad47b6418eb Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Fri, 1 Sep 2023 15:52:10 +0800
Subject: [PATCH] =?UTF-8?q?2.0.0=E7=89=88=E6=9C=AC=E9=A6=96=E9=A1=B5UI?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YuMi.xcodeproj/project.pbxproj                |  12 +++
 .../home_nav_open_room@2x.png                 | Bin 1469 -> 2258 bytes
 .../home_nav_open_room@3x.png                 | Bin 2593 -> 3399 bytes
 .../home_nav_rank@2x.png                      | Bin 2121 -> 2366 bytes
 .../home_nav_rank@3x.png                      | Bin 2956 -> 3447 bytes
 .../home_nav_search@2x.png                    | Bin 579 -> 530 bytes
 .../home_nav_search@3x.png                    | Bin 875 -> 847 bytes
 .../View/CustomView/XPNewHomeHeadView.h       |  16 +++
 .../View/CustomView/XPNewHomeHeadView.m       |  20 ++++
 .../View/CustomView/XPNewHomeItemView.h       |  19 ++++
 .../View/CustomView/XPNewHomeItemView.m       |  96 ++++++++++++++++++
 .../View/CustomView/XPNewHomeNavView.m        |  20 ++--
 .../YMNewHome/View/XPNewHomeViewController.m  |   3 +
 13 files changed, 176 insertions(+), 10 deletions(-)
 create mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h
 create mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m
 create mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.h
 create mode 100644 YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.m

diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj
index 8311b4e3..2c12bb3b 100644
--- a/YuMi.xcodeproj/project.pbxproj
+++ b/YuMi.xcodeproj/project.pbxproj
@@ -200,6 +200,8 @@
 		237B94BF2A984DA7007853E3 /* XPRoomTrumpetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B82A984DA7007853E3 /* XPRoomTrumpetView.m */; };
 		237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94BA2A984DA7007853E3 /* Api+RoomTrumpet.m */; };
 		23942E912A86424500D0ECC2 /* XPLoginAuthCodeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */; };
+		23A439712AA1CBF3002E6039 /* XPNewHomeItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439702AA1CBF3002E6039 /* XPNewHomeItemView.m */; };
+		23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */; };
 		23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */; };
 		23B2AEC42A6516C200543D17 /* LoginForgetPasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */; };
 		23BA165B2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23BA165A2A5D2ACF0030C5A3 /* PIBaseAnimationViewModel.m */; };
@@ -1748,6 +1750,10 @@
 		237B94BB2A984DA7007853E3 /* Api+RoomTrumpet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Api+RoomTrumpet.h"; sourceTree = "<group>"; };
 		23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAuthCodeVC.h; sourceTree = "<group>"; };
 		23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAuthCodeVC.m; sourceTree = "<group>"; };
+		23A4396F2AA1CBF3002E6039 /* XPNewHomeItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeItemView.h; sourceTree = "<group>"; };
+		23A439702AA1CBF3002E6039 /* XPNewHomeItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeItemView.m; sourceTree = "<group>"; };
+		23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = "<group>"; };
+		23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeHeadView.m; sourceTree = "<group>"; };
 		23B2AEBF2A64E9C200543D17 /* LoginForgetEditView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginForgetEditView.h; sourceTree = "<group>"; };
 		23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetEditView.m; sourceTree = "<group>"; };
 		23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginForgetPasswordViewController.m; sourceTree = "<group>"; };
@@ -8301,6 +8307,10 @@
 				E87DF4C12A42C900009C1185 /* XPNoteView.m */,
 				E87E62612A3F5689002F68C9 /* XPNewHomeNavView.h */,
 				E87E62602A3F5689002F68C9 /* XPNewHomeNavView.m */,
+				23A4396F2AA1CBF3002E6039 /* XPNewHomeItemView.h */,
+				23A439702AA1CBF3002E6039 /* XPNewHomeItemView.m */,
+				23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */,
+				23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */,
 			);
 			path = CustomView;
 			sourceTree = "<group>";
@@ -10743,6 +10753,7 @@
 				E84150C527747E0900A7F548 /* FirstRechargeRewardModel.m in Sources */,
 				E8B9843328ABA2FF0022D026 /* MonentsPicResInfo.m in Sources */,
 				9BE9F10227FEE5C200667200 /* XPAnchorFansTaskDetailModel.m in Sources */,
+				23A439712AA1CBF3002E6039 /* XPNewHomeItemView.m in Sources */,
 				E8E0DAE6285C280E00566A2F /* XPSessionFindNewAlertView.m in Sources */,
 				E85E7B1A2A4EB0D200B6D00A /* XPMineGoldIncomeRecordVC.m in Sources */,
 				E86596542701A55500846EBD /* StatisticsServiceHelper.m in Sources */,
@@ -11105,6 +11116,7 @@
 				E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */,
 				E8395334276A03C300CF2F24 /* XPMineDressUpPresenter.m in Sources */,
 				E85E7B212A4EB0D300B6D00A /* XPNewMineGuildIncomeRecordViewController.m in Sources */,
+				23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */,
 				189DD75926E6003C00AB55B1 /* Api.m in Sources */,
 				2331C1652A5EB71000E1D940 /* NobleRechargeModel.m in Sources */,
 				E87C0A9D27D9986700CB2241 /* XPRoomFaceCollectionFlowLayout.m in Sources */,
diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/home_nav_open_room@2x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/home_nav_open_room@2x.png
index f7902242069cf390b993829e1a2d1fb670a9d1e2..f00f9fb030bfbea0303239a36a0d38f770303405 100644
GIT binary patch
literal 2258
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

delta 1464
zcmV;p1xNbQ5xonL7k@km0{{R34I(K(0005nP)t-s0002kxc#!H_q?t7o22v1u=}2%
z^q`>iqoDPtp!uYt^`4>ho}lxip!K(__^YG!q@ecMy8Y3#{I;w3siXFvp!A`i^whWf
zwyXECtM}Kr{jR6>*SY@Mx&EJ`^qryfpP=-eqVm|f|JS(voqwhBpQQEV-Tda={nWGk
zzM1;Uru(~<`L2%mtd94dj`fv}^OBG9&#e2Qj`iZ){KldCvyb_;komBV_?wONnT_<I
zj`g^b`J|BcnU3?Oj`oy}^TM3_z?}NGlKH5Q_m+|KpOf{Mj`YN#`mLb%uafttmiC{J
z^_i6Po{sdAlYjH9koTjS^_r3NvzGX@lK8Qa_^OZhsGatrmG-BS_M?vWoR0OKko1(6
z^WfI})wcZ5u>8xZ`@Wp|yO{d7m-(@p__L(<teW?#lJ}sU^`Dva(60N;toz5L`@X38
zyQuiBmiVTh^_-XVoRsvLo%5QS^Ou?P+}8WUp8LqE`hUfz`oX07y`%ZOpZU0{__?C^
zwxamBp7^w$__3b%oSyWZoAjHH^qP+JnV0j*y!ynd`nj9=r<wMjmh_#X^OckHm6-DA
z-Tl|N{lK95#=QBrl=-!q_^ze))4uz_srsan_Lh|M&%FD|t^32e_)!567XSbNCUjCx
zQviSdFMk#O_}_30sdzp%`}p_h=;z+GvZA4ScVbyfA>`zucXMN6Yfs)p000AQNkl<Z
zNXP8XIcvgj7{~Eqi?-SedeBm^Ewmkz5*L*OmqbDiNfxhURpJ)ovAJk8gH{JYQ1HF>
z`9C3BtVdVBgzyCNf#1ooWB)4onfOQ^M$g`VNPqFO1MKDNphX(QF88*HXsgqi&1Ri;
zE1KAI^24CrnVBTugNJ>lU%i1f3w|c(J*J;W-L_{=3*S(oFg3ll8$I7~@}uQ?-ila^
zpRPR5wH_~anH;m+rlRmXfq_<<t`)o5KKa&aprvyta}dufO0!|zZkc`&w*yP(Fd813
z=YMsg?f75QPw#E5F>w@~%hNP6zdXn5PP3ue_oo}}%MDsb2Mih+9Pr{eU3Vs+Z(cUo
z=Y?3*CIYb>M?i*@&v2OT2otSnFP_6UM;1k`BnZZEI2sWKZw$}$&=7=@R$N3vmp?^B
zf(^iFKV#nQt_}aL4h@4~G4d3K?*L0BL4TGFRaL9x|8)wQ!+}w<P#Oci3&Ynnag11|
zC>84x+*MTylYLyf4#PdfvYe%YQdsbnmD!~<7Hho?xGpVOhRFu`7*B?Q2XK8O?$@O<
z%T}16FD&?~Fl<?>_rvjTdv)*9JP-$P+=mDM09^#p<#`6vv>im#43=PWL%8W6xqm=A
z<h6xD5_L04TeNPmlhsNE{bT)IUjmgo!QC$;_xhRd`hJN)cf0NK7FgBo3v9v(!}r%>
z+-YlCxBCKOt5Vanc4u%S#t;3QK?iA&`xU#ei2(N>1o)2O0YYdCpDc5chR}fFyDJ{P
zT4Lfjz{@QQl?XWw!QbFX-@=4A&3~ptN*6?x`%WCN1Y7-y0FNfG7RIDmwUX76U~Iik
zMqK>HFvYl0wZV->ll?HJ48QU5cxqXcs#M*=tGTMGlv=&%c=X7_kHhh_XWLX!DBM)w
zbD4G3b&6u!fQMoXy46zFEuNtF&8lS^^Ij;xdGQ=Zy}8k<G8SiNi_O|*Hh&7Ai=2l)
ziXrHze!(&f<6=G8Oy~6o?6COY;oZD2^{^JzMMbqxH;a6ii<3MxGrcAXsBWft!o~Z3
zB7@E@Ast!`mn=49S!SB4ocQ}Zd?5KrAgAXn6FUD|n#w^EO9wps*OUA>34%c82Pdbo
zFM0eI=idytAIGQsVvv$IJ2BkhceFS2JV~7A&GwGOFYNLEKi_qDyz|>{Kk5^CV2yk?
S8wUme0000<MNUMnLSTX*2}?}?

diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/home_nav_open_room@3x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_open_room.imageset/home_nav_open_room@3x.png
index db2d173b3154d707d00fa112ad7f9802a93bd240..75871159feae590ec7db21bdf55e5735cbe3773a 100644
GIT binary patch
literal 3399
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
F{|CtsbXfoZ

literal 2593
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
DBOkj~

diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/home_nav_rank@2x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/home_nav_rank@2x.png
index 8361610d4298f9ca0efd3d7bc45491e29eeb2457..f6e5427554b3111de2762f9b739b7da912c81408 100644
GIT binary patch
literal 2366
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
YK54%9zS)ZUr9S~>X^u6cn0S!>3qEgH00000

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

diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/home_nav_rank@3x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_rank.imageset/home_nav_rank@3x.png
index f9c7168a61de8249046fbc79a291fe533a5c4070..9608a88bd6c35345014f26de9096b4054787aef8 100644
GIT binary patch
literal 3447
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
Wr;+aJUHQW`l158SSG7plChUK>=Z94Q

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

diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_search.imageset/home_nav_search@2x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_search.imageset/home_nav_search@2x.png
index cd466fa0392d66a946bd4f741427cd47824a1499..063db99e7a656ac6d378dc0405d26e89b6300749 100644
GIT binary patch
literal 530
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyr2#%6u0VRn_Tvz=eH)aqWBUmp
z0&%w;-?{DR)~#^y<J-3#+p+cdwr$&XZU>UbwrxASb?cGs+m8bg*btz`<2!a72g-sO
zCxGI+wx8SvHhDYH*d51!;`S=fHv=tJD+%%oX88E~$G7VnUd}7<<ri<yi1g58*He|_
zx_{~L@-mZidm4iRt?zf6J+a%-!N9<%=IP=XVsU!v#Mfm_1_CXcBa4K0b~iLd-9Go*
zK51o)$($?2zy2mppE<`j?dbm-;#VL3m>zL&jiTnvwrs&m_EDXz+rEbNZDsM8fBB4R
z7vrg#y?Km}AMIRi(k%S`55r3LN>%fQ>X)WZJS%F<AN;Ab=hQX(!V;?YK07gKqblpA
zoqIfYIOuSljfo17;W*}aZ}};QZU**am8a$(Q)+3ft>Nx8$q3ltv(q!h(YZZu=F_G&
zf1j7KoF~IR|K|@-bl%suuW5C|!KQD)p#>TpN{2GPuABYY?9AVw>ny=JUtA8^?e1~h
zyF9$d?AzZd)7Ez@xLD_x@@SM-?AiZ+?;pKe7DcQLy{|+(yPW%sa#hr3Esl_t`@VT^
t$@29%GKSVG#NMA+Y<PP6m3?y0*r%-$?fm|#rVALx44$rjF6*2UngG&13!nf1

literal 579
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZDgt~$T!D0F_o{}5`JLUX+uK)m
z^{npdSpz0lcY+x}@y^~=UEOPdvJDN(I)Ms+B4Dz+cXc<M+q<T#cMVV+DALxoyt8u&
z&=8O^7zs2MXi;a+s_yQ!K*0s_pK^e9tCs}%1v7l-=vTV9aBo}O<_dcYG2YKFA9mOK
zZ=aeK;%TTU^Zxer6|)PIZzro5b9`iAU<~$jaSX9Iy?4^hvStGwm*&WvYdQ`mm^?Es
zz54%ugYvXw=h9i1r=RQIutSdb*lc_474t)Xo!Yiv;F-hXJ;}Ptt5m`h^={g*am&tJ
zCeOQC-e=$QyIZBg*S=4bTw8mfLVf!}$El}nW^6s*HodTFmqwoJf+TURhlkIE3cvoA
zqI1wWeI^rU+zRn4fl}&Q|Em1jFu^fxos6B~S=rXlb06mSi_WikHY?ypk#A?wx`mUq
zW|Xgp@tvEXG1ZoB+f`{#$>TFh9yLrdc+_UJTS_p<<w)tNn;ij-8$N#)57c+ky?F3s
zx%k2v9=jJabH2K};pDIO+xt`3-;3Oq^<%~wIf-@G&ag&je~;t({-G=Jxa)GIk}HSO
z-M74+_FE~SJUcFd_ow#vNeeEd%+<POaZ9j<Ma%7S=%t@bp+DxiI_=99+IsU?;12co
u3(ksaH%>Yl@@w9s!&R$I4!-z*&D=;{v)R3%>KHIa7(8A5T-G@yGywoqK@~dy

diff --git a/YuMi/Assets.xcassets/low/navigation/home_nav_search.imageset/home_nav_search@3x.png b/YuMi/Assets.xcassets/low/navigation/home_nav_search.imageset/home_nav_search@3x.png
index 63112bfaf6b8ad1aa02e684d7c14db6ba5681fa9..7e9edd78bc3b64097f8f4848491f44732df1272c 100644
GIT binary patch
literal 847
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sivoN?T!HkC?Z;v0#E$L9wr)DK
zV>^%mM8|h-KfZ0t@!dO)?*OCIr!PPRx9<Q+?bvy8Cs2Ib@tr$B8h7kC0p#x53DO8r
z29yGt15yJK*?9~hwf*?+-N&~B6#%sWWp|v|y!i-_y%Vfv=Z=%Rcb(q5=j`Ewmt~iK
zVF9|*uq4PYnBmXIZ?En6{+&H}z?gG$0PD}|p2`xRYfB5A%`~4qynSKE>cumJ+ULiI
zOCOn>U?7*0RR6X02m=F?wx^3@h{y4xp|{Is8wj`v&FF4ykj**%<DFXWy0<+q{{N4f
z%952M`DV|S&j&1ZjCU`#U48VYy~f^)C#2(#%krpKE?lrxBg8<KU+=>Hvrd7TlNu^B
z-n#3X*Zz6GQ^9WMe64`Bm*0KymoGU{y5pvO&Y`VMj7Rq!zHXzi(ADVcqhA(_JzaQT
zEwMQ+pKAADJ<sk|i`Yvp#qWLou`-x$d}O|xC!sF;CqKu-e-`0YzuuWx=3WzSy#KlH
zo~Qhsc}G|lzWQVKu9d&CJVisj=J9^+^S7pC%$~*h;?B!sZ@W%JwXrKIzBxBHrH605
zGh<HD^8GBEkMCbUnQMmCUJs7i1y7_dy%t}>!atA8sAF#339;oNDKBCUG)0(|Utr$3
zQ-!1V?e#Q2(=Y!fC4?{h5Y^P~-IU8}nXl8St-~tS{fy`FqgBq^^;(s#H*>#snYE;F
z^&F|M+;tmkRhLQ4_`+?*!uLDv4Rhf7<wXyJkG6m8<5*VPR4r5f&(%@Cy6n+n?o)-;
z)7Nmmt9sUS;GagKR!7b?OEJ3_^UnN_W6pD5UZ>Tt{3aV`!<&0b*L5#`n_k2jU~~Ug
zlZ9dg&)Oe%qncyR=5#)nYOPMsXPe9^uv#T|PtU7Zi;(wRyN{g>tNXX=iPD|7i<Y{m
zW*@EQO%<88Hg}o5$*xr<yqu|j7nY@p&vbWlTJY~OtJ<~Krydkav3f^(l#8nPewGg3
z^seLTiI1zz_3!(=@w(*mL;M3<)^l%(CFkr9$_r2MOjf?LpBI?s7(8A5T-G@yGywp+
CHnVd8

literal 875
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`)dl#3xB}^}p4EMQ8#+4H02y7~
zV6ta*Cy<Sby1UnQcCYU5-vAT`%64|I>g)w72BKA9#ZZkP*={iE0*QA6)pUc60y02o
zbvICB&l;e1pvvg@f^wh>G)sc~f*HQE@&20r>50&lt@nH1h?#Ir4%Cyqt@7g3?zM9p
zqOA{VR1_|4OZIlkxO<tSl7WG#*we)^#N+tg(C}@q40wF>{njrrcRKmc{Ko_tg`-D4
zd_A}Gmsd*vQpuB>KJ3@sd%H4i))E=1m);$Mp})RtyZkflgJWH6#^qZ_{yZuQc*oar
z;Ec6P>$N?B){&hvBX%u2^MCIjL6z8&UCXy->zlGD_Z{lWFj?@n&WW|8U3AwaC&l#v
z8qV{1cPn_kFF(Dt(;+nN(;=R-+N*n53X+a?JYOVL>HhyofU271b>oE*t**;&3M+4z
z5D;RMkP@QgI<JoJqfhemMa+9L+P3FZ&9+p~%YCSRW5E;Sit0ak^A^rib-p8dzW3S&
zkLKo=+dZp42ELozach~rnAiTc-UG@@?u+GYmHr;MNs(DKsH9w=Z_Q0r{_xlPUZuxA
zZz}JXc(taw!F^4U%f8QHD;@97pUQEt*Q;^H!&QzAzg#W0S=`K8*~BLI{$G>E&r87$
z?8jv!#607x95%F+e_zV5LdRAutT$bhV|!DrtZ!u1r~Dm1Ro~pwTIp`%>98Z`rQ`xe
zr?|TfUOT^-Oej6tXnNtschTq_46O&ngSuOEEst9-D`U!fy|KKRrK5yJy79!0dygK?
zUC$pdkFR#OtP^wJjCaLd7Q4?`mnzP2dekqg#Ps{`#))heSJM|8NKSNJbi8u%(lxWw
z4omHJGFqqkvvj>%r^eDLGyRk78ZDpa72nBrS^Y*V+|?@JYIe?#NeVyR-h_%Bm9eoZ
zdU~c>Cx|UHKy0Q3yOu%V#k5C%j?Ic#cD-$l+!M_ci<jmYbUANmY-D<Na?3jPb4)7R
z9{W~#_f~E?>yf?NcZ=u6+n?n2$`_T*tC{_oXNi2`4E6fD&H7Dz8|2U0y<GfZw`ZKn
cpUU6t0{;_tE(uE808FzCp00i_>zopr0MSvTvj6}9

diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h
new file mode 100644
index 00000000..8d82ed25
--- /dev/null
+++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.h
@@ -0,0 +1,16 @@
+//
+//  XPNewHomeHeadView.h
+//  YuMi
+//
+//  Created by duoban on 2023/9/1.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XPNewHomeHeadView : UIView
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m
new file mode 100644
index 00000000..5a314eed
--- /dev/null
+++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m
@@ -0,0 +1,20 @@
+//
+//  XPNewHomeHeadView.m
+//  YuMi
+//
+//  Created by duoban on 2023/9/1.
+//
+
+#import "XPNewHomeHeadView.h"
+#import "XPNewHomeItemView.h"
+@implementation XPNewHomeHeadView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.h b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.h
new file mode 100644
index 00000000..cdc9fbab
--- /dev/null
+++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.h
@@ -0,0 +1,19 @@
+//
+//  XPNewHomeItemView.h
+//  YuMi
+//
+//  Created by duoban on 2023/9/1.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XPNewHomeItemView : UIView
+@property(nonatomic,strong) UIImage *bgImage;
+@property(nonatomic,copy) NSString *title;
+@property(nonatomic,strong) NSString *subTitle;
+-(instancetype)initWithFrame:(CGRect)frame type:(int)type;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.m
new file mode 100644
index 00000000..440191a8
--- /dev/null
+++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemView.m
@@ -0,0 +1,96 @@
+//
+//  XPNewHomeItemView.m
+//  YuMi
+//
+//  Created by duoban on 2023/9/1.
+//
+
+#import "XPNewHomeItemView.h"
+@interface XPNewHomeItemView()
+///背景
+@property(nonatomic,strong) UIImageView *bgImageView;
+//标题
+@property(nonatomic,strong) UILabel *titleView;
+///副标题
+@property(nonatomic,strong) UILabel *subTitleView;
+@property(nonatomic,assign) int type;
+@end
+
+@implementation XPNewHomeItemView
+
+-(instancetype)initWithFrame:(CGRect)frame type:(int)type{
+    self = [super initWithFrame:frame];
+    if(self){
+        [self installUI];
+        [self installConstraints];
+    }
+    return self;
+}
+-(void)installUI{
+    [self addSubview:self.bgImageView];
+    [self.bgImageView addSubview:self.titleView];
+    [self.bgImageView addSubview:self.subTitleView];
+}
+-(void)installConstraints{
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self);
+    }];
+    if(self.type == 0){
+        
+        [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(kGetScaleWidth(25));
+            make.leading.mas_equalTo(kGetScaleWidth(11));
+            make.height.mas_equalTo(kGetScaleWidth(18));
+        }];
+        [self.subTitleView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(kGetScaleWidth(49));
+            make.leading.mas_equalTo(kGetScaleWidth(11));
+            make.height.mas_equalTo(kGetScaleWidth(17));
+        }];
+        return;
+    }
+    [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(kGetScaleWidth(22));
+        make.leading.mas_equalTo(kGetScaleWidth(11));
+        make.height.mas_equalTo(kGetScaleWidth(18));
+    }];
+    [self.subTitleView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(kGetScaleWidth(46));
+        make.leading.mas_equalTo(kGetScaleWidth(11));
+        make.height.mas_equalTo(kGetScaleWidth(17));
+    }];
+}
+#pragma mark - 赋值
+- (void)setBgImage:(UIImage *)bgImage{
+    _bgImage = bgImage;
+    _bgImageView.image = bgImage;
+}
+- (void)setTitle:(NSString *)title{
+    _title = title;
+    _titleView.text = _title;
+}
+- (void)setSubTitle:(NSString *)subTitle{
+    _subTitle = subTitle;
+    _subTitleView.text = _subTitle;
+}
+#pragma mark - 懒加载
+- (UIImageView *)bgImageView{
+    if(!_bgImageView){
+        _bgImageView = [UIImageView new];
+        _bgImageView.userInteractionEnabled = YES;
+    }
+    return _bgImageView;
+}
+- (UILabel *)titleView{
+    if(!_titleView){
+        _titleView = [UILabel labelInitWithText:@"" font:kFontBold(18) textColor:[UIColor whiteColor]];
+    }
+    return _titleView;
+}
+- (UILabel *)subTitleView{
+    if(!_subTitleView){
+        _subTitleView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:[UIColor colorWithWhite:1 alpha:0.8]];
+    }
+    return _subTitleView;
+}
+@end
diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m
index 2940cb8d..f58ba090 100644
--- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m
+++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeNavView.m
@@ -49,31 +49,31 @@
 		make.left.mas_equalTo(self).offset(15);
 		make.height.mas_equalTo(32);
 		make.top.mas_equalTo(self).offset(statusbarHeight + 6);
-		make.right.mas_equalTo(self.opeRoomButton.mas_left).offset(-36);
+		make.right.mas_equalTo(self.rankButton.mas_left).offset(-15);
 	}];
 
 	[self.searchImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.width.mas_equalTo(22);
-		make.height.mas_equalTo(22);
-		make.left.mas_equalTo(self.searchView).offset(13);
+		make.width.mas_equalTo(16);
+		make.height.mas_equalTo(16);
+		make.left.mas_equalTo(self.searchView).offset(15);
 		make.centerY.mas_equalTo(self.searchView);
 	}];
 
 	[self.searchLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(self.searchImageView.mas_right).offset(2);
+		make.left.mas_equalTo(self.searchImageView.mas_right).offset(7);
 		make.centerY.mas_equalTo(self.searchView);
 	}];
 
-	[self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) {
+	[self.opeRoomButton mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.width.mas_equalTo(30);
-		make.height.mas_equalTo(30);
+		make.height.mas_equalTo(32);
 		make.centerY.mas_equalTo(self.searchView);
 		make.right.mas_equalTo(self).offset(-15);
 	}];
 
-	[self.opeRoomButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.width.height.centerY.mas_equalTo(self.rankButton);
-		make.right.mas_equalTo(self.rankButton.mas_left).offset(-12);
+	[self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.width.height.centerY.mas_equalTo(self.opeRoomButton);
+		make.right.mas_equalTo(self.opeRoomButton.mas_left).offset(-12);
 	}];
 }
 
diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
index fa1e48aa..f72776de 100644
--- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
+++ b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m
@@ -30,6 +30,7 @@
 #import "XPHomeRecommendViewController.h"
 #import "XPNewHomeNavView.h"
 #import "XPRoomViewController.h"
+
 ///P
 #import "XPHomeContainerPresenter.h"
 #import "XPHomeContainerProtocol.h"
@@ -40,7 +41,9 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 @interface XPNewHomeViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeContainerProtocol, XPNewHomeNavViewDelegate>
+///背景
 @property (nonatomic,strong) UIImageView *backImageView;
+///导航
 @property (nonatomic,strong) XPNewHomeNavView *navView;
 ///分页标题
 @property (nonatomic, strong) NSArray<NSString *> *titles;