短剧全部课程样式适配 , 短剧播放按钮错误问题 ,电商h5交互支付 , 电商h5分享交互 , 电商h5返回交互. 还差拉起支付

“张旭”
1 parent 7177c249
Showing 11 changed files with 321 additions and 76 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/ShopPayController/CNLiveShopPayController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
metaCode/Classes/Main/HomePage/ViewModel/CNLiveShoph5ViewModel.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModel.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
@@ -110,6 +110,8 @@
 		19AD65AA2BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */; };
 		19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */; };
 		19AD65AE2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AD2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift */; };
+		19B153CB2BC3E1870018906C /* CNLiveShopPayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */; };
+		19B153CD2BC3EB690018906C /* CNLiveShoph5ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */; };
 		19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */; };
 		19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */; };
 		19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */; };
@@ -379,6 +381,8 @@
 		19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsDetailsTableViewCell.swift; sourceTree = "<group>"; };
 		19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCommentRequestShareModel.swift; sourceTree = "<group>"; };
 		19AD65AD2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsDetailsTableHeaderView.swift; sourceTree = "<group>"; };
+		19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopPayController.swift; sourceTree = "<group>"; };
+		19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShoph5ViewModel.swift; sourceTree = "<group>"; };
 		19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNSlideBaseNavigationController.swift; sourceTree = "<group>"; };
 		19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleController.swift; sourceTree = "<group>"; };
 		19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleViewModel.swift; sourceTree = "<group>"; };
@@ -961,6 +965,14 @@
 			path = CNLiveDownslideOperationManager;
 			sourceTree = "<group>";
 		};
+		19B153C92BC3E1550018906C /* ShopPayController */ = {
+			isa = PBXGroup;
+			children = (
+				19B153CA2BC3E1870018906C /* CNLiveShopPayController.swift */,
+			);
+			path = ShopPayController;
+			sourceTree = "<group>";
+		};
 		19BB1FE42AEB93850094D962 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -1406,6 +1418,7 @@
 				1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */,
 				19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */,
 				19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */,
+				19B153CC2BC3EB690018906C /* CNLiveShoph5ViewModel.swift */,
 			);
 			name = ViewModel;
 			path = HomePage/ViewModel;
@@ -1444,6 +1457,7 @@
 				1917333D2B284C6B007BCC04 /* ShopCoupon */,
 				191732FC2B0B3EB4007BCC04 /* GoodsDetail */,
 				19565EC32AF8ACC2007D6727 /* GoodsManager */,
+				19B153C92BC3E1550018906C /* ShopPayController */,
 			);
 			name = Controller;
 			path = HomePage/Controller;
@@ -1811,6 +1825,7 @@
 				19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
+				19B153CB2BC3E1870018906C /* CNLiveShopPayController.swift in Sources */,
 				191733662B39237D007BCC04 /* CNLiveShopGoodsManageListTableViewCell.swift in Sources */,
 				793CAF522A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift in Sources */,
 				1917334E2B2C1A08007BCC04 /* CNLiveSelectCouponTapView.swift in Sources */,
@@ -1862,6 +1877,7 @@
 				1938BD3F2B4BE7C500390A34 /* CNLiveAlbumMsgModel.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
+				19B153CD2BC3EB690018906C /* CNLiveShoph5ViewModel.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
 				194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */,
 				1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */,
