魔力换皮

Podfile.lock

@@ -221,4 +221,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 034aba5260596f012774aa92cf2207105b5af99f
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

xplan-ios.xcodeproj/project.pbxproj

@@ -168,6 +168,7 @@
 		9B42869528C1E00A009034D2 /* XPRedPacketResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42869428C1E00A009034D2 /* XPRedPacketResultModel.m */; };
 		9B42869828C1E06B009034D2 /* XPRedPacketModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42869728C1E06B009034D2 /* XPRedPacketModel.m */; };
 		9B42869C28C1FD3D009034D2 /* XPOpenRedPacketCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B42869B28C1FD3D009034D2 /* XPOpenRedPacketCell.m */; };
+		9B4769AD28DB270F00CCD312 /* XPHomePartyNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B4769AC28DB270F00CCD312 /* XPHomePartyNavView.m */; };
 		9B4D148127E485EB000AA0C1 /* XPRoomTrumpetView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B4D148027E485EB000AA0C1 /* XPRoomTrumpetView.m */; };
 		9B5BF8A827E1BED1005DD346 /* Api+RoomTrumpet.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B5BF8A727E1BED1005DD346 /* Api+RoomTrumpet.m */; };
 		9B5F1503280FF02600C3C2B1 /* anchorPk_crossPking.svga in Resources */ = {isa = PBXBuildFile; fileRef = 9B5F1502280FF02600C3C2B1 /* anchorPk_crossPking.svga */; };
@@ -1498,6 +1499,8 @@
 		9B42869728C1E06B009034D2 /* XPRedPacketModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRedPacketModel.m; sourceTree = "<group>"; };
 		9B42869A28C1FD3D009034D2 /* XPOpenRedPacketCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPOpenRedPacketCell.h; sourceTree = "<group>"; };
 		9B42869B28C1FD3D009034D2 /* XPOpenRedPacketCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPOpenRedPacketCell.m; sourceTree = "<group>"; };
+		9B4769AB28DB270F00CCD312 /* XPHomePartyNavView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomePartyNavView.h; sourceTree = "<group>"; };
+		9B4769AC28DB270F00CCD312 /* XPHomePartyNavView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPHomePartyNavView.m; sourceTree = "<group>"; };
 		9B4D147F27E485EB000AA0C1 /* XPRoomTrumpetView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetView.h; sourceTree = "<group>"; };
 		9B4D148027E485EB000AA0C1 /* XPRoomTrumpetView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTrumpetView.m; sourceTree = "<group>"; };
 		9B5BF8A627E1BED1005DD346 /* Api+RoomTrumpet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+RoomTrumpet.h"; sourceTree = "<group>"; };
@@ -7876,6 +7879,8 @@
 				E81AF31927F19265003B9E43 /* XPHomeGradientLabel.m */,
 				9B39C88128850EFA00564D17 /* XPHomeLiveHeadView.h */,
 				9B39C88228850EFA00564D17 /* XPHomeLiveHeadView.m */,
+				9B4769AB28DB270F00CCD312 /* XPHomePartyNavView.h */,
+				9B4769AC28DB270F00CCD312 /* XPHomePartyNavView.m */,
 			);
 			path = SubViews;
 			sourceTree = "<group>";
@@ -9744,6 +9749,7 @@
 				E8C167332806CADF00ECB15C /* XPGuildSuperAdminMenuView.m in Sources */,
 				E81A654C28351D9900F55894 /* XPMonentsTopicCollectionViewCell.m in Sources */,
 				E800808527FD8FC20055A8AB /* ClanMemberDetailInfoModel.m in Sources */,
+				9B4769AD28DB270F00CCD312 /* XPHomePartyNavView.m in Sources */,
 				E8412FA92779C2ED006E1101 /* XPRoomSettingItemModel.m in Sources */,
 				9BE01AC828913D4C00B50299 /* XPNewUserRechargeViewController.m in Sources */,
 				9B92A3692798145000AD168F /* XPSkillCardTypeModel.m in Sources */,

xplan-ios/Appdelegate/AppDelegate.m

