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

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

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)
+                            }
+                        }
                     }
                 }
             }