#761 #967

1. 修正 PK UI 问题
2. 完成礼物面板的修改

.gitignore

@@ -0,0 +1,153 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+PlanetStar.xcodeproj/xcuserdata/
+PlanetStar.xcworkspace/
+
+*.swp
+PlanetStar.xcodeproj/project.xcworkspace/xcuserdata/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+build/
+.idea/
+.gradle/
+local.properties
+
+# Keystore files
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+iOS/Podfile.lock
+Podfile.lock
+*/.DS_Store
+.DS_Store

Podfile

@@ -3,21 +3,31 @@
 source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 target 'YuMi' do
   use_frameworks!
-
+  #pag动画
+  pod 'libpag'
+  pod 'Bugly'
+  pod 'Adjust'
+  pod 'Firebase/Analytics'
+  pod 'FBSDKLoginKit'
+  pod 'FBSDKCoreKit'
+  pod 'FBSDKShareKit'
+  pod 'LineSDKSwift'
   # 滑动标签栏
   pod 'JXCategoryView'
   pod 'JXPagingView/Pager'
-	#模型转化
-	pod 'MJExtension'
-	#图片加载
-	pod 'SDWebImage'
+  #模型转化
+  pod 'MJExtension'
+   #图片加载
+  pod 'SDWebImage'
+  pod 'FLAnimatedImage'
+  pod 'SDWebImageFLPlugin' # 对FLAnimatedImage和SDWebImage的桥接
   pod 'AFNetworking'
   #文字自动滚动
-  pod 'MarqueeLabel-ObjC'
+  pod 'MarqueeLabel'
   pod 'YYText'
   pod 'Masonry'
-	#输入
-	pod 'SZTextView'
+  #输入
+  pod 'SZTextView'
   #头饰显示
   pod 'YYWebImage'
 	#轮播图
@@ -30,49 +40,47 @@ target 'YuMi' do
   pod 'IQKeyboardManager'
   pod 'TZImagePickerController'
   #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 10.3.12317'
+  pod 'TXLiteAVSDK_TRTC'
   #vap礼物动画
   pod 'QGVAPlayer'
   #上传音乐
   pod 'CocoaAsyncSocket',:modular_headers => true
   #声网
-  pod 'AgoraRtcEngine_iOS', '~> 3.2.2'
-	#上传图片
-	pod 'Qiniu'
-	#内购
-	pod 'IAPHelper'
-	#持久化存储
-	pod 'SSKeychain'
-	pod 'Base64'
+  pod 'AgoraRtcEngine_iOS'
+  pod 'SSKeychain'
+  pod 'Base64'
   #pop动画
-  pod 'pop', '~> 1.0.12'
+  pod 'pop'
   #云信
-  pod 'NIMSDK_LITE', '~> 9.2.8'
-	pod 'GKCycleScrollView', '~> 1.2.0'
-	pod 'SVGAPlayer'
-
-	pod 'GoogleSignIn', '6.2.4'
-	pod 'mob_sharesdk'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Facebook_Lite'
-	pod 'mob_sharesdk/ShareSDKPlatforms/Line'
-	pod 'mob_sharesdk/ShareSDKExtension'
+  pod 'NIMSDK_LITE'
+  pod 'GKCycleScrollView'
+  pod 'SVGAPlayer'
+  pod 'GoogleSignIn'
+  pod 'mob_linksdk_pro'
+  pod 'mob_sharesdk'
+  pod 'mob_sharesdk/ShareSDKPlatforms/Apple'
+  #pod 'mob_sharesdk/ShareSDKPlatforms/Line'
+  pod 'mob_sharesdk/ShareSDKExtension'
   
   pod 'UMCommon'
-	pod 'UMDevice'
+  pod 'UMDevice'
   pod 'lottie-ios'
-  pod 'WeexSDK'
   pod 'ZLCollectionViewFlowLayout'
   pod 'WMZDropDownMenu'
   pod 'TABAnimated'
   pod 'YuMi',:path=>'yum'
-	
+  pod 'QCloudCOSXML'	
 end
+
 post_install do |installer|
   installer.generated_projects.each do |project|
     project.targets.each do |target|
       target.build_configurations.each do |config|
             config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+           xcconfig_path = config.base_configuration_reference.real_path
+          xcconfig = File.read(xcconfig_path)
+          xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+          File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
        end
     end
   end

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -72,7 +72,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

