Merge branch 'davidhuang' into develop

* davidhuang:
  弹窗逻辑
  //  打包分支
  添加备注
  删除 注册用户 第一次登录时的逻辑
  港澳通行证识别 签发地
  1、删除不使用代码 2、几处代码优化

galaxy/galaxy/AppDelegate.swift

@@ -134,9 +134,7 @@ extension AppDelegate {
     private func thirdSetting() -> Void {
         //1.数据解析
 #if DEBUG
-        //TODO: for test hjl
         SmartConfig.debugMode = .none
-//        SmartConfig.openErrorAssert = false
 #elseif TESTENV
         SmartConfig.debugMode = .none
 #else

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

@@ -75,17 +75,12 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
         
         updateDefaultSearchKeyWord()
         
-        requestAppNewVersion()
-        
+        checkHomeAlertView()
         
         if needReloadDataFlag {
             needReloadDataFlag = false
             homePageVC.requestOrder()
         }
-        
-//        DispatchQueue.main.async {
-//            self.getAlertStatus()
-//        }
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -140,14 +135,11 @@ extension YHHomeHoldViewPageViewController {
             return
         }
         
-        
         princleVM.getPrincleStatus { success, error in
             if success {
                 guard let model = self.princleVM.alertStatusModel else {
                     return
                 }
-                
-                
                 if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
                     if vc.selectedIndex != 0 {
                         return
@@ -191,6 +183,9 @@ extension YHHomeHoldViewPageViewController {
                         }
                     }
                     view.show()
+                } else if model.type == 20 {
+                    //签约用户新人指引
+                    //TODO: 需要完善  for test hjl
                 }
             }
         }
@@ -212,35 +207,6 @@ extension YHHomeHoldViewPageViewController {
         getTotalUnreadMsgCount()
     }
     
-    func requestAppNewVersion() {
-        if YHConfigManager.shared.loadNewDataFlag == false {
-            YHConfigManager.shared.loadConfigData {
-                [weak self] in
-                guard let self = self else { return }
-                self.showNewVersionAlertView()
-            }
-        } else {
-            showNewVersionAlertView()
-        }
-    }
-    
-    func showNewVersionAlertView() {
-        let isNeedShowAlert =  YHAppVersionManager.shared.needShowAlertViewOfSuggestVersionUpdate()
-        if isNeedShowAlert {
-            if let configModel = YHConfigManager.shared.reqVM.configModel {
-                let alertView = YHFindAppNewVersionView.alertView(version: configModel.max_version)
-                let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
-                alertView.updateContentArray(arr)
-                alertView.show()
-                alertView.cancleBlock = {
-                    self.getAlertStatus()
-                }
-            }
-        } else {
-            self.getAlertStatus()
-        }
-    }
-    
     // 请求未读消息总数
     @objc func getTotalUnreadMsgCount() {
         if !YHLoginManager.shared.isLogin() {
@@ -436,3 +402,41 @@ extension YHHomeHoldViewPageViewController : UITabBarControllerDelegate {
         return true
     }
 }
+
+//MARK: 弹窗相关的逻辑
+private extension YHHomeHoldViewPageViewController {
+    // 1、强升级 弹窗 > 2、签约用户新人指引 > 3、原则批/正式批 弹窗 > 4、建议更新
+    
+    func checkHomeAlertView() {
+        requestAppNewVersion()
+    }
+    
+    func requestAppNewVersion() {
+        if YHConfigManager.shared.loadNewDataFlag == false {
+            YHConfigManager.shared.loadConfigData {
+                [weak self] in
+                guard let self = self else { return }
+                self.showNewVersionAlertView()
+            }
+        } else {
+            showNewVersionAlertView()
+        }
+    }
+    
+    func showNewVersionAlertView() {
+        let isNeedShowAlert =  YHAppVersionManager.shared.needShowAlertViewOfSuggestVersionUpdate()
+        if isNeedShowAlert {
+            if let configModel = YHConfigManager.shared.reqVM.configModel {
+                let alertView = YHFindAppNewVersionView.alertView(version: configModel.max_version)
+                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(客服段)/PrincipleBatch(原则批)/M/YHPrincipleWaitResultModel.swift

@@ -19,7 +19,7 @@ enum YHPrincipleWaitItemType: Int {
 
 // MARK: - Applicant
 class YHPrincipleAlertStatusModel: SmartCodable {
-    var type: Int = 0 //1-展示正式批已获批弹窗 2-展示原则批已获批弹窗 0-不展示
+    var type: Int = 0 //1-展示正式批已获批弹窗 2-展示原则批已获批弹窗 0-不展示 20-首页展示签约新人指引
     var date: Int = 0 //正式批获批时间
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift

@@ -124,8 +124,8 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
         if model.end_of_term.count != 0 {
             mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term
         }
-        if model.issuing_authority.count != 0 {
-            mainModel.certificates.hkMacaoPass.issueAt = model.issuing_authority
+        if model.IssueAddress.count != 0 {
+            mainModel.certificates.hkMacaoPass.issueAt = model.IssueAddress
         }
         if model.card_num.count != 0 {
             mainModel.certificates.hkMacaoPass.number = model.card_num

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -362,8 +362,8 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
         if model.end_of_term.count != 0 {
             mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term
         }
-        if model.issuing_authority.count != 0 {
-            mainModel.certificates.hk_macao_pass.issue_at = model.issuing_authority
+        if model.IssueAddress.count != 0 {
+            mainModel.certificates.hk_macao_pass.issue_at = model.IssueAddress
         }
         if model.card_num.count != 0 {
             mainModel.certificates.hk_macao_pass.number = model.card_num

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceOrderSearchViewModel.swift

@@ -63,7 +63,6 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
         }
     }
     
-    //TODO: for test hjl
     func getAssistList(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.assist
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift

@@ -32,8 +32,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     //是否曾今有过网络
     private var isNetWorkOkBefore : Bool = false
     
-    //是否需要重新刷新界面
-    var isNeedRefreshDataFlag : Bool = false
+    
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -50,18 +49,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
         NotificationCenter.default.removeObserver(self)
     }
     
-    //是否通屏展示- 默认通屏(导航栏透明)
-    var isFullScreenFlag : Bool = true
     
-    //右上角分享按钮
-    var isShowRightShareItemFlag : Bool = false
     
-    //底部分享view
-    var isWithBottomViewFlag : Bool = false
-    lazy var shareView: YHShareViewOnTablebarView = {
-        let view = YHShareViewOnTablebarView()
-        return view
-    }()
+   
     
     //分享到H5或者小程序
     var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5
@@ -80,6 +70,25 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
         let vm = YHHomePageViewModel()
         return vm
     }()
+    
+
+    //UI元素的控制变量 如下
+    
+    //1、底部分享view
+    var isWithBottomViewFlag : Bool = false
+    lazy var shareView: YHShareViewOnTablebarView = {
+        let view = YHShareViewOnTablebarView()
+        return view
+    }()
+    
+    //2、是否通屏展示- 默认通屏(导航栏透明)
+    var isFullScreenFlag : Bool = true
+    
+    //3、右上角分享按钮
+    var isShowRightShareItemFlag : Bool = false
+    
+    //4、是否需要重新刷新界面
+    var isNeedRefreshDataFlag : Bool = false
 }
 
 // MARK: - 内部方法
@@ -120,23 +129,25 @@ private extension YHH5WebViewVC {
         if isWithBottomViewFlag {
             loadQrInfo()
             view.addSubview(shareView)
-        }
-        
-        
-        shareView.block = { tag in
-            if tag == 0 {
-                //分享
-                self.share()
-            } else {
-                //预约咨询
-                if self.arrQrInfo.count > 1 {
-                    let codeUrl = self.arrQrInfo[0]
-                    let downloadUrl = self.arrQrInfo[1]
-                    YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+            
+            shareView.block = { tag in
+                if tag == 0 {
+                    //分享
+                    self.share()
+                } else {
+                    //预约咨询
+                    if self.arrQrInfo.count > 1 {
+                        let codeUrl = self.arrQrInfo[0]
+                        let downloadUrl = self.arrQrInfo[1]
+                        YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+                    }
                 }
             }
         }
         
+        
+        
+        
         // 创建wkwebview
         webview = DWKWebView(frame: .zero)
         webview.scrollView.contentInsetAdjustmentBehavior = .never

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssViewController.swift

@@ -96,8 +96,16 @@ class YHCodeSueecssViewController: YHBaseViewController {
                 guard let self = self else { return }
                 
                 if let phone = self.phoneNumber {
+                    
                     // 登录接口需要加一个deviceToken参数
                     YHHUD.show(.progress(message: "登录中..."))
+                    if phone.contains("15818743775") {
+                        //审核账号
+                        YHHUD.hide()
+                        self.requestLogin(phone: phone, code: code)
+                        return
+                    }
+                    
                     if YHLoginManager.shared.deviceTokenModel.registerId.isEmpty {
                         JPUSHService.registrationIDCompletionHandler {
                             resCode, registrationID in
@@ -168,14 +176,19 @@ class YHCodeSueecssViewController: YHBaseViewController {
                 } else {
                     YHLoginManager.shared.loginSuccessActionBlock?()
                     YHHUD.flash(message: "登录成功")
-                    if YHLoginManager.shared.userModel?.is_first_login == 1 {
-                        let vc = YHUserInfoSettingViewController()
-                        vc.modalPresentationStyle = .fullScreen
-                        self.navigationController?.pushViewController(vc)
-                    } else {
-                        TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
-                        self.dismiss(animated: true)
-                    }
+                    
+                    //20240927版本 登录时 不需要 特殊处理注册用户 by Cecilia曾欢宝
+//                    if YHLoginManager.shared.userModel?.is_first_login == 1 {
+//                        let vc = YHUserInfoSettingViewController()
+//                        vc.modalPresentationStyle = .fullScreen
+//                        self.navigationController?.pushViewController(vc)
+//                    } else {
+//                        TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
+//                        self.dismiss(animated: true)
+//                    }
+                    
+                    TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
+                    self.dismiss(animated: true)
                 }
             })
         }