@@ -35,6 +35,11 @@
 	[self getAdvertisingTrackingAuthority];
 }
 
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+    NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount;
+    [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count];
+}
+
 - (void)getAdvertisingTrackingAuthority {
 	dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
 		if (@available(iOS 14, *)) {

xplan-ios/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1 +1,78 @@
-{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}
+{
+  "images" : [
+    {
+      "filename" : "40pt.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "60pt.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "29pt.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58pt.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "87pt.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "80pt.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "120pt.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120pt 1.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "180pt.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "APP Store 1024_1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

xplan-ios/Assets.xcassets/Common/common_avatar.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "common_avatar.png",
+      "filename" : "common_avatar@2x.jpg",
       "idiom" : "universal",
       "scale" : "2x"
     },

xplan-ios/Assets.xcassets/Home/navigation/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

xplan-ios/Assets.xcassets/Home/navigation/home_nav_indicator.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_nav_indicator@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_nav_indicator@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

xplan-ios/Assets.xcassets/Login/login_appIcon.imageset/Contents.json

@@ -5,12 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "login_appIcon@2x.png",
+      "filename" : "login_appIcon@2x.jpg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "login_appIcon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/Mine/ming_setting_about_us.imageset/Contents.json

@@ -5,12 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ming_setting_about_us@2x.png",
+      "filename" : "ming_setting_about_us@2x.jpg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ming_setting_about_us@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

xplan-ios/Assets.xcassets/app_launch_screen.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "1242-2208.png",
+      "filename" : "1242_2208.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

xplan-ios/Base/UI/ThemeColor.m

@@ -10,7 +10,7 @@
 @implementation ThemeColor
 /// 主题色0xFFBC52
 + (UIColor *)appMainColor {
-	return UIColorFromRGB(0xFFBC52);
+	return UIColorFromRGB(0x5FCCE4);
 }
 
 ///强调色 #248CFE
@@ -31,7 +31,7 @@
 /* ------页面相关颜色 START------ */
 /// view的背景色 0xF4F4FA
 + (UIColor *)appBackgroundColor {
-	return UIColorFromRGB(0xF4F4FA);
+	return UIColorFromRGB(0xF3F5FA);
 }
 /// cell的背景色 0xFFFFFF
 + (UIColor *)appCellBackgroundColor {
@@ -39,15 +39,15 @@
 }
 ///正文颜色  0x333333
 + (UIColor *)mainTextColor {
-	return UIColorFromRGB(0x333333);
+	return UIColorFromRGB(0x161958);
 }
 /// 二级文字颜色 0x666666
 + (UIColor *)secondTextColor {
-	return UIColorFromRGB(0x666666);
+	return UIColorFromRGB(0x8A8CAB);
 }
 ///三级文字的颜色 0x999999
 + (UIColor *)textThirdColor {
-	return UIColorFromRGB(0x999999);
+	return UIColorFromRGB(0xBABBCD);
 }
 ///分割线的颜色  0xE8E8E8
 + (UIColor *)dividerColor {
@@ -58,11 +58,11 @@
 /* ------Button 相关颜色 START------ */
 /// button 可用 渐变色的开始 0xFFA936
 + (UIColor *)confirmButtonGradientStartColor {
-	return UIColorFromRGB(0xFFA936);
+	return UIColorFromRGB(0x5BC8F8);
 }
 /// button 可用 渐变色的开始 0xFFCB47
 + (UIColor *)confirmButtonGradientEndColor {
-	return UIColorFromRGB(0xFFCB47);
+	return UIColorFromRGB(0x66D9D9);
 }
 /// 确定的按钮文字颜色 #FFFFFF
 + (UIColor *)confirmButtonTextColor {
@@ -70,27 +70,27 @@
 }
 /// 取消按钮  渐变色的开始 0xF7DDBF
 + (UIColor *)cancelButtonGradientStartColor {
-	return UIColorFromRGB(0xF7DDBF);
+	return UIColorFromRGB(0xCEEFFD);
 }
 /// 取消按钮  渐变色的结束 0xF7E8C4
 + (UIColor *)cancelButtonGradientEndColor {
-	return UIColorFromRGB(0xF7E8C4);
+	return UIColorFromRGB(0xD2F4F4);
 }
 /// 取消的按钮文字颜色 0xFFA936
 + (UIColor *)cancelButtonTextColor {
-	return UIColorFromRGB(0xFFA936);
+	return UIColorFromRGB(0x5FCCE4);
 }
 /// 取消按钮单一普通背景色 0xFFCE4E
 + (UIColor *)cancelButtonNormalBgColor {
-    return UIColorRGBAlpha(0xFFCE4E, 0.3);
+    return UIColorFromRGB(0xCEEFFD);
 }
 /// 按钮不可点击背景色 0xD2D5D7
 + (UIColor *)disableButtonColor {
-	return UIColorFromRGB(0xD2D5D7);
+	return UIColorFromRGB(0xCEEFFD);
 }
 /// 按钮不可点击文字颜色 0xF9F9F9
 + (UIColor *)disableButtonTextColor {
-	return UIColorFromRGB(0xF9F9F9);
+	return UIColorFromRGB(0x5FCCE4);
 }
 /* ------Button 相关颜色 END------ */
 

xplan-ios/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>大鹅开黑</string>
+	<string>魔力</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -67,15 +67,15 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>“大鹅开黑”需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看</string>
+	<string>“魔力”需要您的同意,才可以访问进行拍照并上传您的图片，然后展示在您的个人主页上，便于他人查看</string>
 	<key>NSLocalNetworkUsageDescription</key>
 	<string>此App将可发现和连接到您所用网络上的设备。</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>“大鹅开黑”需要您的同意,才可以进行语音聊天</string>
+	<string>“魔力”需要您的同意,才可以进行语音聊天</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>“大鹅开黑”需要您的同意,才可以存储相片到相册</string>
+	<string>“魔力”需要您的同意,才可以存储相片到相册</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>“大鹅开黑”需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看</string>
+	<string>“魔力”需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看</string>
 	<key>NSUserTrackingUsageDescription</key>
 	<string>请允许我们获取您的IDFA权限，可以为您提供个性化活动和服务。未经您的允许，您的信息将不作其他用途</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

xplan-ios/Launch Screen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="app_launch_screen_1" translatesAutoresizingMaskIntoConstraints="NO" id="saT-Dw-TKR">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="app_launch_screen" translatesAutoresizingMaskIntoConstraints="NO" id="saT-Dw-TKR">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                         </subviews>
@@ -36,6 +36,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="app_launch_screen_1" width="621" height="1104"/>
+        <image name="app_launch_screen" width="621" height="1104"/>
     </resources>
 </document>

xplan-ios/Main/Home/View/Cell/XPHomeHotRoomCollectionViewCell.m

@@ -17,7 +17,7 @@
 ///Model
 #import "HomeRecommendRoomModel.h"
 
-#define KRecommendRoomAvatarWidth 55 * kScreenScale
+#define KRecommendRoomAvatarWidth 74 * kScreenScale
 
 @interface XPHomeHotRoomCollectionViewCell ()
 ///背景
@@ -59,17 +59,16 @@
 #pragma mark - Private Method
 - (void)initSubViews {
 	[self.contentView addSubview:self.backImageView];
-	[self.backImageView addSubview:self.rippleView];
+//	[self.backImageView addSubview:self.rippleView];
-	[self.backImageView addSubview:self.roomTagImageView];
+    [self.backImageView addSubview:self.avatarImageView];
+    [self.backImageView addSubview:self.roomTagImageView];
     [self.backImageView addSubview:self.svgDisplayView];
-	[self.backImageView addSubview:self.roomDesLabel];
+//    [self.backImageView addSubview:self.roomDesLabel];
-	[self.backImageView addSubview:self.notImageView];
+//    [self.backImageView addSubview:self.notImageView];
-	[self.backImageView addSubview:self.roomTitleLabel];
+    [self.backImageView addSubview:self.roomTitleLabel];
-	[self.backImageView addSubview:self.avatarImageView];
 	[self.backImageView addSubview:self.sexImageView];
-	[self.backImageView addSubview:self.nickLabel];
+//	[self.backImageView addSubview:self.nickLabel];
-	[self addAnimation];
+//	[self addAnimation];
-	
 }
 
 - (void)addAnimation {
@@ -116,53 +115,55 @@
 	}];
 	
 	[self.roomTagImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(38 * kScreenScale, 18 * kScreenScale));
+		make.size.mas_equalTo(CGSizeMake(30 * kScreenScale, 12 * kScreenScale));
-		make.left.top.mas_equalTo(self.backImageView);
+		make.top.mas_equalTo(self.avatarImageView);
+        make.left.mas_equalTo(self.avatarImageView).mas_offset(4);
 	}];
     
     [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.top.mas_equalTo(self.contentView);
+        make.left.top.mas_equalTo(self.avatarImageView);
-        make.size.mas_equalTo(CGSizeMake(40, 20));
+        make.size.mas_equalTo(CGSizeMake(30, 15));
     }];
     
-	[self.roomDesLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//	[self.roomDesLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(self.backImageView).offset(13 * kScreenScale);
+//		make.left.mas_equalTo(self.backImageView).offset(13 * kScreenScale);
-		make.right.mas_equalTo(self.backImageView).offset(-4 *kScreenScale);
+//		make.right.mas_equalTo(self.backImageView).offset(-4 *kScreenScale);
-		make.top.mas_equalTo(self.backImageView).offset(22 * kScreenScale);
+//		make.top.mas_equalTo(self.backImageView).offset(22 * kScreenScale);
-	}];
+//	}];
 	
