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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  H5
  涉及到七鱼的回调增加跳主线程，再加上两处
  添加一处异步主线程调用来跳页面解决可能的崩溃
  解决产品要求的特殊场景
  //  家庭信息

galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift

@@ -112,7 +112,9 @@ class YHButlerServiceManager: NSObject {
             self?.customUIConfig?.customerHeadImageUrl = avatar
             self?.customUIConfig?.showServiceNickName = true
             self?.updateUserInfo(userId: userId, userData: dataString ?? "", completion: { success in
-                gotoSessionVC()
+                DispatchQueue.main.async {
+                    gotoSessionVC()
+                }
             })
         }
     }
@@ -209,10 +211,13 @@ extension YHButlerServiceManager {
         return components[0] == 17
     }
     
-    @objc private func sessionGoBack() {
-        curentPresentedVC?.dismiss(animated: true)
+    @objc func sessionGoBack() {
+        guard let curentPresentedVC = curentPresentedVC else {
+            return
+        }
+        curentPresentedVC.dismiss(animated: true)
         printLog("$$$$sessionGoBack")
-        curentPresentedVC = nil
+        self.curentPresentedVC = nil
     }
     
     @objc private func didRevUatParam() {
@@ -221,7 +226,10 @@ extension YHButlerServiceManager {
         }
         initSDKAccountAndLastMessage { _ in
             // 为了更新状态
-            NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
+            DispatchQueue.main.async {
+                NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
+            }
+            
         }
     }
     
@@ -231,7 +239,9 @@ extension YHButlerServiceManager {
         }
         initSDKAccountAndLastMessage { _ in
             // 为了更新状态
-            NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
+            DispatchQueue.main.async {
+                NotificationCenter.default.post(name: YhConstant.YhNotification.didQiYuUnReadMsgCountChangeNotification, object: nil)
+            }
         }
     }
     

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -135,10 +135,7 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-                var token = ""
-                if let myToken = YHLoginManager.shared.userModel?.token {
-                    token = myToken
-                }
+                let token = YHLoginManager.shared.h5Token
                 var url = model.skip_url + "?param=" + token
                 let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
                 if urlHasParam {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -216,6 +216,10 @@ extension YHServiceOrderListView {
             if self.arrDataForSeviceCenterProgress.count == 0 {
                 self.homeTableView.tableFooterView = footView
                 self.homeTableView.reloadData()
+                if state == 3 && (type == 0 || type == 2) {
+                    self.homeTableView.tableFooterView = UIView()
+                    self.homeTableView.reloadData()
+                }
             } else {
                 self.homeTableView.tableFooterView = UIView()
                 self.homeTableView.reloadData()
@@ -299,7 +303,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
     }
 
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        if state == 3 && (type == 0 || type == 2) && self.arrDataForSeviceCenterProgress.count != 0 {
+        if state == 3 && (type == 0 || type == 2) {
             return 104
         } else {
             return kMargin
@@ -307,7 +311,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        if state == 3 && (type == 0 || type == 2) && self.arrDataForSeviceCenterProgress.count != 0  {
+        if state == 3 && (type == 0 || type == 2) {
             let view = YHServiceStepThreeSectionView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 104))
             view.block = { [weak self] tag in
                 guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoConfirmViewController.swift

@@ -93,9 +93,17 @@ class YHFamilyInfoConfirmViewController: YHBaseViewController {
             [weak self] success, error in
             guard let self = self else { return }
             if success {
-                YHHUD.flash(message: "确认修改成功")
-                self.navigationController?.popViewController()
-                YHFamilyInfoWarmTipsView.tipsView().show()
+                self.navigationController?.popToRootViewController(animated: false)
+                YHButlerServiceManager.shared.sessionGoBack()
+                goTabBarBy(tabType: .service)
+                let tipsKey = "family_info_confirm_warm_tips_\(self.orderId)"
+                if let isShow = UserDefaults.standard.value(forKey: tipsKey) as? Bool, isShow {
+                    
+                } else {
+                    YHFamilyInfoWarmTipsView.tipsView().show()
+                    UserDefaults.standard.set(true, forKey: tipsKey)
+                    UserDefaults.standard.synchronize()
+                }
                 return
             }
             let msg = error?.errorMsg ?? "确认修改失败"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift

@@ -123,10 +123,7 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-                var token = ""
-                if let myToken = YHLoginManager.shared.userModel?.token {
-                    token = myToken
-                }
+                let token = YHLoginManager.shared.h5Token
                 var url = model.skip_url + "?param=" + token
                 let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
                 if urlHasParam {