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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -4282,7 +4282,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4423,7 +4423,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4627,7 +4627,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4673,7 +4673,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/AppDelegate.swift

@@ -22,6 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         
         Thread.sleep(forTimeInterval: 0.5) // 应产品同学Nick要求  启动页时间展示长点
         
+        
         setupAudionConfig()
         
         //初始化 神策sdk

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

@@ -12,9 +12,6 @@ import Photos
 import dsBridge
 
 class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
-    
-    
-    
     var  operationFlag:Bool = false
     
     typealias Block = (YHWebModel) -> ()

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

@@ -107,6 +107,10 @@ private extension YHStartPageViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(forceUpdateOp), name: YhConstant.YhNotification.didForceUpgradeNotifiction, object: nil)
         
         if let key = UserDefaults.standard.value(forKey: "userAgreeProtocal") as? String,key.contains("true") {
+            let dateString = Date().dateString(ofStyle: .short)
+            UserDefaults.standard.set(dateString, forKey: "todayShowStartPageViewFlag")
+            UserDefaults.standard.synchronize()
+            
             startTimer()
         } else {
             agreeAlertView.isHidden = false

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

@@ -22,6 +22,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
     var isMore: Bool = false
     var isShowPrompt: Bool = false
     var isShowMessageSelect: Bool = true
+    var isKeyboardShow: Bool = false
     var selectEditItem = YHWorkExperienceFileModel()
     var renameInputView: YHFileRenameInputView = {
         let view = YHFileRenameInputView.inputView(defalutText: "请输入名称")
@@ -250,6 +251,12 @@ class YHWorkExperienceViewController: YHBaseViewController {
                 make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
                 make.left.right.bottom.equalTo(view)
             }
+            isKeyboardShow = true
+            let rightButtonItem = UIBarButtonItem(title: "下一步", style: .plain, target: self, action: #selector(nextStep))
+            rightButtonItem.setTitleTextAttributes([.foregroundColor: UIColor.brandMainColor], for: .normal)
+            rightButtonItem.setTitleTextAttributes([.foregroundColor: UIColor.brandMainColor], for: .highlighted)
+            gk_navRightBarButtonItem = rightButtonItem
+            gk_navItemRightSpace = 16
         }
     }
      
@@ -267,6 +274,34 @@ class YHWorkExperienceViewController: YHBaseViewController {
                 make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
                 make.left.right.bottom.equalTo(view)
             }
+            isKeyboardShow = false
+            gk_navRightBarButtonItems = []
+        }
+    }
+    
+    @objc func nextStep() {
+        self.view.endEditing(true)
+        if self.viewModel.isCanNext(self.stepView.currentIndex) {
+            self.viewModel.mainModel.step = self.stepView.currentIndex
+            self.viewModel.saveWorkDetail(1, orderID: self.orderID, callBackBlock: {[weak self] flag, error in
+                guard let self = self else { return }
+                if let error = error {
+                    YHHUD.flash(message: error.errorMsg )
+                } else {
+                    YHHUD.hideFlashMessage()
+                    if self.stepView.currentIndex == 4 || (self.stepView.currentIndex == 3 && self.viewModel.mainModel.is_project_introduction == 0) {
+                        YHHUD.flash(message: "提交成功")
+                        self.navigationController?.popViewController()
+                    } else {
+                        self.stepView.currentIndex = self.stepView.currentIndex + 1
+                        self.updateDataSource()
+                    }
+                }
+            })
+        } else {
+            self.isShowPrompt = true
+            self.updateDataSource()
+            YHHUD.flash(message: "您还有信息未填写")
         }
     }
     
@@ -859,3 +894,13 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
         return 0.01
     }
 }
+
+extension YHWorkExperienceViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if isKeyboardShow {
+            if stepView.currentIndex != 0 {
+                self.view.endEditing(true)
+            }
+        }
+    }
+}

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

@@ -238,3 +238,9 @@ extension YHWorkHighlightsTableViewCell: UITextViewDelegate {
         return newLength <= 2000
     }
 }
+
+extension YHWorkHighlightsTableViewCell: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        UIViewController.current().view.endEditing(true)
+    }
+}

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

@@ -190,3 +190,9 @@ extension YHWorkResponsibilitiesTableViewCell: UITextViewDelegate {
         return newLength <= 2000
     }
 }
+
+extension YHWorkResponsibilitiesTableViewCell: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        UIViewController.current().view.endEditing(true)
+    }
+}

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

@@ -301,12 +301,6 @@ extension YHH5WebViewVC {
         }
     }
     