-	[self.notImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//	[self.notImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(13 * kScreenScale, 9.6 * kScreenScale));
+//		make.size.mas_equalTo(CGSizeMake(13 * kScreenScale, 9.6 * kScreenScale));
-		make.top.mas_equalTo(self.roomDesLabel.mas_bottom).offset(3 * kScreenScale);
+//		make.top.mas_equalTo(self.roomDesLabel.mas_bottom).offset(3 * kScreenScale);
-		make.left.mas_equalTo(self.roomDesLabel);
+//		make.left.mas_equalTo(self.roomDesLabel);
-	}];
+//	}];
 
 	[self.roomTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(self.notImageView.mas_right).offset(5 * kScreenScale);
+        make.top.mas_equalTo(self.avatarImageView.mas_bottom).mas_offset(2);
-		make.centerY.mas_equalTo(self.notImageView);
+        make.centerX.left.mas_equalTo(self.avatarImageView);
-		make.right.mas_lessThanOrEqualTo(self.backImageView);
+        make.height.mas_equalTo(17);
 	}];
 	
 	[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.size.mas_equalTo(CGSizeMake(KRecommendRoomAvatarWidth, KRecommendRoomAvatarWidth));
 		make.centerX.mas_equalTo(self.backImageView);
-		make.bottom.mas_equalTo(self.nickLabel.mas_top).offset(-2 * kScreenScale);
+        make.top.mas_equalTo(self.backImageView).mas_offset(12);
 	}];
 	