YuMi.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:YuMi.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

YuMi.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

YuMi/Appdelegate/AppDelegate+ThirdConfig.h

@@ -10,9 +10,12 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface AppDelegate (ThirdConfig)
-- (void)initTertiusDisposition;
-
-- (void)setupLaunchADRegard;
+/// 初始化一些第三方配置
+- (void)initThirdConfig;
+/**
+ 设置广告页
+ */
+- (void)setupLaunchADView;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -6,43 +6,114 @@
 //
 
 #import "AppDelegate+ThirdConfig.h"
+///Third
 #import <NIMSDK/NIMSDK.h>
 #import <ShareSDK/ShareSDK.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
+#import <UserNotifications/UserNotifications.h>
+#import <MOBFoundation/MobSDK+Privacy.h>
+///Tool
 #import "YUMIConstant.h"
 #import "CustomAttachmentDecoder.h"
-#import "MHTSpiritFacilitater.h"
-#import "YUMIAdvertiseRegard.h"
-#import "YUMIAdIndicateTool.h"
+#import "QEmotionHelper.h"
+#import "XPAdvertiseView.h"
+#import "XPAdImageTool.h"
 #import "YUMIMacroUitls.h"
-#import "AdvertiseMatrix.h"
-#import "YUMITissueRegardGovernancer.h"
-#import "YUMIChamberRegardGovernancer.h"
-#import "XCCurrentVCStackExecutive.h"
-#import "ClientDisposition.h"
+#import "AdvertiseModel.h"
+#import "XPWebViewController.h"
+#import "XPRoomViewController.h"
+#import "XCCurrentVCStackManager.h"
+#import "ClientConfig.h"
+#import <Adjust/Adjust.h>
+#import <UserNotifications/UserNotifications.h>
+
+#import <Bugly/Bugly.h>
+
+#import "YuMi-swift.h"
 
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
 
 @implementation AppDelegate (ThirdConfig)
 
-
-- (void)initTertiusDisposition {
-	[self prohibitipositionPartowardsiciptowardsionSDK];
-	[self prohibitipositionNEMCSDK];
-	[self initEmojiTowardsoloudspeaker];
+/// 初始化一些第三方配置
+- (void)initThirdConfig{
+	[self configShareSDK];
+	[self configNIMSDK];
+    [self configAdjust];
+    [self configBugly];
+    [self registerNot];
+    [self initEmojiData];
+    [self setLanguage];
 }
 
-- (void)prohibitipositionNEMCSDK {
+-(void)setLanguage{
+    UISemanticContentAttribute attribute = UISemanticContentAttributeForceLeftToRight;
+    if (isMSRTL()) {
+        attribute = UISemanticContentAttributeForceRightToLeft;
+    }
 
-	NSString *appKey        = KeyWithType(KeyGenre_NetEase);
+    [UIView appearance].semanticContentAttribute = attribute;
+    [UISearchBar appearance].semanticContentAttribute = attribute;
+}
+
+-(void)registerNot{
+    if (@available(iOS 10.0, *)) {
+        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+        [center requestAuthorizationWithOptions:(UNAuthorizationOptionAlert | UNAuthorizationOptionBadge | UNAuthorizationOptionSound) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+            if (granted) {
+                [center getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+                    if (settings.authorizationStatus == UNAuthorizationStatusAuthorized){
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            [[UIApplication sharedApplication] registerForRemoteNotifications];
+                        });
+                    }
+                }];
+            }
+        }];
+    }
+}
+
+/**
+ 崩溃收集 Bugly
+ */
+- (void) configBugly {
+
+    BuglyConfig *config = [[BuglyConfig alloc] init];
+    
+    config.blockMonitorTimeout = 5;
+    config.unexpectedTerminatingDetectionEnable = YES; // 非正常退出事件记录开关，默认关闭
+
+#ifdef DEBUG
+    config.debugMode = YES; // debug 模式下，开启调试模式
+    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
+    config.reportLogLevel = BuglyLogLevelVerbose; // 设置打印日志级别
+    [Bugly startWithAppId:@"86cf73b8d5" config:config];
+#else
+    config.debugMode = NO; // release 模式下，关闭调试模式
+    config.channel = [YYUtility getAppSource];; config.blockMonitorEnable = NO; // 卡顿监控开关，默认关闭
+    config.reportLogLevel = BuglyLogLevelWarn; // 设置自定义日志上报的级别，默认不上报自定义日志
+    NSString *buylyKey = isEnterprise == NO ? @"5334684d86" : @"d65df59a68";
+    [Bugly startWithAppId:buylyKey config:config];
+#endif
+    
+}
+- (void)configNIMSDK {
+	//推荐在程序启动的时候初始化 NIMSDK
+	NSString *appKey        = KeyWithType(KeyType_NetEase);
 	NIMSDKOption *option    = [NIMSDKOption optionWithAppKey:appKey];
+#ifdef DEBUG
+    option.apnsCername = @"pikoDevelopPush";
+#else
+    option.apnsCername = @"newPiko";
+#endif
+
 	[[NIMSDK sharedSDK] registerWithOption:option];
 	
-	
+	// NIM SDK初始化
     [NIMCustomObject registerCustomDecoder:[[CustomAttachmentDecoder alloc] init]];
 	[NIMSDKConfig sharedConfig].shouldConsiderRevokedMessageUnreadCount = YES;
-	
+	///置顶会话同步
 	[[NIMSDKConfig sharedConfig] setShouldSyncStickTopSessionInfos:YES];
 #ifdef DEBUG
     [NIMSDKConfig sharedConfig].enabledHttpsForInfo = NO;
@@ -50,65 +121,99 @@ UIKIT_EXTERN NSString * adImageName;
 #endif
 }
 
