修正 combo 金币显示问题

阿语环境下，有概率会 hot 列表显示为最后一个 tab 的内容

.gitignore

@@ -151,3 +151,4 @@ iOS/Podfile.lock
 Podfile.lock
 */.DS_Store
 .DS_Store
+YuMi.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Podfile

@@ -6,8 +6,6 @@ target 'YuMi' do
   #pag动画
   pod 'libpag'
   pod 'Bugly'
-#  pod 'Adjust'
-  pod 'Firebase/Analytics'
   pod 'FBSDKLoginKit'
   pod 'FBSDKCoreKit'
   pod 'FBSDKShareKit'
@@ -77,6 +75,7 @@ post_install do |installer|
     project.targets.each do |target|
       target.build_configurations.each do |config|
             config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+            config.build_settings['DEBUG_INFORMATION_FORMAT'] = 'dwarf-with-dsym'
            xcconfig_path = config.base_configuration_reference.real_path
           xcconfig = File.read(xcconfig_path)
           xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -50,6 +50,13 @@
             ReferencedContainer = "container:YuMi.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -72,7 +79,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -78,17 +78,16 @@ UIKIT_EXTERN NSString * adImageName;
 - (void) configBugly {
 
     BuglyConfig *config = [[BuglyConfig alloc] init];
-    
     config.blockMonitorTimeout = 5;
-    config.unexpectedTerminatingDetectionEnable = YES; // 非正常退出事件记录开关，默认关闭
 
 #ifdef DEBUG
     config.debugMode = NO;//YES; // debug 模式下，开启调试模式
     config.channel = [YYUtility getAppSource];
 //    config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
-    config.reportLogLevel = BuglyLogLevelError; // BuglyLogLevelVerbose; // 设置打印日志级别
+    config.reportLogLevel = BuglyLogLevelSilent; // BuglyLogLevelVerbose; // 设置打印日志级别
     [Bugly startWithAppId:@"c937fd00f7" config:config];
 #else
+    config.unexpectedTerminatingDetectionEnable = YES; // 非正常退出事件记录开关，默认关闭
     config.debugMode = NO; // release 模式下，关闭调试模式
     config.channel = [YYUtility getAppSource];;
     config.blockMonitorEnable = NO; // 卡顿监控开关，默认关闭
@@ -96,7 +95,6 @@ UIKIT_EXTERN NSString * adImageName;
     NSString *buylyKey = @"8627948559"; // isEnterprise == NO ? @"5334684d86" : @"d65df59a68";
     [Bugly startWithAppId:buylyKey config:config];
 #endif
-    
 }
 - (void)configNIMSDK {
 	//推荐在程序启动的时候初始化 NIMSDK
@@ -173,18 +171,13 @@ UIKIT_EXTERN NSString * adImageName;
 	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:adName];
 	BOOL isExist = [XPAdImageTool.shareImageTool isFileExistWithFilePath:filePath];
 
-	if ([kUserDefaults integerForKey:@"adShow"]) {
-		[kUserDefaults setInteger:[kUserDefaults integerForKey:@"adShow"]+1
-                           forKey:@"adShow"];
-	} else {
-		[kUserDefaults setInteger:1 forKey:@"adShow"];
-	}
-
 	if (isExist) {// 图片存在
-		if ([kUserDefaults integerForKey:@"adShow"] > 4) {
+//		if ([kUserDefaults integerForKey:@"adShow"] > 4) {
 			@kWeakify(self);
 			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:adName];
 			XPAdvertiseView *advertiseView = [[XPAdvertiseView alloc] initWithFrame:self.window.bounds];
+            advertiseView.type = info.type;
+            advertiseView.fileModel = info.fillVo;
 			advertiseView.filePath = filePath;
 			advertiseView.dismissHandler = ^(BOOL shouldJump) {
 				@kStrongify(self)
@@ -196,7 +189,7 @@ UIKIT_EXTERN NSString * adImageName;
                 });
 			};
 			[advertiseView show];
-		}
+//		}
 	}
 }
 
@@ -219,7 +212,10 @@ UIKIT_EXTERN NSString * adImageName;
 			}
 		}
 			break;