-	[self.rippleView mas_makeConstraints:^(MASConstraintMaker *make) {
+//	[self.rippleView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.center.mas_equalTo(self.avatarImageView);
+//		make.center.mas_equalTo(self.avatarImageView);
-		make.size.mas_equalTo(CGSizeMake(KRecommendRoomAvatarWidth, KRecommendRoomAvatarWidth));
+//		make.size.mas_equalTo(CGSizeMake(KRecommendRoomAvatarWidth, KRecommendRoomAvatarWidth));
-	}];
+//	}];
 	
 
-	[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//	[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.right.mas_equalTo(self.backImageView).inset(5 * kScreenScale);
+//		make.left.right.mas_equalTo(self.backImageView).inset(5 * kScreenScale);
-		make.bottom.mas_equalTo(self.backImageView.mas_bottom).offset(-15 * kScreenScale);
+//		make.bottom.mas_equalTo(self.backImageView.mas_bottom).offset(-15 * kScreenScale);
-	}];
+//	}];
 	
 	[self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.right.bottom.mas_equalTo(self.avatarImageView);
+		make.bottom.mas_equalTo(self.avatarImageView);
 		make.size.mas_equalTo(CGSizeMake(14 * kScreenScale, 14 * kScreenScale));
+        make.right.mas_equalTo(self.avatarImageView).mas_offset(-12);
 	}];
 }
 #pragma mark - Getters And Setters