-    
-    func webViewDidScrollView(_ offset: CGFloat) {
-        //补充 导航栏 逻辑逻辑
-        
-    }
-    
     func saveImage(_ image: UIImage) {
         // 确保应用有权访问相册
         PHPhotoLibrary.requestAuthorization { status in

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

@@ -26,7 +26,6 @@ extension YHJsApi {
             
             if curIndex > -1,arrPics.count > 0 {
                 DispatchQueue.main.async {
-//                    let arr = ["https://img1.baidu.com/it/u=2032777443,4245182967&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1422","http://img0.baidu.com/it/u=594725074,698294204&fm=253&app=138&f=JPEG?w=800&h=1422"]
                     YHPictureReviewManager.shared.showNetWorkPicturs(curIndex: curIndex, arrPicturs: arrPics)
                 }
             }

galaxy/galaxy/Classes/Modules/PictureReview(图片预览)/YHLongtapPictureSheetView.swift

@@ -11,7 +11,9 @@ import PhotosUI
 
 class YHLongtapPictureSheetView: UIView {
     private var uploadTypeArr = ["分享图片","保存图片","取消"]
-    private let testUrl = "https://img1.baidu.com/it/u=2032777443,4245182967&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1422"
+//    private let testUrl = "https://img1.baidu.com/it/u=2032777443,4245182967&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1422"
+    var myUrl : String = ""
+    
     lazy var blackMaskView: UIView = {
         let view = UIView()
         view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.5)
@@ -213,7 +215,7 @@ extension YHLongtapPictureSheetView  {
 private extension YHLongtapPictureSheetView {
     @objc func share() {
         self.dismiss()
-        guard let url = URL(string: testUrl) else {
+        guard let url = URL(string: myUrl) else {
             return
         }
         let task = URLSession.shared.dataTask(with: url) { data, response, error in
@@ -230,7 +232,7 @@ private extension YHLongtapPictureSheetView {
     }
     
     @objc func save() {
-        saveLocalPictureSyn(testUrl)
+        saveLocalPictureSyn(myUrl)
         self.dismiss()
         
     }

galaxy/galaxy/Classes/Modules/PictureReview(图片预览)/YHPictureReviewManager.swift

@@ -62,7 +62,11 @@ extension YHPictureReviewManager {
 
 extension YHPictureReviewManager {
     private func longPress(cell: JXPhotoBrowserImageCell) {
-        let view = YHLongtapPictureSheetView.sheetView()
-        view.show()
+        let index = cell.index
+        if index < self.arrPics.count,index > -1 {
+            let view = YHLongtapPictureSheetView.sheetView()
+            view.myUrl = self.arrPics[index]
+            view.show()
+        }
     }
 }

galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelper.swift

@@ -70,6 +70,8 @@ enum YHUatModules: Int {
 class YHUatHelper: NSObject {
     static let shared = YHUatHelper()
     
+    private var isDataOk : Bool = false
+    
     private lazy var viewModel: YHUatHelperViewModel = {
         let vm = YHUatHelperViewModel()
         return vm
@@ -91,7 +93,7 @@ class YHUatHelper: NSObject {
 private extension YHUatHelper {
     
     @objc func loginSuccess() {
-        viewModel.isDataOk = false
+        isDataOk = false
         loadUatData()
     }
     
@@ -119,7 +121,6 @@ extension YHUatHelper {
             }
         }
         
-        
         //2.返回默认值
         return module.defaultValue
     }
@@ -127,20 +128,23 @@ extension YHUatHelper {
     //加载服务器的uat配置
     func loadUatData() {
         
-        
         if !YHNetworkStatusManager.shared.isNetWorkOK {
             printLog("网络不可用")
             return
         }
         
-       
+        if !YHLoginManager.shared.isLogin() {
+            printLog("未登录 不请求")
+            return
+        }
         
-        if !viewModel.isDataOk {
+        if !isDataOk {
             viewModel.getUatList { success, error in
                 if success {
+                    self.isDataOk = true
                     NotificationCenter.default.post(name: YhConstant.YhNotification.didRevUatParam, object: nil)
                 } else {
-                    
+                    self.isDataOk = false
                 }
             }
         }

galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift

@@ -49,7 +49,6 @@ class YHUatListModel : HandyJSON {
 
 class YHUatHelperViewModel : YHBaseViewModel {
     var dataList : YHUatListModel?
-    var isDataOk : Bool = false
 }
 
 // MARK: - 共有方法
@@ -62,7 +61,7 @@ extension YHUatHelperViewModel {
             return
         }
         
-        let params: [String] = ["1", "2","3", "4","5","6", "7","9"]
+        let params: [String] = ["1", "2","3", "4","5","6","9"]
         var strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Uat.uatListApi
         for (index,item) in params.enumerated() {
             if index == 0 {
@@ -80,15 +79,12 @@ extension YHUatHelperViewModel {
                 callBackBlock(false,nil)
                 return
             }
-            
-            self.isDataOk = true
             self.dataList = resultModel
             
             
             
             callBackBlock(true,nil)
         } failBlock: { err in
-            self.isDataOk = false
             callBackBlock(false,err)
         }
     }