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

# Conflicts: # metaCode/Classes/Other/AppDelegate.swift

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode/Classes/Other/AppDelegate.swift
liushiyu
2 parents 96d2f9e9 ed5026fa
Showing 7 changed files with 152 additions and 82 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Other/AppDelegate.swift
metaCode/Info.plist
@@ -1123,22 +1123,26 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0;
+				CURRENT_PROJECT_VERSION = 1.0.0.23.09.19.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "元码";
+				INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1157,22 +1161,26 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0;
+				CURRENT_PROJECT_VERSION = 1.0.0.23.09.19.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "元码";
+				INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用录制视频和拍照功能";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要允许开启麦克风才能使用录制视频和语音等服务";
+				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "需要允许打开相册才能访问相册照片和保存照片";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -184,15 +184,18 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.setupUI()
+        /// 通知名
+        let notificationName = "CNLiveNetworkStatusNotification"
+        /// 自定义通知
+        NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationAction), name: NSNotification.Name(rawValue: notificationName), object: nil)
+        
 //        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
-        
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         print("uid = ",UserInfoManager.shared.userInfo.uid)
-        self.getUserIdentityApi()
     }
     override func viewDidAppear(_ animated: Bool) {
@@ -201,7 +204,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.topNavView.isHidden = true
     }
-    
+
+    deinit {
+        /// 移除通知
+        NotificationCenter.default.removeObserver(self)
+    }
     // MARK: - 添加UI
     func setupUI(){
@@ -225,12 +232,26 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
-    // MARK: -按钮点击事件
+    // MARK: -事件
     //无网时刷新
     @objc func errorFreshButtonAction(){
         self.getUserIdentityApi()
     }
-    
+    /// 接受到通知后的方法回调
+    @objc private func networkStatusNotificationAction(noti: Notification) {
+        let netStatus:String = noti.object as! String
+        switch netStatus {
+//        case "notReachable"://暂时不处理
+            
+        case "reachableViaWWAN":
+            self.getUserIdentityApi()
+        case "reachableViaWiFi":
+            self.getUserIdentityApi()
+        default:
+            break
+        }
+    }
+
     // MARK: -添加约束
     func makeConstraints(){
         self.errorImgView.snp.makeConstraints { make in
@@ -426,9 +447,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     //MARK: - 网络请求获取身份列表
     func getUserIdentityApi()
     {
+        showLoading(message: "")
         CNLiveMineViewModel.requestAuthStandList(page: 1)
         { result, respStatue in
+            hiddenLoading()
             if respStatue == .success{
                 self.NetApiStatus = .success
                 let listArray:NSArray = (result as! StandListBaseModel).list as NSArray
@@ -53,24 +53,38 @@ class CNIDCardView: UIView{
         self.contentView.addSubview(self.sexValueLabel)
         self.contentView.addSubview(self.dateValueLabel)
         self.contentView.addSubview(self.IDValueLabel)
+        self.contentView.addSubview(self.iDIconImgView)
+        
     }
     func loadIDDetailData(){
+        showLoading(message: "")
         CNLiveMineViewModel.requestsStandInfo(identityId: "\(_idModel!.id)", type: .havedate) { result, respStatue in
+            hiddenLoading()
             if respStatue == .success {
                 let cardArray = result as! NSMutableArray
                 for i in (0..<cardArray.count){
                     let idCardModel = cardArray[i] as! MineStandInfoModel
                     switch idCardModel.name {
                     case "姓名":
-                        self.nameValueLabel.text = idCardModel.userInfo
+                        self.nameValueLabel.text =  idCardModel.userInfo
                     case "性别":
                         self.sexValueLabel.text = idCardModel.userInfo
                     case "认证时间":
                         self.dateValueLabel.text = idCardModel.userInfo
                     case "编号":
-                        self.IDValueLabel.text = idCardModel.userInfo
+                        self.IDValueLabel.text =  idCardModel.userInfo
+                    case "证件照":
+                        let str:String = idCardModel.userInfo!
+                        if(str.isEmpty){
+                            self.iDIconImgView.isHidden = true
+                        }else
+                        {
+                            self.iDIconImgView.isHidden = false
+                            self.iDIconImgView.kf.setImage(with: URL(string: str))
+                        }
+                        self.iDCardBGView.kf.setImage(with: URL(string: self._idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
                     default:
                         break
                     }
@@ -79,6 +93,59 @@ class CNIDCardView: UIView{
         }
     }
+    // MARK: - 约束
+    func makeConstraints(){
+        self.iDCardBGView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalToSuperview()
+            make.height.equalToSuperview()
+        }
+        //标签
+        self.nameLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.top.equalTo(60)
+            make.width.equalTo(54)
+        }
+        self.sexLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.top.equalTo(nameLabel.snp.bottom).offset(10)
+        }
+        self.dateLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.top.equalTo(sexLabel.snp.bottom).offset(10)
+        }
+        self.IDLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.top.equalTo(dateLabel.snp.bottom).offset(10)
+        }
+        //标签值
+        self.nameValueLabel.snp.makeConstraints { make in
+                make.left.equalTo(nameLabel.snp.right).offset(10)
+                make.top.equalTo(nameLabel.snp.top)
+                make.right.equalTo(iDIconImgView.snp.left).offset(-5)
+        }
+        self.sexValueLabel.snp.makeConstraints { make in
+            make.left.equalTo(nameLabel.snp.right).offset(10)
+            make.top.equalTo(sexLabel.snp.top)
+        }
+        self.dateValueLabel.snp.makeConstraints { make in
+            make.left.equalTo(nameLabel.snp.right).offset(10)
+            make.top.equalTo(dateLabel.snp.top)
+        }
+        self.IDValueLabel.snp.makeConstraints { make in
+            make.left.equalTo(nameLabel.snp.right).offset(10)
+            make.top.equalTo(IDLabel.snp.top)
+            make.right.lessThanOrEqualTo(iDIconImgView.snp.left).offset(-5)
+        }
+        self.iDIconImgView.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-15)
+            make.top.equalTo(nameLabel.snp.top)
+            make.width.equalTo(60)
+            make.height.equalTo(85)
+        }
+    }
+    
     // MARK: - 懒加载
     ///视图总容器
     lazy var contentView : UIView = {
@@ -184,48 +251,12 @@ class CNIDCardView: UIView{
         return IDValueLabel
     }()
-    // MARK: - 约束
-    func makeConstraints(){
-        self.iDCardBGView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview()
-            make.width.equalToSuperview()
-            make.height.equalToSuperview()
-        }
-        //标签
-        self.nameLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(20)
-            make.top.equalTo(60)
-        }
-        self.sexLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(20)
-            make.top.equalTo(nameLabel.snp.bottom).offset(10)
-        }
-        self.dateLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(20)
-            make.top.equalTo(sexLabel.snp.bottom).offset(10)
-        }
-        self.IDLabel.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(20)
-            make.top.equalTo(dateLabel.snp.bottom).offset(10)
-        }
-        //标签值
-        self.nameValueLabel.snp.makeConstraints { make in
-            make.left.equalTo(nameLabel.snp.right).offset(10)
-            make.top.equalTo(nameLabel.snp.top)
-        }
-        self.sexValueLabel.snp.makeConstraints { make in
-            make.left.equalTo(nameLabel.snp.right).offset(10)
-            make.top.equalTo(sexLabel.snp.top)
-        }
-        self.dateValueLabel.snp.makeConstraints { make in
-            make.left.equalTo(nameLabel.snp.right).offset(10)
-            make.top.equalTo(dateLabel.snp.top)
-        }
-        self.IDValueLabel.snp.makeConstraints { make in
-            make.left.equalTo(nameLabel.snp.right).offset(10)
-            make.top.equalTo(IDLabel.snp.top)
-        }
-    }
+    ///证件照
+    lazy var iDIconImgView:UIImageView = {
+
+        let iDIconImgView:UIImageView = UIImageView(frame: CGRect(x: 20, y: 25, width: 60, height: 85))
+        iDIconImgView.backgroundColor = UIColor.red
+        return iDIconImgView
+    }()
 }