@@ -203,9 +204,9 @@
 - (void)setIndexPathRow:(NSInteger)indexPathRow {
 	_indexPathRow = (indexPathRow + 1);
 	if (_indexPathRow % 2 != 0) {
-		self.backImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFADBF6), UIColorFromRGB(0xD6EFFE)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(10, 10)];
+//		self.backImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFADBF6), UIColorFromRGB(0xD6EFFE)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(10, 10)];
 	} else {
-		self.backImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFF8D9), UIColorFromRGB(0xEAFFD8)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(10, 10)];
+//		self.backImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFF8D9), UIColorFromRGB(0xEAFFD8)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(10, 10)];
 	}
 }
 
@@ -236,8 +237,9 @@
 - (UILabel *)roomTitleLabel {
 	if (!_roomTitleLabel) {
 		_roomTitleLabel = [[UILabel alloc] init];
-		_roomTitleLabel.font = [UIFont systemFontOfSize:10];
+		_roomTitleLabel.font = [UIFont systemFontOfSize:12];
-		_roomTitleLabel.textColor = [ThemeColor textThirdColor];
+		_roomTitleLabel.textColor = [ThemeColor mainTextColor];
+        _roomTitleLabel.textAlignment = NSTextAlignmentCenter;
 	}
 	return _roomTitleLabel;
 }

xplan-ios/Main/Home/View/Cell/XPHomeHotRoomTableViewCell.m

@@ -10,12 +10,16 @@
 #import <Masonry/Masonry.h>
 ///Tool
 #import "XPMacro.h"
+#import "ThemeColor.h"
+#import "UIImage+Utils.h"
 ///View
 #import "XPHomeHotRoomCollectionViewCell.h"
 
 @interface XPHomeHotRoomTableViewCell ()<UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
 ///列表
 @property (nonatomic,strong) UICollectionView *collectionView;
+@property (nonatomic, strong) UIImageView *bgImageView;
+
 @end
 
 @implementation XPHomeHotRoomTableViewCell
@@ -32,10 +36,15 @@
 - (void)initSubViews {
 	self.backgroundColor = [UIColor clearColor];
 	self.selectionStyle = UITableViewCellSelectionStyleNone;
+    [self.contentView addSubview:self.bgImageView];
 	[self.contentView addSubview:self.collectionView];
 }
 
 - (void)initSubViewConstraints {
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.contentView).inset(15 * kScreenScale);
+        make.top.bottom.mas_equalTo(self.contentView);
+    }];
 	[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.left.right.mas_equalTo(self.contentView).inset(15 * kScreenScale);
 		make.top.bottom.mas_equalTo(self.contentView);
@@ -44,7 +53,7 @@
 
 #pragma mark - UICollectionViewDelegate And UICollectionViewDatasource
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-	return CGSizeMake(148 * kScreenScale, 155 * kScreenScale);
+	return CGSizeMake(74 * kScreenScale, 117 * kScreenScale);
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
@@ -81,6 +90,7 @@
 		layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
 		layout.minimumLineSpacing = 10 * kScreenScale;
 		layout.minimumInteritemSpacing = 0;
+        layout.sectionInset = UIEdgeInsetsMake(0, 12, 0, 12);
 		_collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
 		_collectionView.dataSource = self;
 		_collectionView.tag = 1001;
@@ -92,4 +102,15 @@
 	return _collectionView;
 }
 
+- (UIImageView *)bgImageView {
+    if (!_bgImageView) {
+        UIImageView *imageView = [[UIImageView alloc] init];
+        imageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xEAFFFA),UIColorFromRGB(0xF7FBF0)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(KScreenWidth - 15*2*kScreenScale, 155 * kScreenScale)];
+        imageView.layer.cornerRadius = 12;
+        imageView.layer.masksToBounds = YES;
+        _bgImageView = imageView;
+    }
+    return _bgImageView;
+}
+
 @end

