iOS Team / CNLiveMateCode · Commits

Commit 666ef5e9483a71d5f726bb521690a0b9b4f5e920

Authored by liushiyu
2 parents 1bdeb6e1 5824b700

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

Inline Side-by-side
Showing 2 changed files with 15 additions and 9 deletions
metaCode.xcodeproj/project.pbxproj
  View file @666ef5e
@@ -1139,21 +1139,24 @@ @@ -1139,21 +1139,24 @@
1139 INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; 1139 INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
1140 INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; 1140 INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
1141 INFOPLIST_KEY_UIMainStoryboardFile = Main; 1141 INFOPLIST_KEY_UIMainStoryboardFile = Main;
  1142 + INFOPLIST_KEY_UIStatusBarStyle = "";
1142 INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; 1143 INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
1143 - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";  
1144 IPHONEOS_DEPLOYMENT_TARGET = 11.0; 1144 IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1145 LD_RUNPATH_SEARCH_PATHS = ( 1145 LD_RUNPATH_SEARCH_PATHS = (
1146 "$(inherited)", 1146 "$(inherited)",
1147 "@executable_path/Frameworks", 1147 "@executable_path/Frameworks",
1148 ); 1148 );
1149 MARKETING_VERSION = 1.0.0; 1149 MARKETING_VERSION = 1.0.0;
1150 - PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug; 1150 + PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
1151 PRODUCT_NAME = "$(TARGET_NAME)"; 1151 PRODUCT_NAME = "$(TARGET_NAME)";
  1152 + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
  1153 + SUPPORTS_MACCATALYST = NO;
  1154 + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1152 SWIFT_EMIT_LOC_STRINGS = YES; 1155 SWIFT_EMIT_LOC_STRINGS = YES;
1153 SWIFT_OBJC_BRIDGING_HEADER = "metaCode/Classes/Vendors/metaCode-Bridging-Header.h"; 1156 SWIFT_OBJC_BRIDGING_HEADER = "metaCode/Classes/Vendors/metaCode-Bridging-Header.h";
1154 SWIFT_OPTIMIZATION_LEVEL = "-Onone"; 1157 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1155 SWIFT_VERSION = 5.0; 1158 SWIFT_VERSION = 5.0;
1156 - TARGETED_DEVICE_FAMILY = "1,2"; 1159 + TARGETED_DEVICE_FAMILY = 1;
1157 }; 1160 };
1158 name = Debug; 1161 name = Debug;
1159 }; 1162 };
@@ -1177,20 +1180,23 @@ @@ -1177,20 +1180,23 @@
1177 INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; 1180 INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
1178 INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; 1181 INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
1179 INFOPLIST_KEY_UIMainStoryboardFile = Main; 1182 INFOPLIST_KEY_UIMainStoryboardFile = Main;
  1183 + INFOPLIST_KEY_UIStatusBarStyle = "";
1180 INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; 1184 INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
1181 - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";  
1182 IPHONEOS_DEPLOYMENT_TARGET = 11.0; 1185 IPHONEOS_DEPLOYMENT_TARGET = 11.0;
1183 LD_RUNPATH_SEARCH_PATHS = ( 1186 LD_RUNPATH_SEARCH_PATHS = (
1184 "$(inherited)", 1187 "$(inherited)",
1185 "@executable_path/Frameworks", 1188 "@executable_path/Frameworks",
1186 ); 1189 );
1187 MARKETING_VERSION = 1.0.0; 1190 MARKETING_VERSION = 1.0.0;
1188 - PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug; 1191 + PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
1189 PRODUCT_NAME = "$(TARGET_NAME)"; 1192 PRODUCT_NAME = "$(TARGET_NAME)";
  1193 + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
  1194 + SUPPORTS_MACCATALYST = NO;
  1195 + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1190 SWIFT_EMIT_LOC_STRINGS = YES; 1196 SWIFT_EMIT_LOC_STRINGS = YES;
1191 SWIFT_OBJC_BRIDGING_HEADER = "metaCode/Classes/Vendors/metaCode-Bridging-Header.h"; 1197 SWIFT_OBJC_BRIDGING_HEADER = "metaCode/Classes/Vendors/metaCode-Bridging-Header.h";
1192 SWIFT_VERSION = 5.0; 1198 SWIFT_VERSION = 5.0;
1193 - TARGETED_DEVICE_FAMILY = "1,2"; 1199 + TARGETED_DEVICE_FAMILY = 1;
1194 }; 1200 };
1195 name = Release; 1201 name = Release;
1196 }; 1202 };
metaCode/Classes/Main/HomePage/View/CNMainView.swift
  View file @666ef5e
@@ -153,9 +153,9 @@ class CNFrontMainView : UIView{ @@ -153,9 +153,9 @@ class CNFrontMainView : UIView{
153 @objc func addStandBtnAction() { 153 @objc func addStandBtnAction() {
154 //跳转到添加身份页面 154 //跳转到添加身份页面
155 // currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: false) 155 // currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: false)
156 - DispatchQueue.main.asyncAfter(deadline: .now()+0.25){  
157 - currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: true)  
158 - } 156 +// DispatchQueue.main.asyncAfter(deadline: .now()+0.25){
  157 + currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: false)
  158 +// }
159 159
160 } 160 }
161 } 161 }