@@ -153,7 +153,11 @@ class CNFrontMainView : UIView{
     @objc func addStandBtnAction() {
         //跳转到添加身份页面
-        currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: true)
+//        currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: false)
+        DispatchQueue.main.asyncAfter(deadline: .now()+0.25){
+            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: true)
+        }
+
     }
 }
@@ -254,7 +254,7 @@ class CNLiveMineViewModel: NSObject {
     ///   - resultBlock: 返回
     static func requestAuthStandList(page: NSInteger, resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
-        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")//10458139 UserInfoManager.shared.userInfo.uid
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "page")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
@@ -434,7 +434,7 @@ class CNLiveMineViewModel: NSObject {
     ///   - resultBlock: 返回
     static func requestsStandInfo(identityId: String, type: CNLiveMineGetWriteType, resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
-        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")//UserInfoManager.shared.userInfo.uid //10458139
         param.setValue(identityId, forKey: "identityId")
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
@@ -17,7 +17,21 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-
+        CNLiveNetworking.networkStatus { status in
+            
+            if(status == .notReachable || status == .unknown){
+                /// 发送简单数据
+                NotificationCenter.default.post(name: NSNotification.Name.init(rawValue: "CNLiveNetworkStatusNotification"), object: "notReachable")
+            }
+            if status == .reachableViaWWAN {
+                /// 发送简单数据
+                NotificationCenter.default.post(name: NSNotification.Name.init(rawValue: "CNLiveNetworkStatusNotification"), object: "reachableViaWWAN")
+            }
+            if status == .reachableViaWiFi {
+                /// 发送简单数据
+                NotificationCenter.default.post(name: NSNotification.Name.init(rawValue: "CNLiveNetworkStatusNotification"), object: "reachableViaWiFi")
+            }
+        }
         //设置APP环境
         CNLiveEnvironmentManager.shared.setupEnvironment(environment: .development)
@@ -4,31 +4,21 @@
 <dict>
 	<key>CFBundleAllowMixedLocalizations</key>
 	<true/>
-	<key>UIApplicationSceneManifest</key>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>zh</string>
+	</array>
+	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
 	</dict>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>需要允许打开相册才能访问相册照片和保存照片</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>需要允许打开相册才能访问相册照片和保存照片</string>
-	<key>NSCameraUsageDescription</key>
-	<string>需要允许开启相机才能使用录制视频和拍照功能</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>需要允许开启麦克风才能使用录制视频和语音等服务</string>
 	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
 	<true/>
-	<key>NSAppTransportSecurity</key>
+	<key>UIApplicationSceneManifest</key>
 	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
 	</dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>zh_CN</string>
-    <key>CFBundleLocalizations</key>
-    <array>
-        <string>zh</string>
-    </array>
 </dict>
 </plist>