drew 6 lat temu
rodzic
commit
27c95f0fc1
28 zmienionych plików z 75 dodań i 45 usunięć
  1. 2 2
      Podfile.lock
  2. 2 2
      Pods/Manifest.lock
  3. 37 34
      Pods/Pods.xcodeproj/project.pbxproj
  4. 1 0
      Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
  5. 1 0
      Pods/Target Support Files/BRPickerView/BRPickerView.xcconfig
  6. 1 0
      Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.xcconfig
  7. 1 0
      Pods/Target Support Files/M80AttributedLabel/M80AttributedLabel.xcconfig
  8. 1 0
      Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig
  9. 1 0
      Pods/Target Support Files/MJExtension/MJExtension.xcconfig
  10. 1 0
      Pods/Target Support Files/MJRefresh/MJRefresh.xcconfig
  11. 1 0
      Pods/Target Support Files/NIMSDK/NIMSDK.xcconfig
  12. 1 0
      Pods/Target Support Files/Pods-model/Pods-model.debug.xcconfig
  13. 1 0
      Pods/Target Support Files/Pods-model/Pods-model.release.xcconfig
  14. 1 0
      Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig
  15. 1 0
      Pods/Target Support Files/TOCropViewController/TOCropViewController.xcconfig
  16. 1 0
      Pods/Target Support Files/TTGTagCollectionView/TTGTagCollectionView.xcconfig
  17. 1 0
      Pods/Target Support Files/Toast/Toast.xcconfig
  18. 1 0
      Pods/Target Support Files/UICollectionViewLeftAlignedLayout/UICollectionViewLeftAlignedLayout.xcconfig
  19. 1 0
      Pods/Target Support Files/UMCCommon/UMCCommon.xcconfig
  20. 1 0
      Pods/Target Support Files/UMCPush/UMCPush.xcconfig
  21. 1 0
      Pods/Target Support Files/UMCSecurityPlugins/UMCSecurityPlugins.xcconfig
  22. 1 0
      Pods/Target Support Files/WZLBadge/WZLBadge.xcconfig
  23. 1 0
      Pods/Target Support Files/WechatOpenSDK/WechatOpenSDK.xcconfig
  24. 4 0
      model.xcodeproj/project.pbxproj
  25. 1 0
      model/Classes/Controllers/Controller/MessageVC/NTESNetChatViewController.m
  26. 2 0
      model/Classes/Controllers/Controller/MessageVC/NTESVideoChatViewController.m
  27. 3 3
      model/Classes/Public/RegisterViewController.m
  28. 4 4
      model/Info.plist

+ 2 - 2
Podfile.lock

@@ -56,7 +56,7 @@ DEPENDENCIES:
   - WZLBadge
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - AFNetworking
     - BRPickerView
     - IQKeyboardManager
@@ -98,4 +98,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: d6eee6df8c44b563cf2cee8995dc49267ed1c58a
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.8.4

+ 2 - 2
Pods/Manifest.lock

@@ -56,7 +56,7 @@ DEPENDENCIES:
   - WZLBadge
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - AFNetworking
     - BRPickerView
     - IQKeyboardManager
@@ -98,4 +98,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: d6eee6df8c44b563cf2cee8995dc49267ed1c58a
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.8.4

+ 37 - 34
Pods/Pods.xcodeproj/project.pbxproj

@@ -2306,6 +2306,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = CF1408CF629C7361332E53B88F7BD30C;
 			productRefGroup = 12D98ADCF6C088E8196167E9F4B1819A /* Products */;
@@ -3021,22 +3022,6 @@
 			};
 			name = Release;
 		};
