Merge branch 'master' of http://git.izouma.com/xiongzhu/thmodel_ios_member

千模.xcodeproj/project.pbxproj

@@ -2652,7 +2652,7 @@
 				TargetAttributes = {
 					3C8D4EBE20AD71E100422869 = {
 						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.ApplePay = {
 								enabled = 0;

千模/AppDelegate.m

@@ -198,20 +198,21 @@ NSString *NTESNotificationLogout = @"NTESNotificationLogout";
     NSString *currentVersion = [NSBundle mainBundle].infoDictionary[key];
     // 获得沙盒中存储的版本号
     NSString *sanboxVersion = [[NSUserDefaults standardUserDefaults] stringForKey:key];
-    if (sanboxVersion == nil || ![sanboxVersion isEqualToString:currentVersion]) {  //本地版本号不同, 显示新特性
-
-        [self.window.rootViewController dismissViewControllerAnimated:YES completion:nil];
-
-        ModelNewFeatureController *mineVc = [[ModelNewFeatureController alloc] init];
-        UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:mineVc];
-        self.window.rootViewController = nav;
-
-        // 将当前的版本号存进沙盒
-        [[NSUserDefaults standardUserDefaults] setObject:currentVersion forKey:key];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    } else { //本地版本号相同
-        [self setupMainViewController];
-    }
+//    if (sanboxVersion == nil || ![sanboxVersion isEqualToString:currentVersion]) {  //本地版本号不同, 显示新特性
+//
+//        [self.window.rootViewController dismissViewControllerAnimated:YES completion:nil];
+//
+//        ModelNewFeatureController *mineVc = [[ModelNewFeatureController alloc] init];
+//        UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:mineVc];
+//        self.window.rootViewController = nav;
+//
+//        // 将当前的版本号存进沙盒
+//        [[NSUserDefaults standardUserDefaults] setObject:currentVersion forKey:key];
+//        [[NSUserDefaults standardUserDefaults] synchronize];
+//    } else { //本地版本号相同
+//        [self setupMainViewController];
+//    }
+    [self setupMainViewController];
 
     [WXApi registerApp:@"wx2d60e82cb3df6926" enableMTA:YES];