+-(void)configAdjust{
+    NSString *appToken = @"p5sndfu9udq8";
+    NSString *environment;
+   #ifdef DEBUG
+       environment = ADJEnvironmentSandbox;
+   #else
+       environment = ADJEnvironmentProduction;
+   #endif
+    
+       ADJConfig*adjustConfig = [ADJConfig configWithAppToken:appToken
+                                     environment:environment];
+       
+   #ifdef DEBUG
+       [adjustConfig setLogLevel:ADJLogLevelVerbose];
+   #else
+     
+   #endif
+   [Adjust appDidLaunch:adjustConfig];
+}
+
+- (void)configShareSDK {
+
+    [PILineLoginManager registerLine];
 
-- (void)prohibitipositionPartowardsiciptowardsionSDK {
 	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
-		
-		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"App_Delegate__Third_Config_0")];
+		///faceBook
+//		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
 		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
 	}];
+
+    NSString *isUpload = [[NSUserDefaults standardUserDefaults]valueForKey:@"kMobLinkUploadPrivacy"];
+    if (isUpload == nil){
+        [MobSDK uploadPrivacyPermissionStatus:YES onResult:nil];
+        [[NSUserDefaults standardUserDefaults] setValue:@"YES" forKey:@"kMobLinkUploadPrivacy"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    }
 }
 
 #pragma mark - 表情
-- (void)initEmojiTowardsoloudspeaker {
-	NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
-	NSDictionary * dic = [dicArray firstObject];
-	NSArray * emojiArray = dic[@"data"];
-	NSMutableArray * array = [NSMutableArray array];
-	for (int i = 0; i < emojiArray.count; i++) {
-		NSDictionary * dic = [emojiArray objectAtIndex:i];
-		UIImage * image = [UIImage imageNamed:dic[@"file"]];
-		MHTSpirit * info = [[MHTSpirit alloc] init];
-		info.identifier = dic[@"id"];
-		info.image = image;
-		info.displayName = dic[@"tag"];
-		[array addObject:info];
-	}
-	
-	MHTSpiritFacilitater *faceManager = [MHTSpiritFacilitater partowardsiciptowardsiondSenintrtowardsemporalntFacilittowardseer];
-	faceManager.senintratemporalntGarment = array;
+- (void)initEmojiData {
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        NSArray * dicArray = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"emoji" ofType:@"plist"]];
+        NSDictionary * dic = [dicArray firstObject];
+        NSArray * emojiArray = dic[@"data"];
+        NSMutableArray * array = [NSMutableArray array];
+        for (int i = 0; i < emojiArray.count; i++) {
+            NSDictionary * dic = [emojiArray objectAtIndex:i];
+            UIImage * image = [UIImage imageNamed:dic[@"file"]];
+            QEmotion * info = [[QEmotion alloc] init];
+            info.identifier = dic[@"id"];
+            info.image = image;
+            info.displayName = dic[@"tag"];
+            [array addObject:info];
+        }
+        //在这里强烈建议先预加载一下表情
+        QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
+        faceManager.emotionArray = array;
+    });
 }
 
 #pragma mark - 广告
 
