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:
  // 登录登出显示用户名错误
  登录模块相关bug
  //  家庭成员
  // 学历

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -160,12 +160,9 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
         let item:YHFormItemProtocol = arr[indexPath.row]
 
         if item is YHFormTitleItem { // 是标题
-            
             let formItem = item as! YHFormTitleItem
-            
-            // 配偶父母子女兄妹title
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle())
+            cell.setTitleAndSubTitle(title:formItem.getTitle())
             return cell
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -23,28 +23,26 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
 
     var spouse:YHFamilyMember? {
         didSet {
-            initalInfoVC.spouse = spouse
-            certificateVC.familyMember = spouse
-            basicInfoVC.spouse = spouse
+            if let spouse = spouse {
+                initalInfoVC.spouse = spouse
+                certificateVC.familyMember = spouse
+                basicInfoVC.spouse = spouse
+            }
         }
     }
     
     var currentIndex = 0 {
         didSet {
-            currentIndex %= self.children.count
             stepView.currentIndex = currentIndex
             for (i, vc) in self.children.enumerated() {
                 vc.view.isHidden = (currentIndex != i)
-                if currentIndex == i {
-                    
-                }
             }
         }
     }
     
     var stepView:YHStepView = {
-        let step = YHStepView()
-        return step
+        let stepV = YHStepView()
+        return stepV
     }()
     
     var bottomView: YHSaveAndSubmitView = {
@@ -70,8 +68,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         basicInfoVC.delegate = self
         
         updateStepView()
-
-        currentIndex = 0
         
         view.addSubview(stepView)
         view.addSubview(bottomView)
@@ -102,7 +98,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     }
     
     func didClickSubmitBtn() {
-        currentIndex += 1;
         
     }
     
@@ -128,10 +123,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             self.view.addSubview(initalInfoVC.view)
             
             stepView.dataSource = ["初始信息".local, "证件上传".local, "证件信息".local, "基本信息".local]
-            stepView.block = {[weak self]  (index) in
-                guard let self = self else { return }
-                print("follow:%d", self.orderId)
-            }
             
         } else {
             self.addChild(initalInfoVC)
@@ -141,12 +132,19 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             self.view.addSubview(initalInfoVC.view)
             
             stepView.dataSource = ["初始信息".local, "基本信息".local]
-            stepView.block = {[weak self]  (index) in
-                guard let self = self else { return }
-                print("follow:%d", self.orderId)
+            
+        }
+        
+        print("step:\(spouse.step)")
+        currentIndex = spouse.step
 
-            }
+        stepView.block = {
+            [weak self] index in
+            guard let self = self else { return }
+            print("index:\(index)")
+            currentIndex = index
         }
+        
         self.view.bringSubviewToFront(stepView)
         self.view.bringSubviewToFront(bottomView)
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -163,7 +163,6 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         let arr:[YHFormItemProtocol] = items[indexPath.section]
         if indexPath.row >= arr.count {  return createDefaultCell(indexPath) }
         