@@ -2132,7 +2148,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.9.24.03.29.15;
+				CURRENT_PROJECT_VERSION = 1.1.0.24.04.09.15;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -2205,7 +2221,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -2387,7 +2403,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.9.24.03.29.15;
+				CURRENT_PROJECT_VERSION = 1.1.0.24.04.09.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2459,7 +2475,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -230,54 +230,41 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 0{
-            if self.cellType == .playlet{
-                //短剧大图
-                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
+            if self.cellType == .courseToMyCurriculum{
+                //我的课程
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
                 else {
-                    let cell = CNLiveAlbumImageCell()
+                    let cell = CNLiveDuanjuTitleCell()
                     return cell
                 }
-                cell.iconImgView.image = self.cell.bgImageView.image
-                cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
+                cell.cellType = .courseToMyCurriculum
+                cell.blockName = "我的课程"
                 return cell
-            }else if self.cellType == .course || self.cellType == .playletToCourse || self.cellType == .courseToMyCurriculum{
-                if self.cellType == .courseToMyCurriculum{
-                    //我的课程
+            }else{
+                if self.slideModel?.type == SlideModelTypeAllCourse12{
+                    //全部课程
                     guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
                     else {
                         let cell = CNLiveDuanjuTitleCell()
                         return cell
                     }
-                    cell.cellType = .courseToMyCurriculum
-                    cell.blockName = "我的课程"
+                    cell.cellType = .course
+                    cell.blockName = self.slideModel?.blockName
                     return cell
-                }else{
-                    if self.slideModel?.type == SlideModelTypeAllCourse12{
-                        //全部课程
-                        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveCourseTitleCellIdentifier) as? CNLiveDuanjuTitleCell
-                        else {
-                            let cell = CNLiveDuanjuTitleCell()
-                            return cell
-                        }
-                        cell.cellType = .course
-                        cell.blockName = self.slideModel?.blockName
-                        return cell
-                        
-                    }else if self.slideModel?.type == SlideModelTypeOneCourse75{
-                        //大图课程
-                        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
-                        else {
-                            let cell = CNLiveAlbumImageCell()
-                            return cell
-                        }
-                        cell.iconImgView.image = self.cell.bgImageView.image
-                        cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
+                    
+                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                    //大图课程
+                    guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveAlbumImageCellIdentifier) as? CNLiveAlbumImageCell
+                    else {
+                        let cell = CNLiveAlbumImageCell()
                         return cell
-                        
                     }
+                    cell.iconImgView.image = self.cell.bgImageView.image
+                    cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
+                    return cell
+                    
                 }
             }
-            
         }else{
             //列表cell
             let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
@@ -297,17 +284,12 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0{
-            if self.cellType == .playlet{
-                //短剧大图
+            if self.slideModel?.type == SlideModelTypeAllCourse12{
+                //全部课程
+                return allCourseCellHeight+get_system_statusBar_height()
+            }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                //大图课程
                 return KSreenWidth
-            }else if self.cellType == .course || self.cellType == .playletToCourse{
-                if self.slideModel?.type == SlideModelTypeAllCourse12{
-                    //全部课程
-                    return allCourseCellHeight+get_system_statusBar_height()
-                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
-                    //大图课程
-                    return KSreenWidth
-                }
             }
         }else{
             return 75
@@ -319,16 +301,11 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
         if indexPath.section == 0{
             //大图统一不能点击跳转
-            if self.cellType == .playlet{
-                //短剧大图,跳转播放页
-//                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
-            }else if self.cellType == .course || self.cellType == .playletToCourse{
-                if self.slideModel?.type == SlideModelTypeAllCourse12{
-                    //全部课程,跳转h5
+            if self.slideModel?.type == SlideModelTypeAllCourse12{
+                //全部课程,跳转h5
-                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
-                    //大图课程,跳转h5
-                }
+            }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                //大图课程,跳转h5
             }
         }else{
             CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumModel.model, contentId: albumModel.contentId, pid: albumModel.pid, shareUrl: albumModel.shareUrl, thirdUrl: albumModel.thirdUrl, title: albumModel.title, s_to: albumModel.s_to, trailerId: albumModel.trailerId, controller: self)
+//
+//  CNLiveShopPayController.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/8.
+//  支付页面
+
+import Foundation
+
+class CNLiveShopPayController:CNLiveBaseViewController{
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+    }
+}
@@ -13,13 +13,16 @@ import CommonCrypto
 import CNLiveBusinessTools
 import SKPhotoBrowser
+//返回 Web控制器回调
+typealias cnWebControllerBackNavBlock = ()->Void
+
 //更新Web控制器导航回调
 typealias cnWebControllerUpdateNavBlock = (_ isFinish:Bool , _ titleName:String ,_ isDecidePolicy:Bool , _ urlStr:String)->Void
 //更新Web控制器 currentUrl
 typealias cnWebControllerUpdateCurrentUrlBlock = (_ currentUrl:String)->Void
-class CNWebView:UIView,WKNavigationDelegate{
+class CNWebView:UIView,WKNavigationDelegate, WKScriptMessageHandler{
     var configuration:WKWebViewConfiguration?
@@ -34,9 +37,14 @@ class CNWebView:UIView,WKNavigationDelegate{
     //CNWebController
     var isCNWebController:Bool = false//是否网页控制器
-    var webControllerUpdateNavBlock:cnWebControllerUpdateNavBlock?
+    var webControllerBackNavBlock:cnWebControllerBackNavBlock?//back返回
+
+    var webControllerUpdateNavBlock:cnWebControllerUpdateNavBlock?//刷新
     var webControllerUpdateCurrentUrlBlock:cnWebControllerUpdateCurrentUrlBlock?
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
     init(frame: CGRect, configuration: WKWebViewConfiguration ,url:URL?) {
         super.init(frame: frame)
@@ -55,20 +63,124 @@ class CNWebView:UIView,WKNavigationDelegate{
                         self.currentUrl = urlStr
                         self.cnWebView.load(URLRequest.init(url:URL(string: urlStr)!))
+                        self.configBridge()
+                        self.configBridgeRegister()
+                        self.webViewAddScriptMessageHandler()
+//                        if URL(string: urlStr)?.host == WjjH5 {
+//                            self.configBridgeRegister()
+//                            
+//                        }else if URL(string: urlStr)?.host == ManageshopH5 || URL(string: urlStr)?.host == ManagemallshopH5{
+//                            self.webViewAddScriptMessageHandler()
+//                        }
                     }
-                    self.configBridge()
-                    self.configBridgeRegister()
                 }
             }
         }
     }
+    // MARK: - 电商h5的交互回调调用
+    //电商 js 交互原生
+    func webViewAddScriptMessageHandler(){
+        self.cnWebView.configuration.userContentController.add(self, name: "pop")
+        self.cnWebView.configuration.userContentController.add(self, name: "toShare")
+        self.cnWebView.configuration.userContentController.add(self, name: "openAppPayment")
+    }
+    
+    func webViewRemoveScriptMessageHandler(){
+        self.cnWebView.configuration.userContentController.add(self, name: "pop")
+        self.cnWebView.configuration.userContentController.add(self, name: "toShare")
+        self.cnWebView.configuration.userContentController.add(self, name: "openAppPayment")
+    }
+    //电商h5的回调
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        // 初始化 body 为 nil
+        var body: Any? = nil
+        // 检查 message.body 是否不是 NSNull 并且是 NSDictionary 的实例
+        if let dictionary = message.body as? [String: Any], !dictionary.isEmpty {
+            // 获取所有的键
+            let allKeys = dictionary.keys
+            // 检查是否包含 "body" 键
+            if allKeys.contains("body") {
+                // 取出 "body" 键对应的值
+                body = dictionary["body"]
+            }
+        }
+        if message.name == "openAppPayment" {
+            // 跳转支付页面
+            if let json = body as? [String: Any] {
+                // 检查 json 是否非空
+                guard !json.isEmpty else {
+                    print("json 字典是空的")
+                    return
+                }
+                // 获取所有键
+                let allKeys = json.keys
+                // 使用可选链获取 orderNumber，如果不存在则返回空字符串
+                let orderNumber = json["orderNumber"] as? String ?? ""
+                // 获取 payModel，如果不存在或者不是字符串类型，则使用默认值 "2"
+//                let payModel = (json["payModel"] as? String) ?? "2"
+                // 现在你可以使用 orderNumber 和 payModel 进行后续操作
+                print("orderNumber: \(orderNumber)")
+                // 跳转支付页面
+                
+//                navigationViewController().pushViewController(<#T##viewController: UIViewController##UIViewController#>, animated: pushAnimated)
+            }
+        }else if message.name == "pop" {
+            //返回上一级控制器
+            if self.cnWebView.canGoBack{
+                self.cnWebView.goBack()
+            }else{
+                self.webControllerBackNavBlock?()
+            }
+        }else if message.name == "toShare" {
+            //拉起分享
+            if let json = body as? [String: Any] {
+                // 检查 json 是否非空
+                guard !json.isEmpty else {
+                    print("json 字典是空的")
+                    return
+                }
+                // 获取所有键
+                let allKeys = json.keys
+                // 使用可选链和条件绑定获取 type，如果不存在或不是数字，则使用默认值 0
+                let type: UInt = (json["type"] as? NSNumber)?.uintValue ?? 0
+                // 使用可选链获取 id 和 ext，如果不存在则返回空字符串
+                let targetId = json["id"] as? String ?? ""
+                let ext = json["ext"] as? String ?? ""
+                // 现在你可以使用 type, idStr 和 ext 进行后续操作
+                print("type: \(type)")
+                print("id: \(targetId)")
+                print("ext: \(ext)")
+                //请求分享参数
+                showLoading(message: "")
+                CNLiveShoph5ViewModel.postGetShareDataWithType(type: NSInteger(type), targetId: targetId, ext: ext) { result, status in
+                    let shareModel = result as! CNLiveShopCommentRequestShareModel
+                    
+                    let shareTitle = shareModel.share_title
+                    let shareUrl = shareModel.url
+                    let shareDesc = shareModel.share_desc
+                    let shareImage = shareModel.share_img
+                    CNLiveShareManager.showShareViewWithParam(forShareTitle: shareTitle, shareUrl: shareUrl, shareDesc: shareDesc, shareImage: shareImage, screenFull: false, hiddenWjj: true, hiddenQQ: false, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: true, formVC: currentViewController(), topImage: [], topTitles: [], platformType: .all) { title in
+                        
+                    } completerBlock: { resultType, platformType, typeString in
+                        if resultType == .succ{
+                            
+                        }
+                    }
+
+                }
+                
+            }
+        }
+    }
+    
+    // MARK: - wjjh5的交互回调调用
     func configBridge(){
         WKWebViewJavascriptBridge.enableLogging()
         self.bridge = WKWebViewJavascriptBridge(for: self.cnWebView)
         self.bridge?.setWebViewDelegate(self)
     }
-    //h5拉起原生
+    //wjjh5拉起原生
     func configBridgeRegister() -> Void {
         //h5拉起原生分享 js call oc
         self.bridge?.registerHandler("wjjylzgVideoShare", handler: { data, responseCallback in
@@ -124,15 +236,83 @@ class CNWebView:UIView,WKNavigationDelegate{
                 CNLiveShareImageManager.pushWeChatMiniProgrem(withMiniAppId: miniAppId, path: miniPath, extMsg: "", extDic: [:])
             }
         })
+        
+        //h5拉起原生跳转苹果内购
+        self.bridge?.registerHandler("wjjHtmlPullApplePay", handler: { data, responseCallback in
+            print("js call oc\(data)")
+            let dataDic = data as! Dictionary<String, Any>
+            let body = dataDic["body"] as? String
+            let notify_url = dataDic["notify_url"] as? String
+            let orderId = dataDic["orderId"] as? String
+            let prdId = dataDic["prdId"] as? String
+            let total_fee = dataDic["total_fee"] as? Int
+            print("拉起苹果内购")
+            
+        })
+        
+        //h5拉起原生支付(iOS不加,虚拟付费视频都内购)
+//        self.bridge?.registerHandler("wjjHtmlPullAppPay", handler: { data, responseCallback in
+//            print("js call oc\(data)")
+//            let dic = data as! Dictionary<String, Any>
+//            
+////            [CNLivePayCostModule showDefaultPayViwWithParamDict:htmlDict PayCostType:CNLivePayCostTypeHtml FromVC:formVC ResultBlock:^(CNLivePayCostTypeResult resultType) {
+////                if (resultType == CNLivePayCostTypeResultSucc) {
+////            NSString * orderId = [resultParam stringValueForKey:@"orderId" default:@""];
+////            [weakSelf.bridge callHandler:@"wjjHtmlPullAppPayCallback" data:@{@"orderId":orderId,@"payStatus":payResult == CNLiveContentPayResultSucc?@"0":@"1"} responseCallback:^(id responseData) {
+////                NSLog(@"成功");
+////            }];
+//            //                }
+////            }];
+//            
+//        })
+        
     }
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
+    // MARK: - 检查url
     func checkURLWithStr(urlStr:String) -> String{
         if URL(string: urlStr)?.host != WjjH5 {
-            return urlStr//不是wjjh5不作处理
+            if URL(string: urlStr)?.host == ManageshopH5 || URL(string: urlStr)?.host == ManagemallshopH5{
+                //是电商url,拼接uid
+                var str = urlStr
+                let sourceArray = str.components(separatedBy: "?")
+                if sourceArray.count == 1{
+                    //是电商h5且无参数
+                    str = String(format: "%@?uid=%@", str,UserInfoManager.shared.userInfo.uid)
+                    return str
+                }
+                //是电商h5且有参数
+                let paraArr = NSMutableArray(array: ["uid="])
+                let valueArr = NSMutableArray(array:[UserInfoManager.shared.userInfo.uid])
+                var i = 0
+                for paraStr in paraArr{
+                    let tempStr = paraStr as! String
+                    let paramStr = "&".appending(tempStr)
+                    let paramStr2 = "?".appending(tempStr)
+
+                    if str.contains(paramStr){
+                        //包含则替换 &sid=
+                        let lastStr = str.components(separatedBy: tempStr).last
+                        let lastSeparatedStr = (lastStr?.components(separatedBy: "&").first)!
+                        let oldStr = tempStr.appending(lastSeparatedStr)
+                        let tempValueStr = tempStr.appending(valueArr[i] as! String)
+                        str = str.replacingOccurrences(of: oldStr, with: tempValueStr)
+                    }else if str.contains(paramStr2){
+                        //包含则替换 &sid=
+                        let lastStr = str.components(separatedBy: tempStr).last
+                        let lastSeparatedStr = (lastStr?.components(separatedBy: "&").first)!
+                        let oldStr = tempStr.appending(lastSeparatedStr)
+                        let tempValueStr = tempStr.appending(valueArr[i] as! String)
+                        str = str.replacingOccurrences(of: oldStr, with: tempValueStr)
+                    }else{
+                        //不包含则拼接
+                        str = String(format: "%@&%@%@", str,tempStr,valueArr[i] as! String)
+                    }
+                    i = i + 1
+                }
+                return str
+            }else{
+                return urlStr//不是wjjh5且不是电商h5不作处理
+            }
         }
         var str = urlStr
         let date = Date()
@@ -16,6 +16,7 @@ import SKPhotoBrowser
 let WjjH5 = "wjjh5.cnlive.com"
 let ManageshopH5 = "manageshop.cnlive.com"
+let ManagemallshopH5 = "managemall.cnlive.com"
 class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
@@ -62,6 +63,7 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         self.webView.cnWebView.stopLoading()
         self.webView.cnWebView.navigationDelegate = nil
         self.webView.cnWebView.uiDelegate = nil
+        self.webView.webViewRemoveScriptMessageHandler()
         print("WKWebView dealloc")
     }
@@ -87,6 +89,9 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
                 }
             }
         }