-		case SplashInfoSkipTypeWeb: {
+        case SplashInfoSkipTypeWeb:
+        case SplashInfoSkipTypeWeb_CP:
+        case SplashInfoSkipTypeWeb_Custom:
+        case SplashInfoSkipTypeWeb_WeekStar: {
 			// 跳转 H5
 			if (info.link.length > 0) {
 				XPWebViewController *webView = [[XPWebViewController alloc] initWithRoomUID:nil];

YuMi/Appdelegate/AppDelegate.m

@@ -10,7 +10,6 @@
 #import <UMCommon/UMCommon.h>
 #import <MobLinkPro/MobLink.h>
 #import <MobLinkPro/MLSDKScene.h>
-#import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import "TabbarViewController.h"
 #import "BaseNavigationController.h"
 #import "AppDelegate+ThirdConfig.h"
@@ -18,14 +17,15 @@
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import "ClientConfig.h"
 #import <GoogleSignIn/GoogleSignIn.h>
-#import "GULAppDelegateSwizzler.h"
 #import <GoogleSignIn/GoogleSignIn.h>
-#import "XPLoginViewController.h"
+#import "LoginViewController.h"
 #import "AccountModel.h"
 #import "YuMi-swift.h"
 #import "SessionViewController.h"
 #import "LoginFullInfoViewController.h"
-@import Firebase;
+#import "UIView+VAP.h"
+#import "SocialShareManager.h"
+
 UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 @interface AppDelegate ()<IMLSDKRestoreDelegate>
@@ -34,18 +34,50 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 @implementation AppDelegate
 
+//日志接口
+void qg_VAP_Logger_handler(VAPLogLevel level, const char* file, int line, const char* func, NSString *module, NSString *format, ...) {
+    
+    // 屏蔽 MP4 播放 log
+    return;
+    
+//    if (format.UTF8String == nil) {
+//        NSLog(@"log包含非utf-8字符");
+//        return;
+//    }
+//    if (level > VAPLogLevelDebug) {
+//        va_list argList;
+//        va_start(argList, format);
+//        NSString* message = [[NSString alloc] initWithFormat:format arguments:argList];
+//        file = [NSString stringWithUTF8String:file].lastPathComponent.UTF8String;
+//        NSLog(@"<%@> %s(%@):%s [%@] - %@",@(level), file, @(line), func, module, message);
+//        va_end(argList);
+//    }
+}
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
-	///初始化一些 sdk配置
+    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+
+    UIStoryboard *launchStoryboard = [UIStoryboard storyboardWithName:@"Launch Screen" bundle:nil];
+    UIViewController *launchScreenVC = [launchStoryboard instantiateInitialViewController];
+    self.window.rootViewController = launchScreenVC;
+    [self.window makeKeyAndVisible];
+
+    [VAPView registerHWDLog:qg_VAP_Logger_handler];
+    
+    ///初始化一些 sdk配置
     [self initThirdConfig];
     [self initUM:application launchOptions:launchOptions];
 
-    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    [self.window makeKeyAndVisible];
-
-    [self loadMainPage];
-    [self setupLaunchADView];
-
+    @kWeakify(self);
+    [[ClientConfig shareConfig] clientConfig:^{
+        @kStrongify(self);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self loadMainPage];
+            [self setupLaunchADView];
+        });
+    }];
+    
     return YES;
 }
 
@@ -57,8 +89,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
         [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" 
                             channel:@"appstore"];
     }
-    [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
-    [FIRApp configure];
     [MobLink setDelegate:self];
 }
 
@@ -71,10 +101,12 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     }else{
         [self toHomeTabbarPage];
     }
