Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -4314,7 +4314,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4455,7 +4455,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4659,7 +4659,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4705,7 +4705,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift

@@ -116,7 +116,6 @@ extension YHActivityTravelViewController {
                 if let nav = self.navigationController {
                     let rrr = nav.viewControllers.contains { $0.isKind(of: YHCommunityViewController.self) }
                     if rrr {
-                        
                         var  targetVc : UIViewController?
                         for(_,value) in nav.viewControllers.enumerated() {
                             if value.isKind(of: YHCommunityViewController.self) {
@@ -131,11 +130,9 @@ extension YHActivityTravelViewController {
                         return
                     }
                 }
-                
             }
         }
        
-       
     }
     
     

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift

@@ -83,9 +83,9 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
             homePageVC.requestOrder()
         }
         
-        DispatchQueue.main.async {
-            self.getAlertStatus()
-        }
+//        DispatchQueue.main.async {
+//            self.getAlertStatus()
+//        }
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -148,6 +148,27 @@ extension YHHomeHoldViewPageViewController {
                     return
                 }
                 
+                
+                if let nav = self.navigationController {
+                    let rrr = nav.viewControllers.contains { $0.isKind(of: YHHomeHoldViewPageViewController.self) }
+                    if rrr {
+                        var  targetVc : UIViewController?
+                        for(_,value) in nav.viewControllers.enumerated() {
+                            if value.isKind(of: YHHomeHoldViewPageViewController.self) {
+                                targetVc = value
+                                break
+                            }
+                        }
+                        
+                        if targetVc != nil {
+                            
+                        } else {
+                            printLog("不在首页了。。。进行后面的逻辑")
+                            return
+                        }
+                    }
+                }
+                
                 if model.type == 1 {
                     //正式弹窗
                     self.princleVM.postAlertStatus(15) { success, error in
@@ -226,7 +247,12 @@ extension YHHomeHoldViewPageViewController {
                 let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
                 alertView.updateContentArray(arr)
                 alertView.show()
+                alertView.cancleBlock = {
+                    self.getAlertStatus()
+                }
             }
+        } else {
+            self.getAlertStatus()
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/C/YHOfficialApprovalResultVC.swift

@@ -159,14 +159,7 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-        
         getApprovalLetter()
-        
-//        if !isFromHomeAlertViewFlag {
-////            getAlertStatus()
-//        }
-        
-//        getOfficalGuildCheckStatus()
     }
 }
 
@@ -193,8 +186,6 @@ private extension YHOfficialApprovalResultVC {
                     
                     //2、更新letter信息
                     self.updateLetterListInfo()
-                    
-                    
                     self.getOfficalGuildCheckStatus()
                     
                 } else {
@@ -223,10 +214,7 @@ private extension YHOfficialApprovalResultVC {
                     self.clickRightItemBtn()
                 } else {
                     if !self.princleVM.isOfficialGuildCheckFlag {
-                        
-                        
-                        self.princleVM.postAlertStatus(15) { success, error in
-                        }
+                        self.princleVM.postAlertStatus(15) { success, error in}//首页 不再展示正式批 弹窗
                         
                         let view = YHOffivialApprovalSuccessCheckView.sheetView()
                         view.days = self.princleVM.lettersModel?.days ?? 0
@@ -243,29 +231,6 @@ private extension YHOfficialApprovalResultVC {
         }
     }
     
-    //获取原则批、正式批的弹窗状态
-    func getAlertStatus() {
-        princleVM.getPrincleStatus { success, error in
-            if success {
-                guard let model = self.princleVM.alertStatusModel else {
-                    return
-                }
-                
-                if model.type == 1 {                    
-                    let view = YHOffivialApprovalSuccessCheckView.sheetView()
-                    view.days = model.date
-                    view.show()
-                    
-                    view.block = { tag in
-                        if tag == 0 {
-                            self.clickRightItemBtn()
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
     func setupUI() {
         
         gk_navBarAlpha = 0.0
@@ -402,16 +367,13 @@ private extension YHOfficialApprovalResultVC {
         view.block = {
             //点击了 正式批 操作指引
             if !self.princleVM.isOfficialGuildCheckFlag {
-                
-                self.postAlertStatus(6)
-                
                 self.princleVM.postAlertStatus(2) { success, error in
                     if success {
                         
                     } else {
                         
                     }
-                    self.getOfficalGuildCheckStatus()
+                    self.princleVM.isOfficialGuildCheckFlag = true
                 }
             }
         }

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHFindAppNewVersionView.swift

@@ -65,6 +65,10 @@ class YHUpdateContentItemView: UIView {
 
 class YHFindAppNewVersionView: UIView {
     
+    
+    typealias Block = () -> ()
+    var cancleBlock: Block?
+    
     // 底层蒙版
     lazy var blackMaskView: UIView = {
         let view = UIView()
@@ -278,6 +282,7 @@ class YHFindAppNewVersionView: UIView {
     
     @objc func didCloseBtnClicked() {
         YHAppVersionManager.shared.saveShowLatestUpdateVersion()
+        self.cancleBlock?()
         dismiss()
     }