+        self.webView.webControllerBackNavBlock = {
+            self.navigationController?.popViewController(animated: true)
+        }
         self.webView.webControllerUpdateCurrentUrlBlock = { [weak self] currentUrlStr in
             self!.currentUrl = currentUrlStr
         }
@@ -120,7 +120,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             bgBackView.backgroundColor = .white
             var titleTop:CGFloat = DownSlideRecommendLeftGap
-            if model.blockSubTitle.count ?? 0 > 0{
+            if model.blockSubTitle.count > 0{
                 let subtitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 17))
                 subtitleLbl.text = model.blockSubTitle
                 subtitleLbl.font = Font_12
@@ -148,20 +148,20 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
                 //小icon
                 let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
-                imageView.kf.setImage(with: URL(string:contentMdl.poster ?? ""))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster ))
                 imageView.layer.cornerRadius = 12
                 imageView.clipsToBounds = true
                 imageView.contentMode = .scaleAspectFill
                 bgBackView.addSubview(imageView)
                 let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
-                titleLbl.text = contentMdl.title ?? ""
+                titleLbl.text = contentMdl.title 
                 titleLbl.font = Font_15
                 titleLbl.textColor = HexColor("#333333")
                 bgBackView.addSubview(titleLbl)
                 let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
-                subTitleLbl.text =  contentMdl.subTitle ?? ""
+                subTitleLbl.text =  contentMdl.subTitle 
                 subTitleLbl.font = Font_12
                 subTitleLbl.textColor = HexColor("#999999")
                 bgBackView.addSubview(subTitleLbl)