-
-- (void)setupLaunchADRegard {
+/**
+ 设置广告页
+ */
+- (void)setupLaunchADView {
 	NSUserDefaults * kUserDefaults =  NSUserDefaults.standardUserDefaults;
+	// 判断沙盒中是否存在广告图片，如果存在，直接显示
+    NSString *adName = [kUserDefaults stringForKey:adImageName];
+	NSString *filePath = [XPAdImageTool.shareImageTool getFilePathWithImageName:adName];
+	BOOL isExist = [XPAdImageTool.shareImageTool isFileExistWithFilePath:filePath];
 
-	NSString *filePath = [YUMIAdIndicateTool.partowardsiciptowardsionIndictowardseUtensil acquireAccurtowardseRouteAboutIndictowardseConstitute:[kUserDefaults valueForKey:adImageName]];
-	BOOL isExist = [YUMIAdIndicateTool.partowardsiciptowardsionIndictowardseUtensil isAccurtowardseExistAboutAccurtowardseRoute:filePath];
-	NSUserDefaults *userDefault = [NSUserDefaults standardUserDefaults];
-
-	if ([userDefault integerForKey:@"adShow"]) {
-		[userDefault setInteger:[userDefault integerForKey:@"adShow"]+1 forKey:@"adShow"];
+	if ([kUserDefaults integerForKey:@"adShow"]) {
+		[kUserDefaults setInteger:[kUserDefaults integerForKey:@"adShow"]+1
+                           forKey:@"adShow"];
 	} else {
-		[userDefault setInteger:1 forKey:@"adShow"];
+		[kUserDefaults setInteger:1 forKey:@"adShow"];
 	}
 
-	if (isExist) {
-
-		if ([userDefault integerForKey:@"adShow"] > 4) {
+	if (isExist) {// 图片存在
+		if ([kUserDefaults integerForKey:@"adShow"] > 4) {
 			@kWeakify(self);
-			NSString *imageName = [kUserDefaults valueForKey:adImageName];
-			AdvertiseMatrix *info = [YUMIAdIndicateTool.partowardsiciptowardsionIndictowardseUtensil acquireDirectoryAbstractByvirtueofConcealInMainAbout:imageName];
-			YUMIAdvertiseRegard *advertiseView = [[YUMIAdvertiseRegard alloc] initWithFrame:self.window.bounds];
+			AdvertiseModel *info = [XPAdImageTool.shareImageTool getAdInfoFromCacheInMainWith:adName];
+			XPAdvertiseView *advertiseView = [[XPAdvertiseView alloc] initWithFrame:self.window.bounds];
 			advertiseView.filePath = filePath;
-			advertiseView.disappearHandler = ^(BOOL shouldJump) {
+			advertiseView.dismissHandler = ^(BOOL shouldJump) {
 				@kStrongify(self)
 				if (!shouldJump || info == nil) {
 					return;
 				}
-				[self performSelectorOnMainThread:@selector(advertiseJumpShankAboutAbstract:) withObject:info waitUntilDone:NO];
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [self advertiseJumpHandleWithInfo:info];
+                });
 			};
 			[advertiseView show];
 		}
@@ -116,32 +221,30 @@ UIKIT_EXTERN NSString * adImageName;
 }
 
 
-- (void)advertiseJumpShankAboutAbstract:(AdvertiseMatrix *)info {
-	if (![ClientDisposition partowardsiciptowardsionDisposition].canUnfoild) {
-		return;
-	}
+/// 闪屏广告跳转处理
+- (void)advertiseJumpHandleWithInfo:(AdvertiseModel *)info {
 	if (UIApplication.sharedApplication.keyWindow != self.window) {
-		
+		//当前窗口不是主控制器所在窗口时，拦截跳转（目前可能情况时，闪屏后出现新人引导
 		return;
 	}
 
 	switch (info.type) {
-		case SplashAbstractSkipGenreRoom: {
-			if (![[YUMIAdIndicateTool partowardsiciptowardsionIndictowardseUtensil] isImSurmount]) {
-				return; 
+		case SplashInfoSkipTypeRoom: {
+			if (![[XPAdImageTool shareImageTool] isImLogin]) {
+				return; // 必须登录后才可以跳转
 			}
-			
+			// 跳转房间
 			if (info.link.length > 0) {
-				[YUMIChamberRegardGovernancer unfoildChamber:info.link viewController:[XCCurrentVCStackExecutive shareManager].getCurrentVC];
+				[XPRoomViewController openRoom:info.link viewController:[XCCurrentVCStackManager shareManager].getCurrentVC];
 			}
 		}
 			break;
-		case SplashAbstractSkipGenreWeb: {
-			
+		case SplashInfoSkipTypeWeb: {
+			// 跳转 H5
 			if (info.link.length > 0) {
-				YUMITissueRegardGovernancer *webView = [[YUMITissueRegardGovernancer alloc]init];
+				XPWebViewController *webView = [[XPWebViewController alloc]init];
 				webView.url = info.link;
-				[[[XCCurrentVCStackExecutive shareManager]universalBreeadcrumbGovernancer] pushViewController:webView animated:YES];
+				[[[XCCurrentVCStackManager shareManager]currentNavigationController] pushViewController:webView animated:YES];
 			}
 		}
 			break;

YuMi/Appdelegate/AppDelegate.h

@@ -14,7 +14,7 @@
 @property(nonatomic,strong,readonly)NSManagedObjectModel *managedObjectModel;
 @property(nonatomic,strong,readonly)NSPersistentStoreCoordinator *persistentStoreCoordinator;
 
-- (void)preserveConessay;
-- (NSURL *)aplictowardsionlictowardsionDocumentsDirectoryvisory;
+- (void)saveContext;
+- (NSURL *)applicationDocumentsDirectory;
 @end
 

YuMi/Appdelegate/AppDelegate.m

@@ -5,45 +5,216 @@
 //  Created by admin on 2023/3/9.
 //
 
+
 #import "AppDelegate.h"
-#import "TabbarRegardGovernancer.h"
-#import "BaseNevigationGovernancer.h"
+#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"
 #import <NIMSDK/NIMSDK.h>
-#import <UMCommon/UMCommon.h>
-@interface AppDelegate ()
+#import <AppTrackingTransparency/AppTrackingTransparency.h>
+#import "ClientConfig.h"
+#import <GoogleSignIn/GoogleSignIn.h>
+#import "GULAppDelegateSwizzler.h"
+#import <GoogleSignIn/GoogleSignIn.h>
+#import "XPLoginViewController.h"
+#import "AccountModel.h"
+#import "YuMi-swift.h"
+#import "SessionViewController.h"
+#import "LoginFullInfoViewController.h"
+@import Firebase;
+UIKIT_EXTERN NSString * const kOpenRoomNotification;
+
+@interface AppDelegate ()<IMLSDKRestoreDelegate>
 
 @end
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    TabbarRegardGovernancer *vc = [[TabbarRegardGovernancer alloc] init];
-    BaseNevigationGovernancer *bnc = [[BaseNevigationGovernancer alloc] initWithRootViewController:vc];
+
+	///初始化一些 sdk配置
+    [self initThirdConfig];
+    [self initUM:application launchOptions:launchOptions];
+
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    self.window.rootViewController = bnc;
     [self.window makeKeyAndVisible];
 
-	[self setupLaunchADRegard];
+    [self loadMainPage];
+    [self setupLaunchADView];
 
-	[self initTertiusDisposition];
-	
-	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
-		
-		[UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"yumi_appstore"];
-	}
     return YES;
 }
 
+- (void)initUM:(UIApplication *)application
+ launchOptions:(NSDictionary *)launchOptions {
+    // 只有同意过了隐私协议 才初始化
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) {
+        ///初始化友盟
+        [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" 
+                            channel:@"appstore"];
+    }
+    [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
+    [FIRApp configure];
+    [MobLink setDelegate:self];
+}
+
+- (void)loadMainPage {
+    AccountModel *accountModel = [[AccountInfoStorage instance] getCurrentAccountInfo];
+    if (accountModel == nil || 
+        accountModel.uid == nil ||
+        accountModel.access_token == nil) {
+        [self toLoginPage];
+    }else{
+        [self toHomeTabbarPage];
+    }
+}
+
+- (void)toLoginPage {
+    XPLoginViewController *lvc = [[XPLoginViewController alloc] init];
+    BaseNavigationController * navigationController = [[BaseNavigationController alloc] initWithRootViewController:lvc];
+    navigationController.modalPresentationStyle = UIModalPresentationFullScreen;
+    self.window.rootViewController = navigationController;
+}
+
+- (void)toHomeTabbarPage {
+    TabbarViewController *vc = [[TabbarViewController alloc] init];
+    BaseNavigationController *navigationController = [[BaseNavigationController alloc] initWithRootViewController:vc];
+    self.window.rootViewController = navigationController;
+}
+
+- (void)IMLSDKWillRestoreScene:(MLSDKScene *)scene
+                       Restore:(void (^)(BOOL, RestoreStyle))restoreHandler {
+    NSString *inviteCode = scene.params[@"inviteCode"];
+    if (inviteCode != nil && [[AccountInfoStorage instance]getUid].length == 0){
+        ClientConfig *config = [ClientConfig shareConfig];
+        config.inviteCode = inviteCode;
+    }
+    restoreHandler(YES, MLDefault);
+}
 
 - (void)applicationDidEnterBackground:(UIApplication *)application {
     NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount;
     [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count];
 }
 
-- (void)application:(UIApplication *)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+    [self getAdvertisingTrackingAuthority];
+    [[NSNotificationCenter defaultCenter]postNotificationName:@"kAppDidBecomeActive" object:nil];
+}
 
-	[[NIMSDK sharedSDK] updateApnsToken:deviceToken];
+- (void)getAdvertisingTrackingAuthority {
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (@available(iOS 14, *)) {
+            ATTrackingManagerAuthorizationStatus status = ATTrackingManager.trackingAuthorizationStatus;
+            switch (status) {
+                case ATTrackingManagerAuthorizationStatusDenied:
+                    NSLog(@"用户拒绝IDFA");
+                    break;
+                case ATTrackingManagerAuthorizationStatusAuthorized:
+                    NSLog(@"用户允许IDFA");
+                    break;
+                case ATTrackingManagerAuthorizationStatusNotDetermined: {
+                    NSLog(@"用户未做选择或未弹窗IDFA");
+                    //请求弹出用户授权框，只会在程序运行是弹框1次，除非卸载app重装，通地图、相机等权限弹框一样
+                    [ATTrackingManager requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) {
+                        NSLog(@"app追踪IDFA权限：%lu",(unsigned long)status);
+                    }];
+                }
+                    break;
+                default:
+                    break;
+            }
+        }
+    });
+}
+
+- (void)application:(UIApplication *)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+	// 上传devicetoken至云信服务器。
+	[[NIMSDK sharedSDK] updateApnsToken:deviceToken ];
+}
+
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
+   
+    NSString *data = userInfo[@"data"];
+    if(data){
+        NSDictionary *dataDic = [data mj_JSONObject];
+        NSString *userId = dataDic[@"uid"];
+        if(userId){
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            config.pushChatId = userId;
+           
+            });
+            return;
+        }
+    }
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        NSString *userId = userInfo[@"uid"];
+        if(userId){
+            [[NSNotificationCenter defaultCenter]postNotificationName:kOpenRoomNotification object:nil userInfo:@{@"type":@"kOpenChat",@"uid":userId,@"isNoAttention":@(YES)}];
+            ClientConfig *config = [ClientConfig shareConfig];
+            config.pushChatId = userId;
+        }
+       });
+}
+
+///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];
+    }
+    
+    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];
 }
 
 