-		4900000C36A9C6EDAAF025AFC7AB995C /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D3F7E29725CB8A68E7302E54994EB2A3 /* TOCropViewController.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/TOCropViewController";
-				INFOPLIST_FILE = "Target Support Files/TOCropViewController/ResourceBundle-TOCropViewControllerBundle-TOCropViewController-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				PRODUCT_NAME = TOCropViewControllerBundle;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = bundle;
-			};
-			name = Release;
-		};
 		4BE66A09A74FD25164AAB3C2645B9B93 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -3097,6 +3082,23 @@
 			};
 			name = Release;
 		};
+		4CB62E0E366D8E3AE305F77430958B9C /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D3F7E29725CB8A68E7302E54994EB2A3 /* TOCropViewController.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/TOCropViewController";
+				IBSC_MODULE = TOCropViewController;
+				INFOPLIST_FILE = "Target Support Files/TOCropViewController/ResourceBundle-TOCropViewControllerBundle-TOCropViewController-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				PRODUCT_NAME = TOCropViewControllerBundle;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				WRAPPER_EXTENSION = bundle;
+			};
+			name = Release;
+		};
 		4CC99295D4AA45CC2B9EB96ED2FFA081 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FA3A5C2D5A88648F25B555E464E3B9F2 /* WZLBadge.xcconfig */;
@@ -3379,22 +3381,6 @@
 			};
 			name = Debug;
 		};
-		8688B00F08C8DDC0ED5B6FE25A8AF9D0 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = D3F7E29725CB8A68E7302E54994EB2A3 /* TOCropViewController.xcconfig */;
-			buildSettings = {
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/TOCropViewController";
-				INFOPLIST_FILE = "Target Support Files/TOCropViewController/ResourceBundle-TOCropViewControllerBundle-TOCropViewController-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				PRODUCT_NAME = TOCropViewControllerBundle;
-				SDKROOT = iphoneos;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = bundle;
-			};
-			name = Debug;
-		};
 		89110C71E30861DE7C98C6451FECF6BA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9D0145A0CC18135B158512C14A831866 /* M80AttributedLabel.xcconfig */;
@@ -3533,6 +3519,23 @@
 			};
 			name = Release;
 		};
+		BC6BD69A4B9834B24ACD90CCDC3C7FC8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = D3F7E29725CB8A68E7302E54994EB2A3 /* TOCropViewController.xcconfig */;
+			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/TOCropViewController";
+				IBSC_MODULE = TOCropViewController;
+				INFOPLIST_FILE = "Target Support Files/TOCropViewController/ResourceBundle-TOCropViewControllerBundle-TOCropViewController-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				PRODUCT_NAME = TOCropViewControllerBundle;
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				WRAPPER_EXTENSION = bundle;
+			};
+			name = Debug;
+		};
 		D5DB558C6D1BEC12A3B67A969F2DF3D9 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E932F5674BAC704B583ED374451ACBA9 /* MJRefresh.xcconfig */;
@@ -3730,8 +3733,8 @@
 		640AF155262AEE8AAACB0FA4068E1519 /* Build configuration list for PBXNativeTarget "TOCropViewController-TOCropViewControllerBundle" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				8688B00F08C8DDC0ED5B6FE25A8AF9D0 /* Debug */,
-				4900000C36A9C6EDAAF025AFC7AB995C /* Release */,
+				BC6BD69A4B9834B24ACD90CCDC3C7FC8 /* Debug */,
+				4CB62E0E366D8E3AE305F77430958B9C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

+ 1 - 0
Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/AFNetworking
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/BRPickerView/BRPickerView.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/BRPickerView
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/IQKeyboardManager
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/M80AttributedLabel/M80AttributedLabel.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/M80AttributedLabel
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/MBProgressHUD
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/MJExtension/MJExtension.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/MJExtension
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/MJRefresh/MJRefresh.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/MJRefresh
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/NIMSDK/NIMSDK.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/NIMSDK
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/Pods-model/Pods-model.debug.xcconfig

@@ -7,3 +7,4 @@ PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/Pods-model/Pods-model.release.xcconfig