+    
+    [[ClientConfig shareConfig] clientInit];
 }
 
 - (void)toLoginPage {
-    XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
+    LoginViewController *lvc = [[LoginViewController alloc] init];
     BaseNavigationController * navigationController = [[BaseNavigationController alloc] initWithRootViewController:lvc];
     navigationController.modalPresentationStyle = UIModalPresentationFullScreen;
     self.window.rootViewController = navigationController;
@@ -112,16 +144,16 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
             ATTrackingManagerAuthorizationStatus status = ATTrackingManager.trackingAuthorizationStatus;
             switch (status) {
                 case ATTrackingManagerAuthorizationStatusDenied:
-                    NSLog(@"用户拒绝IDFA");
+//                    NSLog(@"用户拒绝IDFA");
                     break;
                 case ATTrackingManagerAuthorizationStatusAuthorized:
-                    NSLog(@"用户允许IDFA");
+//                    NSLog(@"用户允许IDFA");
                     break;
                 case ATTrackingManagerAuthorizationStatusNotDetermined: {
-                    NSLog(@"用户未做选择或未弹窗IDFA");
+//                    NSLog(@"用户未做选择或未弹窗IDFA");
                     //请求弹出用户授权框，只会在程序运行是弹框1次，除非卸载app重装，通地图、相机等权限弹框一样
                     [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
-                        NSLog(@"app追踪IDFA权限：%lu",(unsigned long)status);
+//                        NSLog(@"app追踪IDFA权限：%lu",(unsigned long)status);
                     }];
                 }
                     break;
@@ -166,57 +198,47 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 
 ///URL Scheme跳转
 -(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
-    NSString *bundleID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
-    if ([url.scheme isEqualToString:[NSString stringWithFormat:@"line3rdp.%@",bundleID]]) {
-        return [PILineLoginManager applicationOpenurl:app open:url];
-    }
+    [[SocialShareManager sharedManager] handleURL:url];
     
-    NSString *text = [url query];
-    if(text.length){
-        NSMutableDictionary *paramsDict = [NSMutableDictionary dictionary];
-        NSArray *paramArray = [text componentsSeparatedByString:@"&"];
-        for (NSString *param in paramArray) {
-            if (param && param.length) {
-                NSArray *parArr = [param componentsSeparatedByString:@"="];
-                if (parArr.count == 2) {
-                    [paramsDict setObject:parArr[1] forKey:parArr[0]];
-                }
-            }
-        }
-        if(paramsDict[@"type"] != nil){
-            NSInteger type = [paramsDict[@"type"] integerValue];
-            if (type == 2) {
-                NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]];
-                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"uid":uid}];
-                ClientConfig *config = [ClientConfig shareConfig];
-                config.roomId = uid;
-            }else if(type == 7){
-                NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]];
-                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":uid}];
-                ClientConfig *config = [ClientConfig shareConfig];
-                config.chatId = uid;
-            }else if (type == 8){
-                NSString *inviteCode = paramsDict[@"inviteCode"];
-                if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
-                    ClientConfig *config = [ClientConfig shareConfig];
-                    config.inviteCode = inviteCode;
-                }
-            }
-            return YES;
-        }
-       
-    }
-    
-    if([url.absoluteString containsString:@"fb1266232494209868"]){
-        return [[FBSDKApplicationDelegate sharedInstance] application:app
-                                                             openURL:url
-                                                             sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
-                                                             annotation:options[UIApplicationOpenURLOptionsAnnotationKey]];
-    }
-   
     return [GIDSignIn.sharedInstance handleURL:url];
 }
 
+//- (void)__oldApplicationOpenURLMethod:(NSURL *)url {
+//    NSString *text = [url query];
+//    if(text.length){
+//        NSMutableDictionary *paramsDict = [NSMutableDictionary dictionary];
+//        NSArray *paramArray = [text componentsSeparatedByString:@"&"];
+//        for (NSString *param in paramArray) {
+//            if (param && param.length) {
+//                NSArray *parArr = [param componentsSeparatedByString:@"="];
+//                if (parArr.count == 2) {
+//                    [paramsDict setObject:parArr[1] forKey:parArr[0]];
+//                }
+//            }
+//        }
+//        if(paramsDict[@"type"] != nil){
+//            NSInteger type = [paramsDict[@"type"] integerValue];
+//            if (type == 2) {
+//                NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]];
+//                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"uid":uid}];
+//                ClientConfig *config = [ClientConfig shareConfig];
+//                config.roomId = uid;
+//            }else if(type == 7){
+//                NSString *uid = [NSString stringWithFormat:@"%@",paramsDict[@"uid"]];
+//                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":uid}];
+//                ClientConfig *config = [ClientConfig shareConfig];
+//                config.chatId = uid;
+//            }else if (type == 8){
+//                NSString *inviteCode = paramsDict[@"inviteCode"];
+//                if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
+//                    ClientConfig *config = [ClientConfig shareConfig];
+//                    config.inviteCode = inviteCode;
+//                }
+//            }
+////            return YES;
+//        }
+//    }
+//}
 
 #pragma mark - Core Data stack
 @synthesize managedObjectContext = _managedObjectContext;
