商店包版本修改 此commit置顶 10.12

Podfile

@@ -3,10 +3,7 @@
 source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 target 'YuMi' do
   use_frameworks!
-  pod 'Bugly'
+
-  pod 'Adjust', '~> 4.31.0'
-  pod 'Firebase/Analytics'
-  pod 'FBSDKLoginKit'
   # 滑动标签栏
   pod 'JXCategoryView'
   pod 'JXPagingView/Pager'
@@ -33,7 +30,7 @@ target 'YuMi' do
   pod 'IQKeyboardManager'
   pod 'TZImagePickerController'
   #TRTC
-  pod 'TXLiteAVSDK_TRTC', '~> 11.4.14445'
+  pod 'TXLiteAVSDK_TRTC', '~> 10.3.12317'
   #vap礼物动画
   pod 'QGVAPlayer'
   #上传音乐
@@ -57,6 +54,7 @@ target 'YuMi' do
 	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'
   

YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme

@@ -31,7 +31,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -22,10 +22,6 @@
 #import "XPRoomViewController.h"
 #import "XCCurrentVCStackManager.h"
 #import "ClientConfig.h"
-#import <Adjust/Adjust.h>
-
-#import <Bugly/Bugly.h>
-
 
 UIKIT_EXTERN NSString * kYouMiNumberCountKey;
 UIKIT_EXTERN NSString * adImageName;
@@ -38,31 +34,8 @@ UIKIT_EXTERN NSString * adImageName;
 	[self configShareSDK];
 	[self configNIMSDK];
 	[self initEmojiData];
-    [self configAdjust];
-    [self configBugly];
 }
-/**
- 崩溃收集 Bugly
- */
-- (void) configBugly {
 
-    BuglyConfig *config = [[BuglyConfig alloc] init];
-    config.channel = @"App Enterprise";
-    config.blockMonitorEnable = YES; // 卡顿监控开关，默认关闭
-    config.blockMonitorTimeout = 5;
-    config.unexpectedTerminatingDetectionEnable = YES; // 非正常退出事件记录开关，默认关闭
-
-#ifdef DEBUG
-    config.debugMode = YES; // debug 模式下，开启调试模式
-    config.reportLogLevel = BuglyLogLevelVerbose; // 设置打印日志级别
-    [Bugly startWithAppId:@"86cf73b8d5" config:config];
-#else
-    config.debugMode = NO; // release 模式下，关闭调试模式
-    config.reportLogLevel = BuglyLogLevelWarn; // 设置自定义日志上报的级别，默认不上报自定义日志
-    [Bugly startWithAppId:@"0fcba36f9a" config:config];
-#endif
-    
-}
 - (void)configNIMSDK {
 	//推荐在程序启动的时候初始化 NIMSDK
 	NSString *appKey        = KeyWithType(KeyType_NetEase);
@@ -80,34 +53,13 @@ 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 {
-    
+	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
-  
+		///faceBook
-    
+		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
-//	[ShareSDK registPlatforms:^(SSDKRegister *platformsRegister) {
+		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
-//		///faceBook
+	}];
-//		[platformsRegister setupFacebookWithAppkey:@"1266232494209868" appSecret:@"c9b170b383f8be9cdf118823b8632821" displayName:YMLocalizedString(@"AppDelegate_ThirdConfig0")];
-//		[platformsRegister setupLineAuthType:SSDKAuthorizeTypeBoth];
-//	}];
 }
 
 #pragma mark - 表情
@@ -161,10 +113,7 @@ UIKIT_EXTERN NSString * adImageName;
 				if (!shouldJump || info == nil) {
 					return;
 				}
-                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+				[self performSelectorOnMainThread:@selector(advertiseJumpHandleWithInfo:) withObject:info waitUntilDone:NO];
-                    [self performSelectorOnMainThread:@selector(advertiseJumpHandleWithInfo:) withObject:info waitUntilDone:NO];
-                   });
-				
 			};
 			[advertiseView show];
 		}

YuMi/Appdelegate/AppDelegate.m

@@ -11,12 +11,6 @@
 #import "AppDelegate+ThirdConfig.h"
 #import <NIMSDK/NIMSDK.h>
 #import <UMCommon/UMCommon.h>
-#import <FBSDKCoreKit/FBSDKCoreKit.h>
-#import <AppTrackingTransparency/AppTrackingTransparency.h>
-#import "ClientConfig.h"
-@import Firebase;
-UIKIT_EXTERN NSString * const kOpenRoomNotification;
-
 @interface AppDelegate ()
 
 @end
@@ -38,8 +32,6 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
 		///初始化友盟
 		[UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"yumi_appstore"];
 	}
-    [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];
-    [FIRApp configure];
     return YES;
 }
 
@@ -48,80 +40,12 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification;
     NSInteger count = [NIMSDK sharedSDK].conversationManager.allUnreadCount;
     [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count];
 }
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-    [self getAdvertisingTrackingAuthority];
-}
-- (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];
 }
 
-///URL Scheme跳转
--(BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options{
-   
-    
-    
-    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;
-            }
-            return YES;
-        }
-       
-    }
-    return [[FBSDKApplicationDelegate sharedInstance] application:app
-                                                         openURL:url
-                                                         sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey]
-                                                         annotation:options[UIApplicationOpenURLOptionsAnnotationKey]];
-}
-
 
 #pragma mark - Core Data stack
 @synthesize managedObjectContext = _managedObjectContext;

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

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

YuMi/Assets.xcassets/Login/login_full_female_logo.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_full_info_female_normal.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_full_info_female_select.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_full_info_male_normal.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_full_info_male_select.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_full_male.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_full_male_logo.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_next_login.imageset/Contents.json

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

YuMi/Assets.xcassets/Login/login_phone_pwd_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/Monents/mine_dynamic.imageset/Contents.json

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

YuMi/Assets.xcassets/Monents/monents_on_line_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/Monents/monents_on_line_note.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treaseure_fairy_large_gift_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treaseure_fairy_normal_gift_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_faily_result_gift_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_back.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_ball_ask.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_ball_not_get.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_ball_send.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_bg.imageset/Contents.json

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

YuMi/Assets.xcassets/jm/Fairy/room_treasure_fairy_draw_bg.imageset/Contents.json

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