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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainViewController.swift

@@ -250,6 +250,9 @@ extension YHPreviewMainViewController : UITableViewDelegate,UITableViewDataSourc
         let cell = UITableViewCell()
         cellView.view.frame = CGRect(x: 0, y: 0, width: cell.contentView.bounds.size.width, height: myCellHeight)
         cell.contentView.addSubview(cellView.view)
+        cellView.view.snp.makeConstraints { make in
+            make.edges.equalTo(0)
+        }
         return cell
     }
     

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

@@ -14,7 +14,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     var webview = WKWebView()
     var progBar = UIProgressView()
 //    var url = "https://www.baidu.com"
-    var url = "https://docs.qq.com/openapi/drive/v2/files/embed/temporary?timestamp=1710246548&id=a7b1253f3c344fd1878efaef62ef89cf&clientID=2aebc2da4f0b4883bf33ef20836f2e2d"
+    var url = "https://docs.qq.com/openapi/drive/v2/files/embed/temporary?timestamp=1710294842&id=50b4f6dab5df4497aeb23e5a54933d83&clientID=2aebc2da4f0b4883bf33ef20836f2e2d"
     
     override func viewDidLoad() {
         super.viewDidLoad()

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

@@ -8,6 +8,7 @@
 import UIKit
 import SnapKit
 import NEConversationUIKit
+import SafariServices
 
 enum YHPersonalModuleItemType: Int {
     case none = 0
@@ -168,32 +169,36 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         
         if (indexPath.row >= items.count) { return }
         
-//        if !checkLogin() {
-//            let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
-//            vc.modalPresentationStyle = .custom
-//            self.navigationController?.present(vc, animated: true)
-//        } else {
-//            YHHUD.flash(message: "已登录: 功能完善中...")
-//        }
-        
-        
-        if indexPath.row == 0 {
-//            if let url = URL(string: "https://docs.qq.com/doc/DTEFUd0FnQnRCdlBt"), UIApplication.shared.canOpenURL(url) {
-//                UIApplication.shared.open(url, options: [:], completionHandler: nil)
-//            }
-            
-            let vc = YHWebViewViewController()
-            navigationController?.pushViewController(vc, animated: true)
+        if !checkLogin() {
+            let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
+            vc.modalPresentationStyle = .custom
+            self.navigationController?.present(vc, animated: true)
         } else {
-            let vc = YHWebViewViewController()
-            navigationController?.pushViewController(vc, animated: true)
+            YHHUD.flash(message: "已登录: 功能完善中...")
         }
         
         return
         
         
+//        let url = URL(string: "https://docs.qq.com/openapi/drive/v2/files/embed/temporary?timestamp=1710298232&id=6bcaa379b0e5488abbaff85d51ee2fab&clientID=2aebc2da4f0b4883bf33ef20836f2e2d")!
+//        
+//        let tmpVC = SFSafariViewController(url: url)
+//        navigationController?.pushViewController(tmpVC)
+//    
+//        
+//        return
         
-        return //for test hjl
+//        if indexPath.row == 0 {
+//
+//            
+//            let vc = YHWebViewViewController()
+//            navigationController?.pushViewController(vc, animated: true)
+//        } else {
+//            let vc = YHWebViewViewController()
+//            navigationController?.pushViewController(vc, animated: true)
+//        }
+//        
+//        return
         
         let item: PersonalModuleItem = items[indexPath.row];