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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  返回按钮修改
  修改两次bug
  //  消息分页
  无网图片展示逻辑

galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift

@@ -22,7 +22,7 @@ class YHBaseViewController: UIViewController {
         gk_navLineHidden = true
         gk_navBarAlpha = 0
         
-        gk_backImage = UIImage(named: "back_icon")
+        gk_backImage = UIImage(named: "nav_back_icon")
         
         
 #if DEBUG

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

@@ -154,6 +154,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
             make.height.equalTo(59 + k_Height_safeAreaInsetsBottom())
         }
         
+        view.addSubview(self.noNetWorkTipsView)
+        self.noNetWorkTipsView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+        }
+        
         if id == 0 {
             if self.url.contains("?id=") {
                 let list = self.url.components(separatedBy: "?id=")
@@ -161,6 +167,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
                     if let iddd = list[1].int {
                         id = iddd
                         getData()
+                        updateNetWorkStatusUI(needReload: false)
                         return
                     }
                 }
@@ -194,11 +201,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
             gk_navTitle = ""
             
         }
-        view.addSubview(self.noNetWorkTipsView)
-        self.noNetWorkTipsView.snp.makeConstraints { make in
-            make.left.right.bottom.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
-        }
         getData()
         updateNetWorkStatusUI(needReload: false)
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift

@@ -638,7 +638,9 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                             self.viewModel.mainModel.file = self.fileDataSource ?? []
                         }
                         self.tableView.reloadData()
-                        YHHUD.flash(message: "同步成功")
+                        if models.count != 0 {
+                            YHHUD.flash(message: "同步成功")
+                        }
                     }
                 }
                 return cell
@@ -768,7 +770,9 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                         self.viewModel.mainModel.file = self.fileDataSource ?? []
                     }
                     self.tableView.reloadData()
-                    YHHUD.flash(message: "同步成功")
+                    if models.count != 0 {
+                        YHHUD.flash(message: "同步成功")
+                    }
                 }
             }
             return cell

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift

@@ -226,7 +226,8 @@ class YHWorkIntroductionViewController: YHBaseViewController {
         actionView = {
             let view = YHWorkActionView()
             view.exampleBlock = {[weak self] in
-                guard let self = self else { return }
+                guard let self = self else { return }  
+                self.view.endEditing(true)
                 let mainVc = YHWorkExampleViewController()
                 mainVc.dataSource = self.viewModel?.introducetionExampleModels
                 mainVc.type = .introduction
@@ -242,6 +243,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
             }
             view.photoBlock = {[weak self] in
                 guard let self = self else { return }
+                self.view.endEditing(true)
                 YHImagePickerView.show() {[weak self] image in
                     guard let self = self else { return }
                     let clipperVC = YHImageClipperViewController()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift

@@ -56,8 +56,8 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let item16 = YHWorkExperienceModel(id: .id18, isNeed: false, title: "公司业务性质/范畴/所属行业", isUserKeyBoard: true, prompts: "请输入，100字内", message: mainModel.business_nature)
         let item17 = YHWorkExperienceModel(id: .id19, isNeed: true, title: "职位水平类别", isUserKeyBoard: false, prompts: "请选择", message: "\(mainModel.professional_level)", type: .level, isShowPrompts: isShowPrompt, alertMessage:"请选择职位水平类别")
         let item18 = YHWorkExperienceModel(id: .id20, isNeed: true, title: "高管证明文件", isUserKeyBoard: false, prompts: "请选择", message: mainModel.executives_certificate, type: .prove, isShowPrompts: isShowPrompt, alertMessage:"请选择高管证明文件")
-        let item19 = YHWorkExperienceModel(id: .id21, isNeed: true, title: "高管在职开始时间", isUserKeyBoard: false, prompts: "请选择", message: mainModel.top_manager_start_at, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择入职年月")
-        let item20 = YHWorkExperienceModel(id: .id22, isNeed: true, title: "高管在职结束时间", isUserKeyBoard: false, prompts: "请选择", message: mainModel.top_manager_end_at, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择离职年月")
+        let item19 = YHWorkExperienceModel(id: .id21, isNeed: true, title: "高管在职开始时间", isUserKeyBoard: false, prompts: "请选择", message: mainModel.top_manager_start_at, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择高管在职开始时间")
+        let item20 = YHWorkExperienceModel(id: .id22, isNeed: true, title: "高管在职结束时间", isUserKeyBoard: false, prompts: "请选择", message: mainModel.top_manager_end_at, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择高管在职结束时间")
         var section1 = YHSectionWorkExperienceModel()
         if mainModel.professional_level == 1 {
             section1 = YHSectionWorkExperienceModel(title: "企业规模", models: [item12, item13, item14, item15, item16, item17, item18, item19, item20])

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -9,7 +9,7 @@
 import UIKit
 import SmartCodable
 
-let kMsgPageSize = 20
+let kMsgPageSize = 30
 
 class YHMsgViewModel: NSObject {