@@ -7,3 +7,4 @@ PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/SDWebImage
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/TOCropViewController/TOCropViewController.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/TOCropViewController
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/TTGTagCollectionView/TTGTagCollectionView.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/TTGTagCollectionView
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/Toast/Toast.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Toast
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/UICollectionViewLeftAlignedLayout/UICollectionViewLeftAlignedLayout.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/UICollectionViewLeftAlignedLayout
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/UMCCommon/UMCCommon.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/UMCCommon
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/UMCPush/UMCPush.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/UMCPush
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/UMCSecurityPlugins/UMCSecurityPlugins.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/UMCSecurityPlugins
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/WZLBadge/WZLBadge.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/WZLBadge
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 1 - 0
Pods/Target Support Files/WechatOpenSDK/WechatOpenSDK.xcconfig

@@ -7,3 +7,4 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/WechatOpenSDK
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
+USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 4 - 0
model.xcodeproj/project.pbxproj

@@ -3716,12 +3716,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 99T6ZUAFCD;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/model/Classes/Application/ModelPrefix.pch";
 				INFOPLIST_FILE = model/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chmo.model;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -3739,12 +3741,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 99T6ZUAFCD;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SRCROOT)/model/Classes/Application/ModelPrefix.pch";
 				INFOPLIST_FILE = model/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.0.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.chmo.model;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

+ 1 - 0
model/Classes/Controllers/Controller/MessageVC/NTESNetChatViewController.m

@@ -61,6 +61,7 @@
         self.peerUid = callee;
         self.callInfo.callee = callee;
         self.callInfo.caller = [[NIMSDK sharedSDK].loginManager currentAccount];
+        self.modalPresentationStyle = UIModalPresentationFullScreen;
     }
     return self;
 }

+ 2 - 0
model/Classes/Controllers/Controller/MessageVC/NTESVideoChatViewController.m

@@ -51,6 +51,7 @@
         self.callInfo.isMute = NO;
         self.callInfo.useSpeaker = NO;
         self.callInfo.disableCammera = NO;
+        self.modalPresentationStyle = UIModalPresentationFullScreen;
         if (!self.localPreView) {
             //没有的话,尝试去取一把预览层(从视频切到语音再切回来的情况下是会有的)
             self.localPreView = [NIMAVChatSDK sharedSDK].netCallManager.localPreview;
@@ -64,6 +65,7 @@
 - (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil{
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
+        self.modalPresentationStyle = UIModalPresentationFullScreen;
         self.callInfo.callType = NIMNetCallTypeVideo;
         _cameraType = [[NTESBundleSetting sharedConfig] startWithBackCamera] ? NIMNetCallCameraBack :NIMNetCallCameraFront;
     }

+ 3 - 3
model/Classes/Public/RegisterViewController.m

@@ -233,7 +233,7 @@
 
     NSString *content = [NSString stringWithFormat:@"【千模科技】验证码%@,快注册,你的人生即将开挂,更快挣钱,更多代言和影视表演机会都在千模。非本人操作,请勿理会。", randomCode];
 
-    NSString *str = [NSString stringWithFormat:@"http://sdk.entinfo.cn:8061/mdsmssend.ashx?sn=%@&pwd=%@&mobile=%@&content=%@&ext=&stime=&rrid=&msgfmt=", sn, Md5Pwd, phoneNum, content];
+    NSString *str = [NSString stringWithFormat:@"%@/model?action=sendsms&phone=%@&code=%@", PublicUrl, phoneNum, randomCode];
 //    NSString *str = @"";
     NSLog(@"str=%@", str);
 //    NSURL *url = [NSURL URLWithString:@"http://222.73.161.212/ispace2/servlet/com.lemon.xml.XmlAction"];
@@ -256,11 +256,11 @@
 
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager GET:[str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]
+    [manager GET:str
       parameters:nil
          success:^(NSURLSessionDataTask *task, id responseObject) {
              NSString *result = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
-             isRight = [result containsString:@"-"];
+             isRight = [result containsString:@"success"];
              NSLog(@"%@", result);
          }
          failure:^(NSURLSessionDataTask *task, NSError *error) {

+ 4 - 4
model/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.8</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
@@ -82,9 +82,9 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-    <key>UIUserInterfaceStyle</key>
-    <string>Light</string>
 </dict>
 </plist>