iOS Team / CNLiveMateCode · Commits

Commit f8c5bf048b1fe871e13ba26f82d890382539217e

Authored by liushiyu
2 parents 666ef5e9 f49dc69f

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

Inline Side-by-side
Showing 3 changed files with 10 additions and 4 deletions
metaCode.xcodeproj/project.pbxproj
  View file @f8c5bf0
@@ -1127,12 +1127,15 @@ @@ -1127,12 +1127,15 @@
1127 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; 1127 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1128 CLANG_ENABLE_MODULES = YES; 1128 CLANG_ENABLE_MODULES = YES;
1129 CODE_SIGN_STYLE = Automatic; 1129 CODE_SIGN_STYLE = Automatic;
1130 - CURRENT_PROJECT_VERSION = 1.0.0.23.09.19.10; 1130 + CURRENT_PROJECT_VERSION = 1.0.0.23.09.20.10;
1131 DEVELOPMENT_TEAM = 94X49GG3ZW; 1131 DEVELOPMENT_TEAM = 94X49GG3ZW;
1132 GENERATE_INFOPLIST_FILE = YES; 1132 GENERATE_INFOPLIST_FILE = YES;
1133 INFOPLIST_FILE = metaCode/Info.plist; 1133 INFOPLIST_FILE = metaCode/Info.plist;
1134 INFOPLIST_KEY_CFBundleDisplayName = "元码"; 1134 INFOPLIST_KEY_CFBundleDisplayName = "元码";
1135 INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能"; 1135 INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能";
  1136 + INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
  1137 + INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
  1138 + INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
1136 INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务"; 1139 INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务";
1137 INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; 1140 INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
1138 INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; 1141 INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
@@ -1168,12 +1171,15 @@ @@ -1168,12 +1171,15 @@
1168 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; 1171 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1169 CLANG_ENABLE_MODULES = YES; 1172 CLANG_ENABLE_MODULES = YES;
1170 CODE_SIGN_STYLE = Automatic; 1173 CODE_SIGN_STYLE = Automatic;
1171 - CURRENT_PROJECT_VERSION = 1.0.0.23.09.19.10; 1174 + CURRENT_PROJECT_VERSION = 1.0.0.23.09.20.10;
1172 DEVELOPMENT_TEAM = 94X49GG3ZW; 1175 DEVELOPMENT_TEAM = 94X49GG3ZW;
1173 GENERATE_INFOPLIST_FILE = YES; 1176 GENERATE_INFOPLIST_FILE = YES;
1174 INFOPLIST_FILE = metaCode/Info.plist; 1177 INFOPLIST_FILE = metaCode/Info.plist;
1175 INFOPLIST_KEY_CFBundleDisplayName = "元码"; 1178 INFOPLIST_KEY_CFBundleDisplayName = "元码";
1176 INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能"; 1179 INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能";
  1180 + INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
  1181 + INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
  1182 + INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
1177 INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务"; 1183 INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务";
1178 INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; 1184 INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
1179 INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; 1185 INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
  View file @f8c5bf0
@@ -486,7 +486,7 @@ class CNLiveMineViewModel: NSObject { @@ -486,7 +486,7 @@ class CNLiveMineViewModel: NSObject {
486 if (error == nil) { 486 if (error == nil) {
487 let resp = result as! NSDictionary 487 let resp = result as! NSDictionary
488 let errorCode = "\(resp["errorCode"] ?? "0")" 488 let errorCode = "\(resp["errorCode"] ?? "0")"
489 - if (errorCode == "0") { 489 + if (errorCode == "0" && (resp["data"] != nil)) {
490 let userInfoModel = dictionaryToModel(resp as! [String : Any], UpdateInfoModel.self,"data") as! UpdateInfoModel 490 let userInfoModel = dictionaryToModel(resp as! [String : Any], UpdateInfoModel.self,"data") as! UpdateInfoModel
491 let ver1 = "\(userInfoModel.version.split(separator: "_").last ?? "0")" 491 let ver1 = "\(userInfoModel.version.split(separator: "_").last ?? "0")"
492 let ver2 = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String 492 let ver2 = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
metaCode/Classes/Other/AppDelegate.swift
  View file @f8c5bf0
@@ -34,7 +34,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { @@ -34,7 +34,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
34 } 34 }
35 35
36 //设置APP环境 36 //设置APP环境
37 - CNLiveEnvironmentManager.shared.setupEnvironment(environment: .development) 37 + CNLiveEnvironmentManager.shared.setupEnvironment(environment: .production)
38 38
39 window = UIWindow.init(frame: UIScreen.main.bounds) 39 window = UIWindow.init(frame: UIScreen.main.bounds)
40 window?.backgroundColor = KVCBackgroupColor 40 window?.backgroundColor = KVCBackgroupColor