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

liushiyu
2 parents 2c55aac9 753c5c4b
Showing 9 changed files with 55 additions and 26 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNHomePageGuideView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -1131,7 +1131,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.0.23.09.20.10;
+				CURRENT_PROJECT_VERSION = 1.0.0.23.09.25.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
@@ -1175,7 +1175,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.0.23.09.20.10;
+				CURRENT_PROJECT_VERSION = 1.0.0.23.09.25.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
@@ -13,6 +13,12 @@ import CNLiveRequestBastKit
 let Width: CGFloat  = UIScreen.main.bounds.size.width
 let Height: CGFloat = UIScreen.main.bounds.size.height
+///主窗口左右间距
+let LeftGap: CGFloat = UIScreen.main.bounds.size.width <= 375 ? 23 : 40
+
+///主窗口宽度
+let MainViewW: CGFloat = Width-LeftGap*2//Width-50
+
 ///存储是否第一次显示首页上滑引导
 let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideKey"
 ///存储是否第一次显示首页下滑引导
@@ -71,7 +77,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     ///无网.接口失败View
     lazy var notNetworkView: UIView = {
-        let W = Width-50
+        let W = MainViewW
         let H = W*1.5
         let notNetworkView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
         notNetworkView.backgroundColor = UIColor.white
@@ -207,7 +213,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         //提交身份审核后刷新
         NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
-        
+        //我的身份排序后刷新
+        NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
 //        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
@@ -335,15 +342,18 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }else{
                 //没有显示下滑引导
                 self.pageFlowView.scrollView.isScrollEnabled = false
-                self.view.addSubview(self.downSlideGuideView)
-                self.view.addSubview(self.downSlideGifView)
+                UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView)
+                UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView)
+//                self.tabBarController?.tabBar.isHidden = true
             }
         }else{
             //没显示过上滑引导
             self.pageFlowView.scrollView.isScrollEnabled = false
-            self.view.addSubview(self.upSlideGuideView)
-            self.view.addSubview(self.upSlideGifView)
+            
+            UIApplication.shared.keyWindow!.addSubview(self.upSlideGuideView)
+            UIApplication.shared.keyWindow!.addSubview(self.upSlideGifView)
+//            self.tabBarController?.tabBar.isHidden = true
         }
     }
@@ -368,7 +378,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         var bannerView:CNCustomIndexView? = flowView.dequeueReusableCell() as? CNCustomIndexView
         if (bannerView == nil) {
-            bannerView = CNCustomIndexView.init(frame: CGRectMake(0, 0, Width-50, Height))
+            bannerView = CNCustomIndexView.init(frame: CGRectMake(0, 0, MainViewW, Height))
             bannerView?.tag = index + 100
             bannerView?.layer.cornerRadius = 4
             bannerView?.layer.masksToBounds = false
@@ -384,7 +394,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     func sizeForPage(in flowView: NewPagedFlowView!) -> CGSize {
-        return CGSize(width: Width-50, height: Height)
+        return CGSize(width: MainViewW, height: Height)
     }
     ///NewPagedFlowView 开始滑动
@@ -436,7 +446,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         scrollView.isScrollEnabled = true
-        let toIndex:Int = Int(scrollView.contentOffset.x/(Width-50))
+        let toIndex:Int = Int(scrollView.contentOffset.x/(MainViewW))
         if toIndex == self.backgroupView.currentApearViewIndex{
             return
@@ -463,12 +473,12 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         //移除下滑引导
         if (self.downSlideGuideView.superview != nil) {
+            
             self.downSlideGuideView.removeFromSuperview()
             self.downSlideGifView.removeFromSuperview()
             UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
             self.pageFlowView.scrollView.isScrollEnabled = true
         }
-       
     }
     func customIndexViewDidScroll(scrollView: UIScrollView) {
@@ -502,8 +512,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                 print("不该进来")
             }else{
                 //没有显示下滑引导
-                self.view.addSubview(self.downSlideGuideView)
-                self.view.addSubview(self.downSlideGifView)
+                UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView)
+                UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView)
                 self.pageFlowView.scrollView.isScrollEnabled = false
             }
         }
@@ -118,8 +118,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         set{
             self.mainView.idModel = newValue!
             _idModel = newValue
-            self.upSlideView.url = _idModel?.upPath
-            self.downSlideView.url = _idModel?.downPath
+            self.upSlideView.url = _idModel?.downPath
+            self.downSlideView.url = _idModel?.upPath
             self.topNavView.setTitleString(title:(_idModel?.name)!)
         }
