Commit 9ac40b095d4c14604c5164935cedff4a7750081b
1 parent
0117f66f
证件照 , 接口加loading
Showing
6 changed files
with
52 additions
and
51 deletions
metaCode.xcodeproj/project.pbxproj
| ... | ... | @@ -8,7 +8,6 @@ |
| 8 | 8 | |
| 9 | 9 | /* Begin PBXBuildFile section */ |
| 10 | 10 | 0D39E93D7229931C86EB1161 /* Pods_metaCode_metaCodeUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */; }; |
| 11 | - 197344152AB7EBA1001CBEE2 /* TempController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 197344142AB7EBA1001CBEE2 /* TempController.swift */; }; | |
| 12 | 11 | 19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */; }; |
| 13 | 12 | 1DD2808DF02C120276F99F4D /* Pods_metaCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1C55A719CFEE073C06D37CE /* Pods_metaCode.framework */; }; |
| 14 | 13 | 7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7905BB482AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift */; }; |
| ... | ... | @@ -113,7 +112,6 @@ |
| 113 | 112 | /* Begin PBXFileReference section */ |
| 114 | 113 | 0EC910AB9EBD717B04432BC4 /* Pods-metaCode-metaCodeUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode-metaCodeUITests.debug.xcconfig"; path = "Target Support Files/Pods-metaCode-metaCodeUITests/Pods-metaCode-metaCodeUITests.debug.xcconfig"; sourceTree = "<group>"; }; |
| 115 | 114 | 170BC5D0622EA2969D110A3B /* Pods-metaCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode.release.xcconfig"; path = "Target Support Files/Pods-metaCode/Pods-metaCode.release.xcconfig"; sourceTree = "<group>"; }; |
| 116 | - 197344142AB7EBA1001CBEE2 /* TempController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TempController.swift; sourceTree = "<group>"; }; | |
| 117 | 115 | 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIDCardView.swift; sourceTree = "<group>"; }; |
| 118 | 116 | 54E09C540E13D78166D71395 /* Pods_metaCodeTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCodeTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; |
| 119 | 117 | 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCode_metaCodeUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; |
| ... | ... | @@ -549,7 +547,6 @@ |
| 549 | 547 | isa = PBXGroup; |
| 550 | 548 | children = ( |
| 551 | 549 | 7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */, |
| 552 | - 197344142AB7EBA1001CBEE2 /* TempController.swift */, | |
| 553 | 550 | ); |
| 554 | 551 | name = Controller; |
| 555 | 552 | path = HomePage/Controller; |
| ... | ... | @@ -890,7 +887,6 @@ |
| 890 | 887 | 793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */, |
| 891 | 888 | 7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */, |
| 892 | 889 | 79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */, |
| 893 | - 197344152AB7EBA1001CBEE2 /* TempController.swift in Sources */, | |
| 894 | 890 | 7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */, |
| 895 | 891 | 7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */, |
| 896 | 892 | 7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */, |
| ... | ... | @@ -1115,22 +1111,26 @@ |
| 1115 | 1111 | ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; |
| 1116 | 1112 | CLANG_ENABLE_MODULES = YES; |
| 1117 | 1113 | CODE_SIGN_STYLE = Automatic; |
| 1118 | - CURRENT_PROJECT_VERSION = 1.0; | |
| 1114 | + CURRENT_PROJECT_VERSION = 1.0.0.23.09.19.10; | |
| 1119 | 1115 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 1120 | 1116 | GENERATE_INFOPLIST_FILE = YES; |
| 1121 | 1117 | INFOPLIST_FILE = metaCode/Info.plist; |
| 1122 | 1118 | INFOPLIST_KEY_CFBundleDisplayName = "元码"; |
| 1119 | + INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能"; | |
| 1120 | + INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务"; | |
| 1121 | + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; | |
| 1122 | + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; | |
| 1123 | 1123 | INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; |
| 1124 | 1124 | INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; |
| 1125 | 1125 | INFOPLIST_KEY_UIMainStoryboardFile = Main; |
| 1126 | - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; | |
| 1127 | - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; | |
| 1126 | + INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; | |
| 1127 | + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; | |
| 1128 | 1128 | IPHONEOS_DEPLOYMENT_TARGET = 11.0; |
| 1129 | 1129 | LD_RUNPATH_SEARCH_PATHS = ( |
| 1130 | 1130 | "$(inherited)", |
| 1131 | 1131 | "@executable_path/Frameworks", |
| 1132 | 1132 | ); |
| 1133 | - MARKETING_VERSION = 1.0; | |
| 1133 | + MARKETING_VERSION = 1.0.0; | |
| 1134 | 1134 | PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug; |
| 1135 | 1135 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 1136 | 1136 | SWIFT_EMIT_LOC_STRINGS = YES; |
| ... | ... | @@ -1149,22 +1149,26 @@ |
| 1149 | 1149 | ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; |
| 1150 | 1150 | CLANG_ENABLE_MODULES = YES; |
| 1151 | 1151 | CODE_SIGN_STYLE = Automatic; |
| 1152 | - CURRENT_PROJECT_VERSION = 1.0; | |
| 1152 | + CURRENT_PROJECT_VERSION = 1.0.0.23.09.19.10; | |
| 1153 | 1153 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 1154 | 1154 | GENERATE_INFOPLIST_FILE = YES; |
| 1155 | 1155 | INFOPLIST_FILE = metaCode/Info.plist; |
| 1156 | 1156 | INFOPLIST_KEY_CFBundleDisplayName = "元码"; |
| 1157 | + INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能"; | |
| 1158 | + INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务"; | |
| 1159 | + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; | |
| 1160 | + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片"; | |
| 1157 | 1161 | INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; |
| 1158 | 1162 | INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard; |
| 1159 | 1163 | INFOPLIST_KEY_UIMainStoryboardFile = Main; |
| 1160 | - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; | |
| 1161 | - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; | |
| 1164 | + INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; | |
| 1165 | + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; | |
| 1162 | 1166 | IPHONEOS_DEPLOYMENT_TARGET = 11.0; |
| 1163 | 1167 | LD_RUNPATH_SEARCH_PATHS = ( |
| 1164 | 1168 | "$(inherited)", |
| 1165 | 1169 | "@executable_path/Frameworks", |
| 1166 | 1170 | ); |
| 1167 | - MARKETING_VERSION = 1.0; | |
| 1171 | + MARKETING_VERSION = 1.0.0; | |
| 1168 | 1172 | PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug; |
| 1169 | 1173 | PRODUCT_NAME = "$(TARGET_NAME)"; |
| 1170 | 1174 | SWIFT_EMIT_LOC_STRINGS = YES; | ... | ... |
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
| ... | ... | @@ -186,13 +186,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel |
| 186 | 186 | |
| 187 | 187 | // self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight |
| 188 | 188 | |
| 189 | - | |
| 190 | 189 | } |
| 191 | 190 | override func viewWillAppear(_ animated: Bool) { |
| 192 | 191 | super.viewWillAppear(animated) |
| 193 | 192 | |
| 194 | 193 | print("uid = ",UserInfoManager.shared.userInfo.uid) |
| 195 | -// self.getUserIdentityApi() | |
| 196 | 194 | |
| 197 | 195 | } |
| 198 | 196 | override func viewDidAppear(_ animated: Bool) { |
| ... | ... | @@ -426,9 +424,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel |
| 426 | 424 | //MARK: - 网络请求获取身份列表 |
| 427 | 425 | func getUserIdentityApi() |
| 428 | 426 | { |
| 427 | + showLoading(message: "") | |
| 429 | 428 | CNLiveMineViewModel.requestAuthStandList(page: 1) |
| 430 | 429 | { result, respStatue in |
| 431 | 430 | |
| 431 | + hiddenLoading() | |
| 432 | 432 | if respStatue == .success{ |
| 433 | 433 | self.NetApiStatus = .success |
| 434 | 434 | let listArray:NSArray = (result as! StandListBaseModel).list as NSArray | ... | ... |
metaCode/Classes/Main/HomePage/Controller/TempController.swift deleted
100644 → 0
metaCode/Classes/Main/HomePage/View/CNIDCardView.swift
| ... | ... | @@ -58,7 +58,9 @@ class CNIDCardView: UIView{ |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | func loadIDDetailData(){ |
| 61 | + showLoading(message: "") | |
| 61 | 62 | CNLiveMineViewModel.requestsStandInfo(identityId: "\(_idModel!.id)", type: .havedate) { result, respStatue in |
| 63 | + hiddenLoading() | |
| 62 | 64 | if respStatue == .success { |
| 63 | 65 | let cardArray = result as! NSMutableArray |
| 64 | 66 | for i in (0..<cardArray.count){ | ... | ... |
metaCode/Classes/Other/AppDelegate.swift
| ... | ... | @@ -17,6 +17,28 @@ class AppDelegate: UIResponder, UIApplicationDelegate { |
| 17 | 17 | func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { |
| 18 | 18 | |
| 19 | 19 | // Override point for customization after application launch. |
| 20 | + CNLiveNetworking.networkStatus { status in | |
| 21 | + | |
| 22 | + if(status == .notReachable || status == .unknown){ | |
| 23 | + print("notReachable") | |
| 24 | + } | |
| 25 | + if status == .reachableViaWWAN { | |
| 26 | + print("reachableViaWWAN") | |
| 27 | + } | |
| 28 | + if status == .reachableViaWiFi { | |
| 29 | + print("reachableViaWiFi") | |
| 30 | + } | |
| 31 | + } | |
| 32 | +// if statue == .notReachable || statue == .unknown { | |
| 33 | +//// NSNotification(name: "network_statue", object: "") | |
| 34 | +// } | |
| 35 | +// if statue == .reachableViaWWAN { | |
| 36 | +// | |
| 37 | +// } | |
| 38 | +// if statue == .reachableViaWiFi { | |
| 39 | +// | |
| 40 | +// } | |
| 41 | +// } | |
| 20 | 42 | |
| 21 | 43 | //设置APP环境 |
| 22 | 44 | CNLiveEnvironmentManager.shared.setupEnvironment(environment: .development) | ... | ... |
metaCode/Info.plist
| ... | ... | @@ -4,31 +4,21 @@ |
| 4 | 4 | <dict> |
| 5 | 5 | <key>CFBundleAllowMixedLocalizations</key> |
| 6 | 6 | <true/> |
| 7 | - <key>UIApplicationSceneManifest</key> | |
| 7 | + <key>CFBundleLocalizations</key> | |
| 8 | + <array> | |
| 9 | + <string>zh</string> | |
| 10 | + </array> | |
| 11 | + <key>NSAppTransportSecurity</key> | |
| 8 | 12 | <dict> |
| 9 | - <key>UIApplicationSupportsMultipleScenes</key> | |
| 10 | - <false/> | |
| 13 | + <key>NSAllowsArbitraryLoads</key> | |
| 14 | + <true/> | |
| 11 | 15 | </dict> |
| 12 | - <key>NSPhotoLibraryAddUsageDescription</key> | |
| 13 | - <string>需要允许打开相册才能访问相册照片和保存照片</string> | |
| 14 | - <key>NSPhotoLibraryUsageDescription</key> | |
| 15 | - <string>需要允许打开相册才能访问相册照片和保存照片</string> | |
| 16 | - <key>NSCameraUsageDescription</key> | |
| 17 | - <string>需要允许开启相机才能使用录制视频和拍照功能</string> | |
| 18 | - <key>NSMicrophoneUsageDescription</key> | |
| 19 | - <string>需要允许开启麦克风才能使用录制视频和语音等服务</string> | |
| 20 | 16 | <key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key> |
| 21 | 17 | <true/> |
| 22 | - <key>NSAppTransportSecurity</key> | |
| 18 | + <key>UIApplicationSceneManifest</key> | |
| 23 | 19 | <dict> |
| 24 | - <key>NSAllowsArbitraryLoads</key> | |
| 25 | - <true/> | |
| 20 | + <key>UIApplicationSupportsMultipleScenes</key> | |
| 21 | + <false/> | |
| 26 | 22 | </dict> |
| 27 | - <key>CFBundleDevelopmentRegion</key> | |
| 28 | - <string>zh_CN</string> | |
| 29 | - <key>CFBundleLocalizations</key> | |
| 30 | - <array> | |
| 31 | - <string>zh</string> | |
| 32 | - </array> | |
| 33 | 23 | </dict> |
| 34 | 24 | </plist> | ... | ... |