xplan-ios/Main/Home/View/SubViews/XPHomeNavView.m

@@ -51,23 +51,25 @@
 		make.left.mas_equalTo(self).offset(12);
 		make.height.mas_equalTo(40);
 		make.centerY.mas_equalTo(self.rankButton);
-		make.width.mas_equalTo(200);
+		make.width.mas_equalTo(160);
 	}];
 	
 	[self.rankButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(22, 22));
+		make.size.mas_equalTo(CGSizeMake(30, 30));
-		make.right.mas_equalTo(-14);
+		make.right.mas_equalTo(self.openRoomButton.mas_left).mas_offset(-4);
-		make.top.mas_equalTo(statusbarHeight + 14);
+        make.centerY.mas_equalTo(self.openRoomButton);
 	}];
 	
 	[self.openRoomButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.centerY.mas_equalTo(self.rankButton);
+        make.size.mas_equalTo(CGSizeMake(30, 30));
-		make.right.mas_equalTo(self.rankButton.mas_left).offset(-20);
+		make.right.mas_equalTo(-5);
+        make.top.mas_equalTo(statusbarHeight + 7);
 	}];
 	
 	[self.searchButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.centerY.mas_equalTo(self.rankButton);
+		make.centerY.mas_equalTo(self.rankButton);
-		make.right.mas_equalTo(self.openRoomButton.mas_left).offset(-20);
+		make.right.mas_equalTo(self.rankButton.mas_left).offset(-8);
+        make.size.mas_equalTo(CGSizeMake(140, 28));
 	}];
 }
 
@@ -113,6 +115,15 @@
 		[_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];
+        _searchButton.layer.borderWidth = 1;
+        _searchButton.layer.masksToBounds = YES;
+        _searchButton.layer.cornerRadius = 14;
+        _searchButton.layer.borderColor = [ThemeColor appMainColor].CGColor;
+        [_searchButton setTitle:@"搜索房间/昵称/ID" forState:UIControlStateNormal];
+        _searchButton.titleLabel.font = [UIFont systemFontOfSize:12];
+        [_searchButton setTitleColor:[ThemeColor textThirdColor] forState:UIControlStateNormal];
+        _searchButton.backgroundColor = UIColorRGBAlpha(0xffffff, 0.6);
+        [_searchButton setImageEdgeInsets:UIEdgeInsetsMake(0, -8, 0, 0)];
 	}
 	return _searchButton;
 }
@@ -131,21 +142,21 @@
 	if (!_titleView) {
 		_titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero];
 		_titleView.backgroundColor =[UIColor clearColor];
-		_titleView.titleColor = UIColorFromRGB(0x444444);
+		_titleView.titleColor = [ThemeColor secondTextColor];
 		_titleView.titleSelectedColor = [ThemeColor mainTextColor];
-		_titleView.titleFont = [UIFont systemFontOfSize:20 weight:UIFontWeightSemibold];
+		_titleView.titleFont = [UIFont systemFontOfSize:18 weight:UIFontWeightSemibold];
-		_titleView.titleSelectedFont = [UIFont systemFontOfSize:24 weight:UIFontWeightHeavy];
+		_titleView.titleSelectedFont = [UIFont systemFontOfSize:20 weight:UIFontWeightHeavy];
 		_titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter;
 		_titleView.contentScrollViewClickTransitionAnimationEnabled = NO;
 		_titleView.averageCellSpacingEnabled = NO;
 		_titleView.defaultSelectedIndex = 0;
-		_titleView.cellSpacing = 20;
+		_titleView.cellSpacing = 15;
 		_titleView.contentEdgeInsetLeft = 15;
 		
 		JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init];
 		lineView.indicatorImageViewSize = CGSizeMake(48, 12);
 		lineView.verticalMargin = 6;
-		lineView.indicatorImageView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFC000), UIColorFromRGB(0xFFD15A)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(48, 12)];
+		lineView.indicatorImageView.image = [UIImage imageNamed:@"home_nav_indicator"];
 		lineView.indicatorImageView.layer.masksToBounds = YES;
 		lineView.indicatorImageView.layer.cornerRadius = 6;
 		_titleView.indicators = @[lineView];