@@ -58,9 +58,9 @@ class CNHomePageGuideView: UIView{
         let path:UIBezierPath = UIBezierPath.init(rect: UIScreen.main.bounds)
         //rect 首页被镂空的区域
-        let W = KSreenWidth-50
+        let W = MainViewW
         let H = W*1.5
-        let rect = CGRectMake(25, KSreenHeight*0.16,W, H)
+        let rect = CGRectMake(LeftGap, KSreenHeight*0.16,W, H)
         let appendPath: UIBezierPath = UIBezierPath.init(roundedRect: rect, cornerRadius: 20)
         path.append(appendPath.reversing())
@@ -334,7 +334,7 @@ class CNMainView : UIView{
     }
-    // MARK: - <##><##>设置前置视图容器
+    // MARK: -设置前置视图容器
     func isHiddenMainFrontContentView(isHidden:Bool){
         self.frontView.frontTotolContentView.isHidden = isHidden
     }
@@ -89,7 +89,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         self.setupVeriCodeView()
         self.setupLoginButtonView()
-        LoginAuthInfoView.showAuthView()
+//        LoginAuthInfoView.showAuthView()
     }
     deinit {
@@ -7,12 +7,13 @@
 import Foundation
 import APButton
+import Photos
 enum ListShowType {
     case feedback
     case setting
     case privacy
-    case manager
+    case manager//系统权限管理
     case about
     case info
 }
@@ -50,9 +51,9 @@ class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDe
             dataArray.add(["icon":"","name":"个人信息保护政策"])
         }
         if _show_type == .manager {
-            dataArray.add(["icon":"mine_list_sub_set_poistion","name":"位置","desc":"用于判断您的所在位置"])
+//            dataArray.add(["icon":"mine_list_sub_set_poistion","name":"位置","desc":"用于判断您的所在位置"])
             dataArray.add(["icon":"mine_list_sub_set_photo","name":"相册","desc":"用于上传反馈问题截图等业务流程"])
-            dataArray.add(["icon":"mine_list_sub_set_note","name":"通知","desc":"用于及时接收消息用于账户安全等风险控制"])
+//            dataArray.add(["icon":"mine_list_sub_set_note","name":"通知","desc":"用于及时接收消息用于账户安全等风险控制"])
         }
         if _show_type == .about {
             dataArray.add(["icon":"","name":"版本更新","more":"当前已经是最新版本"])
@@ -284,6 +285,24 @@ extension CNLiveTypeFeedBackViewController {
                 self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy,is_login: false), animated: true)
             }
         }
+        if _show_type == .manager {
+            
+            // 已弹窗则直接跳转到系统设置;
+            //未弹窗 先弹窗再跳转系统设置
+            PHPhotoLibrary.requestAuthorization(
+            { (status) in
+                
+                DispatchQueue.main.async
+                {
+                    if let settingUrl = URL(string:UIApplication.openSettingsURLString)
+                    {
+                        if UIApplication.shared.canOpenURL(settingUrl){
+                            UIApplication.shared.open(settingUrl, options: [:], completionHandler: nil)
+                        }
+                    }
+                }
+            })
+        }
         if _show_type == .about {
             if indexPath.section == 0 {
                 print("跳转app商店")
@@ -148,8 +148,8 @@ final class StandListModel: BaseModel, TableCodable {
     var descBackgroundImg: String = ""//首页文字背景图
     var cardImg: String = ""//卡片背景图
     var cardBackgroundImg: String = ""//首页卡片背景图
-    var upPath: String = ""//上滑h5
-    var downPath: String = ""//下滑h5
+    var upPath: String = ""//顶部h5
+    var downPath: String = ""//底部h5
     var auth: Bool = false//身份是否验证
     var createTimeString: String = ""
@@ -322,7 +322,7 @@ class CNLiveMineViewModel: NSObject {
             if (error == nil) {
                 let resp = result as! NSDictionary
                 let errorCode = "\(resp["errorCode"] ?? "0")"
-                if (errorCode == "0" && resp["data"] is NSNull) {
+                if (errorCode == "0" && !(resp["data"] is NSNull)) {
                     let listModel = dictionaryToModel(resp as! [String : Any], MineAuthListBaseModel.self,"data") as! MineAuthListBaseModel
                     if page == 1 && listModel.list.count > 0 {
                         CNLiveSaveAuthDB.shared.insertObjects(objects: listModel.list)