@@ -170,7 +170,12 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
                 enterBtn.frame = CGRect(x: bgBackView.right-25-65, y: 0, width: 65, height: 30)
                 enterBtn.centerY = imageView.centerY
                 enterBtn.setBackgroundImage(UIImage(named: "homepage_down_enter"), for: .normal)
-                enterBtn.setTitle("进入", for: .normal)
+                if contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc{
+                    enterBtn.setTitle("播放", for: .normal)
+                }else{
+                    enterBtn.setTitle("进入", for: .normal)
+                }
+                
                 enterBtn.titleLabel?.font = BoldFont_13
                 enterBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
                 enterBtn.addTarget(self, action: #selector(enterBtnAction(_:)), for: .touchUpInside)
@@ -39,7 +39,7 @@ class CNDownSlideView:UIView{
         var url:URL?
         if (_downPath != ""){
-            url = URL.init(string: _downPath!)
+            url = URL.init(string:_downPath!)//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app"cn)//_downPath!)//
         }else{
             url = nil
         }
@@ -30,7 +30,7 @@ class CNUpSlideView:UIView{
         var url:URL?
         if (_downPath != ""){
-            url = URL.init(string: _downPath!)
+            url = URL.init(string: "http://wjjh5.cnlive.com/cnBlockMore.html?channelName=yjzg&pageId=&isShowTitle=true&blockType=28&contentType=13&title=%E5%9B%AD%E9%95%BF%E8%AF%BE%E7%A8%8B&pageName=&moreUrl=https%3A%2F%2Fcmsapi.cnlive.com%2FcontentApi%2FgetBlockContents%3FblockId%3D12165")//_downPath!)//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app")//
         }else{
             url = nil
         }
+//
+//  CNLiveShoph5ViewModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/8.
+//  电商h5请求
+
+import Foundation
+import CNLiveRequestBastKit
+
+class CNLiveShoph5ViewModel:NSObject{
+    /// 获取分享数据
+    /// @param type 分享类型 1 文创商品详情 2普通商品详情 3主题活动列表 4店铺首页 5达人详情 6动态详情 7达人列表 8礼物详情 9优选库首页 10电影作品详情 11电影作品列表 12 服务号详情 13 抽奖详情 14 电影作品活动 15电影作品个人中心 16 新店铺首页 17 大众体育活动列表 18 活动首页分享 19 抽奖活动 20抽奖活动列表 21开箱子活动 22崇学向善活动页面 23获取大众体育类型列表 24活动首页 25折扣活动列表分享 26折扣活动分享商品 27崇学向善活动页面2 28领头雁首页 29领头雁成绩查询 30领头雁证书分享 31武汉活动小家音响 32抗议扶贫活动 33领头雁新闻分享 34领头雁招募 35美食中国 36公共加载页面 37领头雁电商活动 38活动专区 39成长活动 40成长商品详情 41成长活动订单列表
+    /// @param targetId 目标id
+    /// @param ext 后台要求的附加参数
+    /// @param result 结果
+    static func postGetShareDataWithType(type:NSInteger,targetId:String,ext:String,resultBlock: @escaping downSlideResultBlock) {
+        let param = NSMutableDictionary()
+        param.setValue("\(type)", forKey: "type")
+        param.setValue(targetId, forKey: "id")
+        param.setValue(ext, forKey: "ext")
+        
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjShopUrl+"/Api/Index3/getShareData", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let dataDic = resp["data"] as! NSDictionary
+                let shopDetailModel =  newDictionaryToModel(dataDic as! [String : Any], CNLiveShopCommentRequestShareModel.self)
+                resultBlock(shopDetailModel,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
+   
+    
+    
+}
@@ -39,14 +39,13 @@ class CNLiveDownSlideModel: BaseModel {
 }
-//下滑tableview背景颜色
 let kCNDownSlideContentsModelModel1: String = "1"
 let kCNDownSlideContentsModelModel2: String = "2"
 let kCNDownSlideContentsModelModel3: String = "3"
 let kCNDownSlideContentsModelModel4: String = "4"
 let kCNDownSlideContentsModelModelAlbum: String = "album"
 let kCNDownSlideContentsModelModelAlbum_video: String = "album_video"
-let kCNDownSlideContentsModelModelAlbum_ugc: String = "album_ugc"
+let kCNDownSlideContentsModelModelAlbum_ugc: String = "album_ugc"//短剧
 let kCNDownSlideContentsModelModelServing: String = "serving"//微信小程序
@@ -43,6 +43,7 @@ class CNLiveDownSlideTool:NSObject{
             }
         }else if (model == kCNDownSlideContentsModelModel3) || (model == kCNDownSlideContentsModelModel4){
             let webVC = CNWebViewController()
+//            webVC.url = URL(string: "http://wjjh5.cnlive.com/cnBlockMore.html?channelName=yjzg&pageId=&isShowTitle=true&blockType=28&contentType=13&title=%E5%9B%AD%E9%95%BF%E8%AF%BE%E7%A8%8B&pageName=&moreUrl=https%3A%2F%2Fcmsapi.cnlive.com%2FcontentApi%2FgetBlockContents%3FblockId%3D12165")//"https://managemall.cnlive.com/html/mall/1/#/pages/main/goodsList/goodsList?scene=app")
             webVC.url = URL(string: thirdUrl)
             if controller != nil{
                 controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)