xplan-ios/Main/Home/View/SubViews/XPHomePartyNavView.h

@@ -0,0 +1,24 @@
+//
+//  XPHomePartyNavView.h
+//  xplan-ios
+//
+//  Created by GreenLand on 2022/9/21.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol XPHomePartyNavViewDelegate <NSObject>
+///点击了搜索房间
+- (void)xPHomePartyNavViewDidClickBack;
+
+@end
+
+@interface XPHomePartyNavView : UIView
+
+@property (nonatomic, weak) id<XPHomePartyNavViewDelegate> delegate;
+
+@end
+
+NS_ASSUME_NONNULL_END

xplan-ios/Main/Home/View/SubViews/XPHomePartyNavView.m

@@ -0,0 +1,79 @@
+//
+//  XPHomePartyNavView.m
+//  xplan-ios
+//
+//  Created by GreenLand on 2022/9/21.
+//
+
+#import "XPHomePartyNavView.h"
+#import "ThemeColor.h"
+#import <Masonry/Masonry.h>
+#import "XPMacro.h"
+
+@interface XPHomePartyNavView()
+
+@property (nonatomic, strong) UIButton *backBtn;
+@property (nonatomic, strong) UILabel *titleLabel;
+
+@end
+
+@implementation XPHomePartyNavView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self initSubViews];
+        [self initSubViewConstraints];
+    }
+    return self;
+}
+
+#pragma mark - Private Method
+- (void)initSubViews {
+    self.backgroundColor = [UIColor clearColor];
+    [self addSubview:self.titleLabel];
+    [self addSubview:self.backBtn];
+}
+
+- (void)initSubViewConstraints {
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self);
+        make.height.mas_equalTo(40);
+        make.top.mas_equalTo(kStatusBarHeight + 2);
+    }];
+    
+    [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(CGSizeMake(30, 30));
+        make.centerY.mas_equalTo(self.titleLabel);
+        make.left.mas_equalTo(16);
+    }];
+}
+
+#pragma mark - Event Response
+- (void)backButtonAction:(UIButton *)sender {
+    if (self.delegate && [self.delegate respondsToSelector:@selector(xPHomePartyNavViewDidClickBack)]) {
+        [self.delegate xPHomePartyNavViewDidClickBack];
+    }
+}
+
+#pragma mark - Getters And Setters
+- (UILabel *)titleLabel {
+    if(!_titleLabel) {
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.text = @"更多房间";
+        _titleLabel.font = [UIFont systemFontOfSize:18];
+        _titleLabel.textColor = [ThemeColor mainTextColor];
+    }
+    return _titleLabel;
+}
+
+- (UIButton *)backBtn {
+    if (!_backBtn) {
+        _backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_backBtn setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateNormal];
+        [_backBtn addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _backBtn;
+}
+
+@end

xplan-ios/Main/Home/View/SubViews/XPHomeRecommendHeaderView.m

@@ -34,7 +34,7 @@
 #define bannerHeight 140
 #define menuHeight  (KScreenWidth - 30 - 8) * 177 / (176 + 85 + 83) * ((CGFloat)60 / (CGFloat) 177)
 #define recommendHeight (230 + 11 +108) * kScreenScale
-#define hotRoomHeight 155 * kScreenScale
+#define hotRoomHeight 117 * kScreenScale
 #define sectionHeight 50
 UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 

xplan-ios/Main/Home/View/SubViews/XPHomeSearchNavView.m

@@ -139,7 +139,7 @@
 	if (!_searchImageView) {
 		_searchImageView = [[UIImageView alloc] init];
 		_searchImageView.userInteractionEnabled = YES;
-		_searchImageView.image = [UIImage imageNamed:@"home_search_input_search"];
+		_searchImageView.image = [UIImage imageNamed:@"home_nav_search"];
 	}
 	return _searchImageView;
 }

xplan-ios/Main/Home/View/XPHomePartyContainerViewController.m

@@ -23,13 +23,14 @@
 #import "XPWebViewController.h"
 #import "XPHomeLikeViewController.h"
 #import "XPHomeLittleGameViewController.h"