@@ -52,12 +223,12 @@
 @synthesize managedObjectModel = _managedObjectModel;
 @synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
 
--(NSURL *)aplictowardsionlictowardsionDocumentsDirectoryvisory{
+-(NSURL *)applicationDocumentsDirectory{
 	return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
 }
 
 - (NSManagedObjectModel *)managedObjectModel {
-	
+	// The managed object model for the application. It is a fatal error for the application not to be able to find and load its model.
 	if (_managedObjectModel != nil) {
 		return _managedObjectModel;
 	}
@@ -67,26 +238,26 @@
 }
 
 - (NSPersistentStoreCoordinator *)persistentStoreCoordinator {
-	
+	// The persistent store coordinator for the application. This implementation creates and returns a coordinator, having added the store for the application to it.
 	if (_persistentStoreCoordinator != nil) {
 		return _persistentStoreCoordinator;
 	}
 	
-	
+	// Create the coordinator and store
 	
 	_persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
-	NSURL *storeURL = [[self aplictowardsionlictowardsionDocumentsDirectoryvisory] URLByAppendingPathComponent:@"_1_______.sqlite"];
+	NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"_1_______.sqlite"];
 	NSError *error = nil;
 	NSString *failureReason = @"There was an error creating or loading the application's saved data.";
 	if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
-		
+		// Report any error we got.
 		NSMutableDictionary *dict = [NSMutableDictionary dictionary];
 		dict[NSLocalizedDescriptionKey] = @"Failed to initialize the application's saved data";
 		dict[NSLocalizedFailureReasonErrorKey] = failureReason;
 		dict[NSUnderlyingErrorKey] = error;
 		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]);
 		abort();
 	}
