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

galaxy/.gitignore

@@ -10,6 +10,7 @@
 
 ## Build generated
 build/
+buglybin/
 DerivedData/
 Podfile.lock
 

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -4150,7 +4150,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 = (
@@ -4291,7 +4291,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 = (
@@ -4495,7 +4495,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 = (
@@ -4541,7 +4541,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/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift

@@ -28,7 +28,7 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
         dataSource.isTitleColorGradientEnabled = false
         dataSource.titles = arrItemTitles
         
-        dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 15)
+        dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 16)
         dataSource.titleNormalColor = UIColor.yhGreyColor
         
         dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 21)

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

@@ -43,6 +43,14 @@ class YHHomeIdentityViewController: YHBaseViewController {
         return view
     }()
     
+    lazy var noDataView: YHEmptyDataView = {
+        let view = YHEmptyDataView.createView("暂无内容", kEmptyCommonBgName)
+        view.backgroundColor = .white
+        view.topMargin = 150
+        view.isHidden = true
+        return view
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         createUI()
@@ -55,6 +63,8 @@ class YHHomeIdentityViewController: YHBaseViewController {
 
         self.view.addSubview(self.scrollView)
         self.view.addSubview(self.subTabBar)
+        self.view.addSubview(self.noDataView)
+        
         self.subTabBar.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.left.equalTo(20)
@@ -65,6 +75,10 @@ class YHHomeIdentityViewController: YHBaseViewController {
             make.top.equalTo(self.subTabBar.snp.bottom)
             make.left.right.bottom.equalToSuperview()
         }
+        
+        self.noDataView.snp.makeConstraints { make in
+            make.left.right.top.bottom.equalToSuperview()
+        }
     }
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -94,6 +108,11 @@ extension YHHomeIdentityViewController {
             [weak self] success, error in
             guard let self = self else { return }
             
+            if !success {
+                self.view.bringSubviewToFront(self.noDataView)
+                self.noDataView.isHidden = false
+            }
+            
             subTabArr.removeAll()
             for item in self.viewModel.categoryArr {
                 if let item = item {

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

@@ -33,28 +33,51 @@ class YHHomeInformationViewController: YHBaseViewController {
         collectinoView.alwaysBounceVertical = true
         collectinoView.showsVerticalScrollIndicator = false
         collectinoView.es.addYHPullToRefresh {
-            self.getClassifies()
-            self.getTheNewestInfoList(isFirstPage: true)
+            self.requetData()
         }
         collectinoView.es.addInfiniteScrolling {
-            self.getTheNewestInfoList(isFirstPage: false)
+            self.getTheNewestInfoList(isFirstPage: false, completion: nil)
         }
         return collectinoView
     }()
     
+    lazy var noDataView: YHEmptyDataView = {
+        let view = YHEmptyDataView.createView("暂无内容", kEmptyCommonBgName)
+        view.backgroundColor = .white
+        view.topMargin = 150
+        view.isHidden = true
+        return view
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navigationBar.isHidden = true
         self.view.backgroundColor = .white
         self.view.addSubview(self.collectView)
+        self.view.addSubview(self.noDataView)
         self.collectView.snp.makeConstraints { make in
             make.top.equalTo(10)
             make.bottom.equalToSuperview()
             make.left.equalTo(20)
             make.right.equalTo(-20)
         }
-        self.getClassifies()
-        self.getTheNewestInfoList(isFirstPage:true)
+        self.noDataView.snp.makeConstraints { make in
+            make.left.right.top.bottom.equalToSuperview()
+        }
+        requetData()
+    }
+    
+    func requetData() {
+       self.getClassifies {
+           self.getTheNewestInfoList(isFirstPage: true) {
+               let count = self.viewModel.arrHomeNewsData?.count ?? 0
+               if count <= 0, self.sectionItems.count <= 0 {
+                   self.noDataView.isHidden = false
+               } else {
+                   self.noDataView.isHidden = true
+               }
+           }
+        }
     }
 }
 
@@ -145,15 +168,16 @@ extension YHHomeInformationViewController: JXSegmentedListContainerViewListDeleg
 extension YHHomeInformationViewController {
     
     // 获取栏目
-    func getClassifies() {
+    func getClassifies(_ completion: (()->())?) {
         self.viewModel.getHomeInfoClassifies { success, error in
             self.sectionItems.removeAll()
             self.sectionItems.append(contentsOf: self.viewModel.classifyArr)
             self.collectView.reloadData()
+            completion?()
         }
     }
     // 获取最新资讯
-    func getTheNewestInfoList(isFirstPage: Bool) {
+    func getTheNewestInfoList(isFirstPage: Bool, completion: (()->())?) {
         self.viewModel.getList(isFirsPage: isFirstPage) { success, error in
             self.collectView.reloadData()
             self.collectView.es.stopPullToRefresh()
@@ -162,6 +186,7 @@ extension YHHomeInformationViewController {
                 self.collectView.es.noticeNoMoreData()
                 self.collectView.footer?.alpha = 1
             }
+            completion?()
         }
     }
 }

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

@@ -45,10 +45,6 @@ class YHStartPageViewController: UIViewController {
     
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        
-        let dateString = Date().dateString(ofStyle: .short)
-        UserDefaults.standard.set(dateString, forKey: "todayShowStartPageViewFlag")
-        UserDefaults.standard.synchronize()
     }
 }
 
@@ -121,6 +117,12 @@ private extension YHStartPageViewController {
                 UserDefaults.standard.synchronize()
                 self.closeBtn.isHidden = false
                 self.startTimer()
+                
+                
+                
+                let dateString = Date().dateString(ofStyle: .short)
+                UserDefaults.standard.set(dateString, forKey: "todayShowStartPageViewFlag")
+                UserDefaults.standard.synchronize()
             }
             
             agreeAlertView.cancelBlock = {

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/C/YHInvitationWithGiftsViewController.swift

@@ -80,7 +80,7 @@ extension YHInvitationWithGiftsViewController: UITableViewDelegate, UITableViewD
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.row == 0 {
-            return 209
+            return KScreenWidth / 1.82
         } else if indexPath.row == 1 {
             if self.viewModel.recordModel.list.count == 0 {
                 return 345
@@ -200,7 +200,7 @@ extension YHInvitationWithGiftsViewController: UIScrollViewDelegate {
         gk_navBarAlpha = 1
         
         if percent >= 0.5 {
-            gk_navTitle = "关于银河湾"
+            gk_navTitle = ""
         } else {
             gk_navTitle = ""
         }

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift

@@ -54,6 +54,8 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
                 label.textAlignment = .center
                 label.layer.borderWidth = 1
                 label.layer.borderColor = UIColor(hex: 0xebf4fe).cgColor
+                label.layer.cornerRadius = kCornerRadius3
+                label.layer.maskedCorners = [.layerMinXMaxYCorner,.layerMaxXMaxYCorner]
                 self.tableView.tableFooterView = label
             } else {
                 self.tableView.tableFooterView = UIView()
@@ -261,6 +263,8 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
         peopleOneView = {
             let view = YHInvitationPeopleItemView()
             view.titleLabel.text = "被邀请人"
+            view.layer.cornerRadius = kCornerRadius3
+            view.layer.maskedCorners = [.layerMinXMinYCorner]
             return view
         }()
         centerView.addSubview(peopleOneView)
@@ -274,6 +278,14 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
         peopleFiveView = {
             let view = YHInvitationPeopleItemView()
             view.titleLabel.text = "签约"
+            view.titleLabel.textAlignment = .center
+            view.layer.cornerRadius = kCornerRadius3
+            view.layer.maskedCorners = [.layerMaxXMinYCorner]
+            view.titleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(10)
+                make.height.equalTo(17)
+                make.left.right.equalToSuperview()
+            }
             return view
         }()
         centerView.addSubview(peopleFiveView)
@@ -287,6 +299,12 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
         peopleFourView = {
             let view = YHInvitationPeopleItemView()
             view.titleLabel.text = "测评"
+            view.titleLabel.textAlignment = .center
+            view.titleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(10)
+                make.height.equalTo(17)
+                make.left.right.equalToSuperview()
+            }
             return view
         }()
         centerView.addSubview(peopleFourView)
@@ -300,6 +318,12 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
         peopleThreeView = {
             let view = YHInvitationPeopleItemView()
             view.titleLabel.text = "注册"
+            view.titleLabel.textAlignment = .center
+            view.titleLabel.snp.remakeConstraints { make in
+                make.top.equalTo(10)
+                make.height.equalTo(17)
+                make.left.right.equalToSuperview()
+            }
             return view
         }()
         centerView.addSubview(peopleThreeView)
@@ -358,6 +382,7 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
                 self.tableView.reloadData()
             }
         }
+        
     }
 
 }

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

@@ -9,12 +9,14 @@
 import UIKit
 class YHHomeHeadView: UIView {
     
+    private static let  topMargin : CGFloat = 10.0
+    
     // 不包含订单提示视图的总高度
-    private static let fixViewH : CGFloat = (YHHomeBannerView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + (20 + 1) + (20 + YHAiRadarAreaView.viewH) + (20 + YHHomeSalonAreaView.viewH) + (20 + 1) + 20
+    private static let fixViewH : CGFloat = YHHomeHeadView.topMargin + (YHHomeBannerView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + (20 + 1) + (20 + YHAiRadarAreaView.viewH) + (20 + YHHomeSalonAreaView.viewH) + (20 + 1) + 20
     
     //展示 订单提示时候的 高度
     private var homeHeadViewH : CGFloat {
-        return YHHomeHeadView.fixViewH + (20 + orderTipsView.tipViewH)
+        return YHHomeHeadView.fixViewH + (20 + orderTipsView.tipViewH) + YHHomeHeadView.topMargin
     }
     
     //获取headView的具体高度
@@ -22,7 +24,7 @@ class YHHomeHeadView: UIView {
         if showTips {
             return homeHeadViewH
         } else {
-            return YHHomeHeadView.fixViewH + (20 + YHEvaluationView.viewH)
+            return YHHomeHeadView.fixViewH + (20 + YHEvaluationView.viewH) + YHHomeHeadView.topMargin
         }
     }
     
@@ -103,7 +105,7 @@ class YHHomeHeadView: UIView {
     
     func updateSubViewsConstraints() {
         homeBannerView.snp.remakeConstraints { make in
-            make.top.equalTo(0)
+            make.top.equalTo(YHHomeHeadView.topMargin)
             make.left.right.equalToSuperview()
             make.height.equalTo(YHHomeBannerView.viewH)
         }
@@ -174,7 +176,7 @@ private extension YHHomeHeadView {
         
         addSubview(homeBannerView)
         homeBannerView.snp.makeConstraints { make in
-            make.top.equalTo(0)
+            make.top.equalTo(YHHomeHeadView.topMargin)
             make.left.right.equalToSuperview()
             make.height.equalTo(YHHomeBannerView.viewH)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentToActionTableViewCell.swift

@@ -252,7 +252,7 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
         fileImageView.image = UIImage(named: iconImgName)
         fileNameLabel.text = dataSource.writing_document.doc_sign.doc_type_name
         if dataSource.writing_document.doc_sign.doc_type == 7 || dataSource.writing_document.doc_sign.doc_type == 8 {
-            shareButton.isHidden = false
+//            shareButton.isHidden = false
         }
     }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift

@@ -264,7 +264,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
         fileImageView.image = UIImage(named: iconImgName)
         fileNameLabel.text = dataSource.doc_type_name
         if dataSource.doc_type == 7 || dataSource.doc_type == 8 {
-            shareButton.isHidden = false
+//            shareButton.isHidden = false
         }
     }
 

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

@@ -27,6 +27,10 @@ class YHWorkExperienceViewController: YHBaseViewController {
         let view = YHFileRenameInputView.inputView(defalutText: "请输入名称")
         return view
     }()
+    lazy var previewFileTool:YHFilePreviewTool = {
+       let tool = YHFilePreviewTool(targetVC: self)
+       return tool
+    }()
     lazy var blackMaskView: UIView = {
         let view = UIView(frame:UIScreen.main.bounds)
         view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.5)
@@ -612,9 +616,11 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                             }
                             if editType == .preview {
                                 if model.fileUrl.isEmpty == false {
-                                    let vc = YHImageViewController()
-                                    vc.imgString = model.fileUrl
-                                    UIViewController.current?.navigationController?.pushViewController(vc)
+                                    self.viewModel.getPublicImageUrl(model.fileUrl) { success, error in
+                                        if let success = success {
+                                            self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName: model.fileName)
+                                        }
+                                    }
                                 }
                                 
                             }
@@ -624,9 +630,11 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                         }.show()
                     } else {
                         if model.fileUrl.isEmpty == false {
-                            let vc = YHImageViewController()
-                            vc.imgString = model.fileUrl
-                            UIViewController.current?.navigationController?.pushViewController(vc)
+                            self.viewModel.getPublicImageUrl(model.fileUrl) { success, error in
+                                if let success = success {
+                                    self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:model.fileName)
+                                }
+                            }
                         }
                     }
                 }
@@ -740,9 +748,11 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                         }
                         if editType == .preview {
                             if model.fileUrl.isEmpty == false {
-                                let vc = YHImageViewController()
-                                vc.imgString = model.fileUrl
-                                UIViewController.current?.navigationController?.pushViewController(vc)
+                                self.viewModel.getPublicImageUrl(model.fileUrl) { success, error in
+                                    if let success = success {
+                                        self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:model.fileName)
+                                    }
+                                }
                             }
                         }
                         if editType == .delete {
@@ -750,15 +760,14 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                         }
                     }.show()
                 } else {
-//                    let vc = YHImageViewController()
-//                    vc.imgString = model.fileUrl
-//                    UIViewController.current?.navigationController?.pushViewController(vc)
                     
                     
                     if model.fileUrl.isEmpty == false {
-                        let vc = YHImageViewController()
-                        vc.imgString = model.fileUrl
-                        UIViewController.current?.navigationController?.pushViewController(vc)
+                        self.viewModel.getPublicImageUrl(model.fileUrl) { success, error in
+                            if let success = success {
+                                self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:model.fileName)
+                            }
+                        }
                     }
                 }
             }

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

@@ -184,7 +184,7 @@ private extension YHH5WebViewVC {
             if shareUrl.contains("superAppBridge.html#/evaluation", caseSensitive: false) {
                 shareUrl =  YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=APP-share&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")"
             }
-            YHShareManager.shared.sendLinkContent(self.shareH5Title, self.shareH5Describe, UIImage(named: "AppIcon") ?? UIImage(), link: self.url)
+            YHShareManager.shared.sendLinkContent(self.shareH5Title, self.shareH5Describe, UIImage(named: "AppIcon") ?? UIImage(), link: shareUrl)
         }
     }