+#import "XPHomePartyNavView.h"
 ///P
 #import "XPHomeContainerPresenter.h"
 #import "XPHomeContainerProtocol.h"
 
 UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 
-@interface XPHomePartyContainerViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeContainerProtocol, XPHomeLikeViewControllerDelegate>
+@interface XPHomePartyContainerViewController ()<JXCategoryViewDelegate, JXCategoryListContainerViewDelegate, XPHomeContainerProtocol, XPHomeLikeViewControllerDelegate, XPHomePartyNavViewDelegate>
 ///分页标题
 @property (nonatomic, strong) NSArray<NSString *> *titles;
 ///分页控件
@@ -38,6 +39,9 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 @property (nonatomic, strong) JXCategoryListContainerView *contentView;
 ///tag的列表
 @property (nonatomic,copy) NSArray<HomeTagModel *> *tagList;
+///导航
+@property (nonatomic, strong) XPHomePartyNavView *navView;
+
 @end
 
 @implementation XPHomePartyContainerViewController
@@ -54,19 +58,25 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 	[self initHttp];
 	[self initSubViews];
 	[self initSubViewConstraints];
+    self.defaultSelectedIndex = 1;
 }
 
 #pragma mark - Private Method
 - (void)initSubViews {
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recommendMoreNotification:) name:kHomeMoreScrollPageKey object:nil];
-	self.view.backgroundColor = [UIColor clearColor];
+    [self.view addSubview:self.navView];
 	[self.view addSubview:self.titleView];
 	[self.view addSubview:self.contentView];
 }
 
 - (void)initSubViewConstraints {
-	[self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
+	[self.navView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.top.mas_equalTo(self.view).offset(10);
+        make.top.mas_equalTo(0);
+        make.left.right.mas_equalTo(self.view);
+        make.height.mas_equalTo(kNavigationHeight);
+    }];
+    [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.top.mas_equalTo(self.navView.mas_bottom);
 		make.left.right.mas_equalTo(self.view);
 		make.height.mas_equalTo(30);
 	}];
@@ -135,6 +145,7 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 	self.titles = titles.copy;
 	self.titleView.titles = self.titles;
 	[self.titleView reloadData];
+    [self.titleView selectItemAtIndex:self.defaultSelectedIndex];
 }
 
 #pragma mark - Event Response
@@ -159,6 +170,11 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 	});
 }
 
+#pragma mark - XPHomeNavViewDelegate
+- (void)xPHomePartyNavViewDidClickBack {
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
 #pragma mark - XPHomeLikeViewControllerDelegate
 - (void)xPHomeLikeViewControllerToFriendTab:(XPHomeLikeViewController *)viewController {
 	__block NSUInteger index;
@@ -185,7 +201,7 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 		_titleView.titleSelectedFont = [UIFont fontWithName:@"PingFang-SC-Medium" size:16];
 		_titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter;
 		_titleView.contentScrollViewClickTransitionAnimationEnabled = NO;
-		_titleView.defaultSelectedIndex = 0;
+		_titleView.defaultSelectedIndex = 1;
 		_titleView.cellSpacing = 5;
 		_titleView.cellWidthIncrement = 5;
 		_titleView.listContainer = self.contentView;
@@ -208,4 +224,12 @@ UIKIT_EXTERN NSString * kHomeMoreScrollPageKey;
 	return _contentView;
 }
 
+- (XPHomePartyNavView *)navView {
+    if (!_navView) {
+        _navView = [[XPHomePartyNavView alloc] init];
+        _navView.delegate = self;
+    }
+    return _navView;
+}
+
 @end

xplan-ios/Main/Home/View/XPHomePartyViewController.m

@@ -216,6 +216,7 @@
 		_collectionView.backgroundColor = [UIColor clearColor];
 		[_collectionView registerClass:[XPHomeListCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPHomeListCollectionViewCell class])];
 		[_collectionView registerClass:[XPHomeListEmptyCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPHomeListEmptyCollectionViewCell class])];
+        _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
 	}
 	return _collectionView;
 }