@@ -96,7 +267,7 @@
 
 
 - (NSManagedObjectContext *)managedObjectContext {
-	
+	// Returns the managed object context for the application (which is already bound to the persistent store coordinator for the application.)
 	if (_managedObjectContext != nil) {
 		return _managedObjectContext;
 	}
@@ -112,13 +283,13 @@
 
 #pragma mark - Core Data Saving support
 
-- (void)preserveConessay {
+- (void)saveContext {
 	NSManagedObjectContext *managedObjectContext = self.managedObjectContext;
 	if (managedObjectContext != nil) {
 		NSError *error = nil;
 		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]);
 			abort();
 		}

YuMi/Appdelegate/FBSDKSettings+PISDKSettings.h

@@ -0,0 +1,16 @@
+//
+//  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

@@ -0,0 +1,19 @@
+//
+//  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/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.h

@@ -0,0 +1,16 @@
+//
+//  YYTextAsyncLayer+PITextAsyncLayer.h
+//  YuMi
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import <YYText/YYTextAsyncLayer.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YYTextAsyncLayer (PITextAsyncLayer)
+
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.m

@@ -0,0 +1,26 @@
+//
+//  YYTextAsyncLayer+PITextAsyncLayer.m
+//  YuMi
+//
+//  Created by duoban on 2023/10/28.
+//
+
+#import "YYTextAsyncLayer+PITextAsyncLayer.h"
+
+@implementation YYTextAsyncLayer (PITextAsyncLayer)
+///iOS17bug，如果不把方法替换会闪退
++(void)load {
+    Method displayMethod = class_getInstanceMethod(self, @selector(display));
+    Method swizzingMethod = class_getInstanceMethod(self, @selector(swizzing_display));
+    method_exchangeImplementations(displayMethod, swizzingMethod);
+}
+-(void)swizzing_display{
+    //通过变量名称获取类中的实例成员变量
+    if (self.bounds.size.width <= 0 || self.bounds.size.height <= 0) {
+        self.contents = nil;
+        return;
+    } else {
+        [self swizzing_display];
+    }
+}
+@end

YuMi/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -1,7 +0,0 @@
-{"colors": [{"idiom": "universal"}], "info": {"author": "xcode", "version": 1}}
-
-
-
-
-
-

YuMi/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,14 @@
-{"images": [{"filename": "1024.png", "idiom": "universal", "platform": "ios", "size": "1024x1024"}], "info": {"author": "xcode", "version": 1}}
-
-
-
-
-
-
+{
+  "images" : [
+    {
+      "filename" : "1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/Assets.xcassets/Contents.json

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

YuMi/Assets.xcassets/Language/Contents.json

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

YuMi/Assets.xcassets/Language/ar/Contents.json

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

YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchorPK_result_fail_headWear_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchorPK_result_tie_headWear_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchorPK_result_win_headWear_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchorPk_micro_result_fail_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchorPk_micro_result_tie_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchorPk_micro_result_win_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchor_fansTeam_nameplate_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchor_fansTeam_task_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/common_icon_beautiful_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/common_super_admin_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/crossroom_pk_menu_icon_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/gift_first_recharge_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_album_reviewing_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_dressUp_new_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_dressup_noble_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/monents_common_landLordFlag_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/monents_info_top_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_fail_icon_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/ms_room_game_victory_top_icon_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/noble_privilege_icon_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/Contents.json

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

YuMi/Assets.xcassets/Language/ar/pk_top_charms_mark_ar.imageset/Contents.json

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