与H5打通

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeViewController.swift

@@ -142,10 +142,10 @@ extension YHLifeViewController: UITableViewDelegate, UITableViewDataSource {
         let vc = YHH5WebViewVC()
         
         // TODO: - 谢
-        vc.url = YHBaseUrlManager.shared.curH5URL() + "articleDetail.html" + "?id=\(model.id)"
+        vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/commodity_info?categoryId=2&levelId=5&productId=30&from=wxApp"
         vc.isWithBottomViewFlag = true
         vc.isShareToMiniProgramFlag = true
-        vc.shareMiniPath = ""
+        vc.shareMiniPath = "/serviceHousekeeper/pages/documentEdit/documentEdit"
         
         self.navigationController?.pushViewController(vc)
     }

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

@@ -17,7 +17,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     var webview = DWKWebView()
     var progBar = UIProgressView()
     
-    var url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge/evaluation?from=app"
+    var url = ""
+    var navTitle = "" //导航栏title
+    
     lazy var noNetWorkTipsView: YHEmptyDataView = {
         let view = YHEmptyDataView.createView("无网络", kNotNetWorkBgName)
         view.topMargin = 222
@@ -46,33 +48,58 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     var isWithBottomViewFlag : Bool = false
     lazy var shareView: YHShareViewOnTablebarView = {
         let view = YHShareViewOnTablebarView()
-        view.isHidden = true
         return view
     }()
     
     //分享到H5或者小程序
     var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5
     var shareMiniPath : String? //分享到小程序时的 path
+    var shareMiniTitle : String = "好友力荐新品，速来围观，不忘粗心"
     
     //分享到H5的情况
     var shareH5Title : String = "20秒极速测分"
     var shareH5Describe : String = "您的朋友邀请您进行香港优才测评，来试试吧"
+    
+    
+    //二维码是否请求完成
+    var isQrInfoOk : Bool = false
+    var arrQrInfo : [String] = []
+    lazy var viewModel: YHHomePageViewModel = {
+        let vm = YHHomePageViewModel()
+        return vm
+    }()
 }
 
 // MARK: - 内部方法
 private extension YHH5WebViewVC {
+    
+    func loadQrInfo() {
+        let params : [String : Int] = ["pid[0]" : 16]
+        viewModel.getHKEvent(param: params) { success, error in
+            if success {
+                self.isQrInfoOk = true
+                if let arr = self.viewModel.hkList,arr.count > 0 {
+                    let item0 : YHHKEventModel = arr[0]
+                    if item0.list.count > 1 {
+                        self.arrQrInfo = item0.list
+                    }
+                }
+            }
+        }
+    }
+    
     func setupUI() {
         gk_navBarAlpha = 1.0
         gk_navLineHidden = false
+        gk_navBackgroundColor = .white
+//        gk_navTitle = "Test"
                 
         NotificationCenter.default.addObserver(self, selector: #selector(updateNetWorkUI), name: .reachabilityChanged, object: nil)
         
         view.backgroundColor = .white
         
-        //获取导航栏高度
-        let navHeight = self.navigationController?.navigationBar.frame.height
-        
         if isWithBottomViewFlag {
+            loadQrInfo()
             view.addSubview(shareView)
         }
         
@@ -83,10 +110,11 @@ private extension YHH5WebViewVC {
                 self.share()
             } else {
                 //预约咨询
-                // TODO: - for test hjl
-//                let codeUrl = model.codeUrl
-//                let downloadUrl = model.downloadUrl
-//                YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+                if self.arrQrInfo.count > 1 {
+                    let codeUrl = self.arrQrInfo[0]
+                    let downloadUrl = self.arrQrInfo[1]
+                    YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+                }
             }
         }
         
@@ -95,7 +123,9 @@ private extension YHH5WebViewVC {
         webview.scrollView.contentInsetAdjustmentBehavior = .never
         webview.navigationDelegate = self
         
-        webview.addJavascriptObject(YHJsApi(), namespace: nil)
+        let api = YHJsApi()
+        api.delegate = self
+        webview.addJavascriptObject(api, namespace: nil)
         
         let url = NSURL(string: url)
         let request = NSURLRequest(url: url! as URL)
@@ -145,7 +175,7 @@ private extension YHH5WebViewVC {
     @objc func share() {
         if self.isShareToMiniProgramFlag {
             if let path = self.shareMiniPath,!path.isEmpty {
-                YHShareManager.shared.shareToMiniProgram(path:path, shareTitle: "请查看")
+                YHShareManager.shared.shareToMiniProgram(path:path, shareTitle: shareMiniTitle)
             }
         } else {
             YHShareManager.shared.sendLinkContent(self.shareH5Title, self.shareH5Describe, UIImage(named: "AppIcon") ?? UIImage(), link: self.url)
@@ -242,3 +272,11 @@ extension YHH5WebViewVC {
     }
 }
 
+// MARK: - h5实现的接口
+extension YHH5WebViewVC {
+    func saveLocalPictureSyn(_ picUrl: String) {
+        //具体实现
+        
+    }
+}
+

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

@@ -7,41 +7,22 @@
 //
 
 import Foundation
+import UIKit
 
 typealias JSCallback = (String, Bool)->Void
 typealias JSDicCallback = ([String : Any],Bool)->Void
 
 class YHJsApi: NSObject {
-    
-    //MUST use "_" to ignore the first argument name explicitly。
+    weak var delegate : YHH5WebViewVC? = nil
+}
+
+extension YHJsApi {
     @objc func testSyn( _ arg:String) {
         printLog(arg)
     }
     
-    
-    @objc func testSynDic( _ arg:[String : Any]) {
-        print(arg)
-        return
-    }
-    
-    @objc func testAsyn( _ arg:String, handler: JSCallback) {
-        handler(String(format:"%@[Swift async call:%@]", arg, "test"), true)
-    }
-    
-    
-    //同步方法
-    @objc func appMethodForJsSyn(_ arg:[String : Any]) {
-        
-    }
-    
-    //异步方法
-    @objc func appMethodForJsAsyn(_ arg:[String : Any],handler : JSDicCallback){
-        handler(["msg":1],true)
+    //保存图片到本地
+    @objc func saveLocalPictureSyn(_ picUrl: String) {
+        self.delegate?.saveLocalPictureSyn(picUrl)
     }
-    
-}
-
-
-extension YHJsApi {
-    
 }