@@ -258,7 +280,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 		error = [NSError errorWithDomain:@"YOUR_ERROR_DOMAIN" code:9999 userInfo:dict];
 		// Replace this with code to handle the error appropriately.
 		// abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-		NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+//		NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
 		abort();
 	}
 	
@@ -290,7 +312,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 		if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
 			// Replace this implementation with code to handle the error appropriately.
 			// abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-			NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+//			NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
 			abort();
 		}
 	}

YuMi/Appdelegate/FBSDKSettings+PISDKSettings.h

@@ -1,16 +0,0 @@
-//
-//  FBSDKSettings+PISDKSettings.h
-//  YuMi
-//
-//  Created by duoban on 2023/9/22.
-//
-
-#import <FBSDKCoreKit/FBSDKCoreKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FBSDKSettings (PISDKSettings)
-
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Appdelegate/FBSDKSettings+PISDKSettings.m

@@ -1,19 +0,0 @@
-//
-//  FBSDKSettings+PISDKSettings.m
-//  YuMi
-//
-//  Created by duoban on 2023/9/22.
-//
-
-#import "FBSDKSettings+PISDKSettings.h"
-#import "GULAppDelegateSwizzler.h"
-
-
-@implementation FBSDKSettings (PISDKSettings)
-///必须为FBSDKSettings添加setAutoLogAppEventsEnabled方法，不然分享时会闪退
-+(void)setAutoLogAppEventsEnabled:(BOOL)is{
-    
-}
-
-
-@end

YuMi/Assets.xcassets/1.0.15/luck_gift_flag.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "椭圆 5@3x.png",
+      "filename" : "1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.15/luck_gift_flag_ball.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "容器 8156@3x.png",
+      "filename" : "椭圆 6@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.18/custom_bg_gif.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "图层 2@3x.png",
+      "filename" : "gif@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.18/custom_bg_help.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "示例图@3x.png",
+      "filename" : "切图 31@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.18/custom_bg_play.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "图层 1@3x.png",
+      "filename" : "播放@3x-2.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.18/custom_bg_preview.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "示例图@3x 2.png",
+      "filename" : "图片@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.18/custom_bg_trash.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.18/gift_banner_room.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/Contents.json

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

YuMi/Assets.xcassets/1.0.30/block_selected.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/block_unselected.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_category_bubble.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_category_headdress.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_category_homepage.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_category_nameplate.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_category_normal_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_category_room_card.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_category_selected_bg.imageset/Contents.json

@@ -1,7 +1,6 @@
 {
   "images" : [
     {
-      "filename" : "common_new_user_ar.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -10,6 +9,7 @@
       "scale" : "2x"
     },
     {
+      "filename" : "矩形 2941@3x (1).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.30/mall_category_vehicle.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_item_card_normal_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_item_card_selected_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_item_not_used.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_item_preview_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_item_preview_line.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_my_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_play_icon.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mall_top_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/menu_music.imageset/Contents.json

@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "图层 1@3x (1).png",
+      "filename" : "房间背景@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/1.0.30/mu_dressing_card_normal_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/mu_dressing_card_selected_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/room_top_1.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/room_top_2.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/room_top_3.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.30/room_type_cs.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "推荐@3x (1).png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/1.0.30/room_type_rd.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/Contents.json

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

YuMi/Assets.xcassets/1.0.31/grey_arrow.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/region_list_selected.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/room_user_card_at.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/room_user_card_be_manager.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/room_user_card_blacklist.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/room_user_card_chat.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/room_user_card_clean_gift_value.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/room_user_card_close_mic.imageset/Contents.json

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

YuMi/Assets.xcassets/1.0.31/room_user_card_follow.imageset/Contents.json

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