-        
         let item:YHFormItemProtocol = arr[indexPath.row]
         
         if item is YHFormTitleItem { // 标题

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

@@ -21,7 +21,8 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
     var familyMemberInfo: YHFamilyMemberGroupInfo?
     var isChildsEditMode: YHFormTitleItemEditType = .none
     var isBrothersEditMode: YHFormTitleItemEditType = .none
-    
+    // 是否显示未填写错误提示
+    var isNeedShowError = false
     var items:[[YHFormItemProtocol]] = []
     
     lazy var tableView: UITableView = {
@@ -114,7 +115,48 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
     }
     
     @objc func didClickSubmitBtn() {
+        let isChecked = checkIntegrity()
+        isNeedShowError = !isChecked
+        
+        self.tableView .reloadData()
+        
+        if !isChecked {
+            YHHUD.flash(message: "资料还未填完")
+            return
+        }
+    }
+    
+    // 检查填写信息完整性
+    func checkIntegrity() -> Bool {
+        
+        if let sponse = familyMemberInfo?.spouse, sponse.notFillNum > 0 {
+          return false
+        }
+        
+        if let father = familyMemberInfo?.father, father.notFillNum > 0 {
+            return false
+        }
+            
+        if let mother = familyMemberInfo?.mother, mother.notFillNum > 0 {
+            return false
+        }
+        
+        if let childs = familyMemberInfo?.child, !childs.isEmpty {
+            for child in childs {
+                if child.notFillNum > 0 {
+                    return false
+                }
+            }
+        }
         
+        if let brothers = familyMemberInfo?.brother, !brothers.isEmpty {
+            for brother in brothers {
+                if brother.notFillNum > 0 {
+                    return false
+                }
+            }
+        }
+        return true
     }
     
     func loadFamilyMember() {
@@ -296,6 +338,8 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
             cell.title = detailItem.getTitle()
             cell.isShowBottomLine = indexPath.row != arr.count-1
+            cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNum > 0 ? .failColor : .labelTextColor2)
+
             if detailItem.notFillNum > 0 {
                 cell.detailLabel.text = String(format: "有%d项未填写".local, detailItem.notFillNum)
             } else {

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

@@ -40,7 +40,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
                 titleLabel.attributedText = questionAttrStr
                 
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }
@@ -167,7 +167,7 @@ class HKDegreeInfoItemView: UIView {
                 titleLabel.attributedText = questionAttrStr
                 
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

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

@@ -54,7 +54,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
                 
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

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

@@ -48,7 +48,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
                 }
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

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

@@ -30,7 +30,6 @@ class YHFormItemExpireDateCell: UITableViewCell {
 
     var title:String? {
         didSet {
-            
             if let title = title, !title.isEmpty {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
@@ -43,7 +42,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
                 }
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }
@@ -56,7 +55,6 @@ class YHFormItemExpireDateCell: UITableViewCell {
     
     var detail:String? {
         didSet {
-
             if let detail = detail, !detail.isEmpty {
                 detailLabel.text =  detail
                 detailLabel.textColor = detailColor

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

@@ -39,7 +39,7 @@ class YHFormItemInputTextCell: UITableViewCell {
                 }
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

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

@@ -40,7 +40,7 @@ class YHFormItemQuestionsCell: UITableViewCell {
                 
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

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

@@ -104,7 +104,7 @@ class YHFormItemTitleCell: UITableViewCell {
 
         titleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.right.equalTo(cancelButton.snp.left).offset(-3)
+            make.right.equalToSuperview().offset(-horizonalGap)
             make.top.equalToSuperview().offset(16)
             make.bottom.equalToSuperview().offset(-16)
         }
@@ -130,6 +130,8 @@ class YHFormItemTitleCell: UITableViewCell {
     }
     
     func showEditType(type: YHFormTitleItemEditType) {
+        
+        var titleMaxRight = -(horizonalGap)
         switch type {
             case .none:
                 cancelButton.isHidden = true
@@ -137,10 +139,17 @@ class YHFormItemTitleCell: UITableViewCell {
             case .canEdit:
                 cancelButton.isHidden = true
                 editButton.isHidden = false
+                titleMaxRight = -(horizonalGap+24.0+5.0)
             case .canCancel:
                 cancelButton.isHidden = false
                 editButton.isHidden = true
+                titleMaxRight = -(horizonalGap+92.0+5.0)
+         }
+        titleLabel.snp.updateConstraints { make in
+            make.right.equalToSuperview().offset(-horizonalGap)
         }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
     }
     
     @objc func didClickOperatorBtn(btn:UIButton) {

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

@@ -197,10 +197,8 @@ class YHCodeSueecssViewController: YHBaseViewController {
 //                YHHUD.flash(message: "验证码已下发,请注意查收")
                 self.startTime()
             } else {
-                YHHUD.flash(message: "获取验证码失败，请重试~")
+                YHHUD.flash(message: error?.errorMsg ?? "")
             }
-            
-            
         })
     }
     

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

@@ -179,13 +179,11 @@ class YHPhoneLoginViewController: YHBaseViewController {
                 guard let self = self else { return }
                 
                 if success == true {
-//                    YHHUD.flash(message: "验证码已下发,请注意查收")
                     let vc = YHCodeSueecssViewController()
                     vc.phoneNumber = self.phoneMessageView.phoneTextField.text
                     self.navigationController?.pushViewController(vc)
-                    
                 } else {
-                    YHHUD.flash(message: "获取验证码失败，请重试~")
+                    YHHUD.flash(message: error?.errorMsg ?? "")
                 }
             })
         } else {

galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift

@@ -19,7 +19,4 @@ struct YHUserModel: SmartCodable {
     var channel: String?
     var token: String? // 暂无token
         
-//    var token: String? {
-//      return "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9"
-//    }
 }

galaxy/galaxy/Classes/Modules/Login(登录)/V/验证码输入框/YHSmsCodeInputView.swift

@@ -36,6 +36,7 @@ class YHSmsCodeInputView: UIView {
         textField.tintColor = .clear
         textField.textColor = .clear
         textField.delegate = self
+        textField.keyboardType = .phonePad
         textField.addTarget(self, action: #selector(smsCodeInputChanged), for: .editingChanged)
         return textField
     }()

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -35,6 +35,7 @@ extension YHLoginViewModel {
             
             //1. json字符串 转 对象
             if model.code == 200 {
+                YHHUD.flash(message: model.msg)
                 callBackBlock(true,nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift

@@ -71,7 +71,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
     
     @objc func logout() {
         YHLoginManager.shared.clearUserInfo()
-        NotificationCenter.default.post(name: YhConstant.YhNotification.didLoginoutSuccessNotifiction, object: nil)
+        NotificationCenter.default.post(name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
         YHHUD.flash(message: "退出成功")
         self.navigationController?.popViewController(animated: true)
     }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -119,6 +119,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         view.addSubview(bgImgView)
         view.addSubview(tableView)
         
+        updateUserUI()
+        
         bgImgView.snp.makeConstraints { make in
             make.left.right.top.equalTo(view)
             make.height.equalTo(bgImgView.snp.width).multipliedBy(YHUserInfoHeaderView.bgRatio)
@@ -130,7 +132,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         
         NotificationCenter.default.addObserver(self, selector: #selector(loginSuccess), name: YhConstant.YhNotification.didLoginSuccessNotifiction, object: nil)
         
-        NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLoginoutSuccessNotifiction, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
         
     }
 }
@@ -199,10 +201,18 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
 extension YHMyViewController {
     @objc func loginSuccess() {
         printLog("登录成功，进行相应的 UI刷新操作")
-        headerView.nickName = "Hi, 银河用户"
+        updateUserUI()
     }
     
     @objc func logoutSuccess() {
-        headerView.nickName = "登录/注册"
+        updateUserUI()
+    }
+    
+    func updateUserUI() {
+        if YHLoginManager.shared.isLogin() {
+            headerView.nickName =  YHLoginManager.shared.userModel?.nickname ?? "Hi, 银河用户".local
+        } else {
+            headerView.nickName =  "登录/注册"
+        }
     }
 }

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -185,7 +185,7 @@ extension YhConstant {
         public static let didLoginSuccessNotifiction = Notification.Name(rawValue: "com.usleep.health.login.success")
         
         //退出成功
-        public static let didLoginoutSuccessNotifiction = Notification.Name(rawValue: "com.usleep.health.loginout.success")
+        public static let didLogoutSuccessNotifiction = Notification.Name(rawValue: "com.usleep.health.logout.success")
         
         
         //token 过期

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -101,7 +101,7 @@ class YHNetRequest: NSObject {
         
         
         //杜宇的账号
-        //        requestHeader.add(name: "token", value: "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9")
+//                requestHeader.add(name: "token", value: "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9")
         
         
         //明杰的账号
@@ -153,6 +153,11 @@ class YHNetRequest: NSObject {
     
     ///开始请求
     func startRequest() -> Request? {
+        guard YHNetworkStatusManager.shared.isNetWorkOK == true else {
+            YHHUD.flash(message: "网络异常")
+            return httpRequest
+        }
+        
         let requestHeaders = getHeader()
         ///不使用缓存
         AF.sessionConfiguration.requestCachePolicy = .reloadIgnoringCacheData