banner支持 h5分享

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHBannerModel.swift

@@ -18,8 +18,14 @@ class YHBannerModel: SmartCodable {
     var skip_type: Int = 0
     var id: Int = 0
     var img_url_compress: String = ""
+    
     //是否为本地
     var isLocalItemFlag : Bool = false
+    
+    //分享相关参数
+    var isShareH5Flag : Bool = false
+    var addtitionParam: YHBannerAdditionModel?
+    
     required init() {
     }
     
@@ -32,3 +38,13 @@ class YHBannerModel: SmartCodable {
         return model
     }
 }
+
+
+class YHBannerAdditionModel : SmartCodable {
+    var shareH5Title : String = ""
+    var shareH5Describe : String = ""
+    var shareH5Url:String = ""
+    
+    required init() {
+    }
+}

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

@@ -136,25 +136,34 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
             switch model.skip_type {
             case 1: //跳转H5
 //                var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"//建明的本机IP
+                var url = ""
                 if YHLoginManager.shared.isLogin() {
                     let token = YHLoginManager.shared.h5Token
-                    var url = model.skip_url + "?param=" + token
+                    url = model.skip_url + "?param=" + token
                     let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
                     if urlHasParam {
                         url = model.skip_url + "&param=" + token
                     }
-                    let vc = YHH5WebViewVC()
-                    vc.url = url
-                    vc.isFullScreenFlag = false
-                    self.parentViewController?.navigationController?.pushViewController(vc)
-                    
                 } else {
-                    let vc = YHH5WebViewVC()
-                    vc.url = model.skip_url
-                    vc.isFullScreenFlag = false
-                    self.parentViewController?.navigationController?.pushViewController(vc)
+                    url = model.skip_url
                 }
                 
+                let vc = YHH5WebViewVC()
+                vc.url = url
+                vc.isFullScreenFlag = false
+                
+                if model.isShareH5Flag {
+                    if let tModel = model.addtitionParam {
+                        if !tModel.shareH5Url.isEmpty {
+                            vc.isShowRightShareItemFlag = true
+                            vc.shareH5Title = tModel.shareH5Title
+                            vc.shareH5Describe = tModel.shareH5Describe
+                            vc.shareUrlFromOutside = tModel.shareH5Title
+                        }
+                    }
+                }
+                self.parentViewController?.navigationController?.pushViewController(vc)
+                
             case 2: //跳转APP内Tab
                 goAppTab(tabBarName:model.skip_url)
             case 3://3-跳转资讯页

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

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import WebKit
+@preconcurrency import WebKit
 import dsBridge
 import Photos
 
@@ -74,6 +74,9 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     var shareH5Title : String = "20秒极速测分"
     var shareH5Describe : String = "您的朋友邀请您进行香港优才测评，来试试吧"
     
+    //外部传进来的分享链接
+    var shareUrlFromOutside : String?
+    
     
     //二维码是否请求完成
     var isQrInfoOk : Bool = false
@@ -236,10 +239,20 @@ private extension YHH5WebViewVC {
         } else {
             
             var shareUrl = self.url
+            if let url = shareUrlFromOutside {
+                shareUrl = url
+            }
+            
+            //特殊场景处理
             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: shareUrl)
+            
+            if !shareUrl.isEmpty &&
+               !self.shareH5Title.isEmpty &&
+                !self.shareH5Describe.isEmpty {
+                YHShareManager.shared.sendLinkContent(self.shareH5Title, self.shareH5Describe, UIImage(named: "AppIcon") ?? UIImage(), link: shareUrl)
+            }
         }
     }
     
@@ -278,7 +291,7 @@ extension YHH5WebViewVC {
             self.progBar.alpha = 1.0
             progBar.setProgress(Float(webview.estimatedProgress), animated: true)
             //进度条的值最大为1.0
-            if(self.webview.estimatedProgress >= 1.0) {
+            if self.webview.estimatedProgress >= 1.0 {
                 if isFullScreenFlag {
                     gk_navBarAlpha = 0.0
                 }