Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

liushiyu
2 parents 4bfe3ea4 ecaa7464
Showing 25 changed files with 457 additions and 163 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/Controller/ShopDownDetail/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/CNCustomIndexView.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/MainView/CNMainView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomePageAnimationTransition.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDuanJuDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumModel.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
@@ -92,6 +92,7 @@
 		1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */; };
 		1938BD452B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */; };
 		1938BD472B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */; };
+		194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 194455A02B6B3310006C5A2A /* CNWebView.swift */; };
 		19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */; };
 		19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
 		19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
@@ -355,6 +356,7 @@
 		1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomepageDuanJuDetailViewController.swift; sourceTree = "<group>"; };
 		1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDuanjuTitleCell.swift; sourceTree = "<group>"; };
 		1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIntegralAlertTool.swift; sourceTree = "<group>"; };
+		194455A02B6B3310006C5A2A /* CNWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNWebView.swift; sourceTree = "<group>"; };
 		19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailBtnsCell.swift; sourceTree = "<group>"; };
 		19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
 		19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
@@ -738,6 +740,7 @@
 			isa = PBXGroup;
 			children = (
 				19123FC02ABC11170075C883 /* CNWebViewController.swift */,
+				194455A02B6B3310006C5A2A /* CNWebView.swift */,
 			);
 			path = WebController;
 			sourceTree = "<group>";
@@ -1808,6 +1811,7 @@
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				79BB96A62AF21E2800AEA4AC /* CNLiveShopOrderDetailViewController.swift in Sources */,
+				194455A12B6B3310006C5A2A /* CNWebView.swift in Sources */,
 				1938BD2C2B4801A700390A34 /* CNHomePageAnimationTransition.swift in Sources */,
 				191733452B284DCD007BCC04 /* CNLiveShopCouponListModel.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
@@ -2074,7 +2078,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.5.24.01.30.17;
+				CURRENT_PROJECT_VERSION = 1.0.6.24.02.04.18;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2128,7 +2132,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "元码";
+				INFOPLIST_KEY_CFBundleDisplayName = "中国网元码";
 				INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用上传头像、意见反馈、资质审核等功能";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
 				INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
@@ -2146,7 +2150,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -2328,7 +2332,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.5.24.01.30.17;
+				CURRENT_PROJECT_VERSION = 1.0.6.24.02.04.18;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2382,7 +2386,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "元码";
+				INFOPLIST_KEY_CFBundleDisplayName = "中国网元码";
 				INFOPLIST_KEY_NSCameraUsageDescription = "需要允许开启相机才能使用上传头像、意见反馈、资质审核等功能";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
 				INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "需要允许使用您的位置信息才能获取您所在城市";
@@ -2400,7 +2404,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -27,6 +27,8 @@ enum CNLiveIntegralPayStatus {
 }
 typealias integralStatusChangeBlock = (_ integralPayStatus:CNLiveIntegralPayStatus) -> Void
+let integralAlertToolTag = 10000
+
 class CNLiveIntegralAlertTool:NSObject{
     static let shared = CNLiveIntegralAlertTool()
@@ -61,7 +63,7 @@ class CNLiveIntegralAlertTool:NSObject{
         bottomBgView.backgroundColor = HexColor("#FFFFFF")
         bottomBgView.layer.cornerRadius = 9
         bottomBgView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-        bottomBgView.tag = 10000
+        bottomBgView.tag = integralAlertToolTag
         return bottomBgView
     }()
@@ -181,7 +183,7 @@ class CNLiveIntegralAlertTool:NSObject{
     //隐藏积分购买弹窗
     func hiddenIntegralAlert(){
         delegate.window?.subviews.forEach({ view in
-            if view.tag == 10000{
+            if view.tag == integralAlertToolTag{
                 UIView.animate(withDuration: 0.25) {
                     view.removeFromSuperview()
                     self.bgBtnView.removeFromSuperview()
@@ -91,4 +91,8 @@ extension Notification.Name {
         //销毁播放器通知
         public static let kPlayerDestroyNotification = Notification.Name("kPlayerDestroyNotification")
     }
+    struct AuthVNumPageManage {
+        //认证页垂直方向是哪个页面的通知 1上面页 2中间页 3下面页
+        public static let kAuthVNumPageChangedNotification = Notification.Name("kAuthVNumPageChangedNotification")
+    }
 }
@@ -223,11 +223,22 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         //我的身份排序后刷新
         NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
+        //认证页垂直方向是哪个页面的通知
+        NotificationCenter.default.addObserver(self, selector: #selector(kAuthVNumPageChangedNotificationAction), name: Notification.Name.AuthVNumPageManage.kAuthVNumPageChangedNotification, object: nil)
+        
 //        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+//        print("uid = ",UserInfoManager.shared.userInfo.uid)
+        
+    }
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        self.view.height = KSreenHeight
+        self.topNavView.isHidden = true
+        
         switch vNumPage {
         case .VNumPageMain://中间主页
                 self.tabBarController?.tabBar.isHidden = false
@@ -236,16 +247,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         case .VNumPageDown://下滑页
                 self.tabBarController?.tabBar.isHidden = true
         }
-        
-        
-        print("uid = ",UserInfoManager.shared.userInfo.uid)
-        
-    }
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        self.view.height = KSreenHeight
-        
-        self.topNavView.isHidden = true
     }
     deinit {
@@ -309,6 +310,18 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.getApplyShopInfo()
         print("DSShopDarenAuthResultNotificationAction")
     }
+    // MARK: - 刷新当前垂直是哪个页面
+    @objc func kAuthVNumPageChangedNotificationAction(noti:Notification){
+        let dict = (noti.userInfo ?? ["":""]) as! [String :Any]
+        let num = dict["AuthVNumPage"] as! Int
+        if num == 1{
+            self.vNumPage = .VNumPageDown
+        }else if num == 2{
+            self.vNumPage = .VNumPageMain
+        }else if num == 3{
+            self.vNumPage = .VNumPageUp
+        }
+    }
@@ -418,8 +431,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         bannerView?.superScrollView = flowView.scrollView
         bannerView?.associatedVCView = self.view
         bannerView?.delegate  = self
-        bannerView?.upSlideView.webView.navigationDelegate = self
-        bannerView?.downSlideView.webView.navigationDelegate = self
         return bannerView
     }
@@ -523,10 +534,13 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             //慢拖动时处理
             if scrollView.contentOffset.y > 0 && scrollView.contentOffset.y < KSreenHeight/2{
                 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: 0), animated: true)
+                self.vNumPage = .VNumPageDown
             }else if scrollView.contentOffset.y >= KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight+KSreenHeight/2{
                 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight), animated: true)
+                self.vNumPage = .VNumPageMain
             }else if scrollView.contentOffset.y >= KSreenHeight+KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight*2+KSreenHeight/2{
                 scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight*2), animated: true)
+                self.vNumPage = .VNumPageUp
             }else{
             }
@@ -537,7 +551,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     func customIndexViewDidEndScroll(scrollView: UIScrollView) {
         print("EndScroll\(scrollView.contentOffset.y)")
-
+        
         if scrollView.contentOffset.y == 0{//下滑页
             self.tabBarController?.tabBar.isHidden = true
             vNumPage = .VNumPageDown
@@ -564,64 +578,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
         }
     }
-    
-    // MARK: - WKWebViewDelegate
-    // 页面开始加载时调用
-    func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
-        print("didStartProvisionalNavigation")
-    }
-    // 当内容开始返回时调用
-    func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
-        print("didCommit")
-    }
-    // 页面加载完成之后调用
-    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        print("didFinish")
-    }
-    // 页面加载失败时调用
-    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        print("didFailProvisionalNavigation")
-    }
-    // 接收到服务器跳转请求之后调用
-    func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
-        print("didReceiveServerRedirectForProvisionalNavigation")
-    }
-    // 在收到响应后，决定是否跳转 -> 默认允许
-    func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
-        print("decidePolicyFor")
-        //允许跳转
-        decisionHandler(.allow)
-        //不允许跳转
-//        decisionHandler(.cancel)
-    }
-    // 在发送请求之前，决定是否跳转 -> 默认允许
-    @available(iOS 13.0, *)
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void) {
-        print("decidePolicyFor")
-        let url:String = navigationAction.request.url!.absoluteString
-        print("navigationAction:\(navigationAction.navigationType.rawValue)")
-        print(url)
-        if(navigationAction.navigationType == .linkActivated){
-            let webVC =  CNWebViewController()
-            webVC.url = URL(string: url)
-            navigationViewController().pushViewController(webVC, animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(webVC, animated: pushAnimated)
-            decisionHandler(.cancel, preferences)
-            return
-        }else if(navigationAction.navigationType == .other){
-            if(url.contains("wjjh5.cnlive.com")){
-                
-                decisionHandler(.allow, preferences)
-                return
-            }else
-            {
-                decisionHandler(.cancel, preferences)
-                return
-            }
-        }
-        decisionHandler(.allow, preferences)
-    }
-    
+        
     //MARK: - 网络请求获取身份列表
     func getUserIdentityApi()
     {
@@ -100,7 +100,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         self.view.layer.masksToBounds = true
         self.view.backgroundColor = .white
         self.view.addSubview(self.tableView)
-        self.tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-KStatusBarHeight)
+        self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
         view.addSubview(closeBtn)
         view.addGestureRecognizer(dismissPanGesture)
     }
@@ -217,6 +217,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                     return cell
                 }
                 cell.iconImgView.image = self.cell.bgImageView.image
+                cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
                 return cell
             }else if self.cellType == .course || self.cellType == .playletToCourse{
@@ -239,6 +240,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                         return cell
                     }
                     cell.iconImgView.image = self.cell.bgImageView.image
+                    cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
                     return cell
                 }
@@ -269,10 +271,10 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
             }else if self.cellType == .course || self.cellType == .playletToCourse{
                 if self.slideModel?.type == SlideModelTypeAllCourse12{
                     //全部课程
-                    return allCourseCellHeight
+                    return allCourseCellHeight+get_system_statusBar_height()
                 }else if self.slideModel?.type == SlideModelTypeOneCourse75{
                     //大图课程
-                    return KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)
+                    return KSreenWidth
                 }
             }
         }else{
@@ -281,6 +283,37 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         return 75
     }
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        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
+
+                }else if self.slideModel?.type == SlideModelTypeOneCourse75{
+                    //大图课程,跳转h5
+                    CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
+                }
+            }
+        }else{
+            //视频跳转播放页;课程跳转h5
+            if albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc{
+                //视频
+                //短剧-跳转短剧播放页
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
+                
+            }else if albumModel.model == "1" || albumModel.model == "2" || albumModel.model == "3" || albumModel.model == "4"{
+                //课程
+                CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
+            }else{
+                
+            }
+        }
+    }
+    
     // MARK: - 在追短剧--获取全部专辑列表
     func getBlockContents(page:NSInteger){
         showLoading(message: "")
@@ -165,7 +165,7 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
         if slideModel.contents.first?.model ?? "0" == "1" || slideModel.contents.first?.model ?? "0" == "2" || slideModel.contents.first?.model ?? "0" == "3" || slideModel.contents.first?.model ?? "0" == "4"{
             cellType = .course
-        }else if slideModel.contents.first?.model ?? "0" == "album_ugc"{
+        }else if slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModelAlbum_ugc{
             cellType = .playlet
         }else{
             //新类型
@@ -26,6 +26,10 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         let upSlideView = self.view.superview as! CNUpSlideView
         let scrollView = upSlideView.superview as! UIScrollView
         scrollView.setContentOffset(CGPoint(x: 0, y: scrollView.height), animated: true)
+        
+        let result:Dictionary = ["AuthVNumPage":2]
+        NotificationCenter.default.post(name:  Notification.Name.AuthVNumPageManage.kAuthVNumPageChangedNotification, object: nil, userInfo: result)
+        
         currentViewController()?.tabBarController?.tabBar.isHidden = false
         let metaVC = currentViewController() as! CNMetaCodeHomePageController
@@ -91,6 +95,9 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         scrollView.setContentOffset(CGPoint(x: 0, y: scrollView.height), animated: true)
         currentViewController()?.tabBarController?.tabBar.isHidden = false
+        let result:Dictionary = ["AuthVNumPage":2]
+        NotificationCenter.default.post(name:  Notification.Name.AuthVNumPageManage.kAuthVNumPageChangedNotification, object: nil, userInfo: result)
+        
         let metaVC = currentViewController() as! CNMetaCodeHomePageController
         let index = metaVC.pageFlowView.currentPageIndex
         let customIndexView = metaVC.pageFlowView.viewWithTag(100+index) as! CNCustomIndexView
+//
+//  CNWebView.swift
+//  metaCode
+//
+//  Created by zx on 2024/2/1.
+//
+
+import Foundation
+import WebKit
+import WebViewJavascriptBridge
+import CNLiveShareToolKit
+import CommonCrypto
+import CNLiveBusinessTools
+
+class CNWebView:UIView,WKNavigationDelegate{
+    
+    var configuration:WKWebViewConfiguration?
+    
+    lazy var cnWebView :WKWebView = {
+        let cnWebView = WKWebView(frame: self.bounds, configuration: self.configuration!)
+        return cnWebView
+    }()
+
+    
+    var webUrl:URL?//初始URL
+    var currentUrl:String = ""//当前网页的url
+    var bridge:WKWebViewJavascriptBridge?
+    
+    init(frame: CGRect, configuration: WKWebViewConfiguration ,url:URL?) {
+        super.init(frame: frame)
+        self.configuration = configuration
+        self.addSubview(self.cnWebView)
+        self.webUrl = url
+        self.cnWebView.evaluateJavaScript("navigator.userAgent") { [self] result, error in
+            let userAgent = result as! String
+            if error == nil && userAgent.count > 0 {
+                if !userAgent.contains(CNLiveMCEnvironmentManager.shared.base_web_UA) {
+                    let newUserAgent = userAgent + CNLiveMCEnvironmentManager.shared.base_web_UA
+                    self.cnWebView.customUserAgent = newUserAgent
+                    
+                    if (self.webUrl != nil){
+                        let urlStr = self.checkURLWithStr(urlStr: self.webUrl!.absoluteString)
+                        self.currentUrl = urlStr
+
+                        self.cnWebView.load(URLRequest.init(url:URL(string: urlStr)!))
+                    }
+                    self.configBridge()
+                    self.configBridgeRegister()
+                }
+            }
+        }
+    }
+    
+    func configBridge(){
+        WKWebViewJavascriptBridge.enableLogging()
+        self.bridge = WKWebViewJavascriptBridge(for: self.cnWebView)
+        self.bridge?.setWebViewDelegate(self)
+    }
+    //h5拉起原生分享 js call oc
+    func configBridgeRegister() -> Void {
+        self.bridge?.registerHandler("wjjylzgVideoShare", handler: { data, responseCallback in
+//            print("js call oc\(data)")
+            let dic = data as! Dictionary<String, String>
+            CNLiveShareManager.showShareViewWithParam(forShareTitle: dic["title"], shareUrl: dic["shareUrl"], shareDesc: dic["subTitle"], shareImage: dic["cover"], 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{
+                    
+                }
+            }
+
+        })
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func checkURLWithStr(urlStr:String) -> String{
+        if URL(string: urlStr)?.host != WjjH5 {
+            return urlStr//不是wjjh5不作处理
+        }
+        var str = urlStr
+        let date = Date()
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyyMMdd"
+        let dateStr = formatter.string(from: date)
+        let sidStr = String(format: "%@%@", UserInfoManager.shared.userInfo.uid,dateStr)
+        let signStr = sidStr.crypt(operation:  CCOperation(kCCEncrypt), key: CNLiveMCEnvironmentManager.shared.appKey)
+        //看是 appKey还是appKeywjj
+        let sidSignStr = (signStr ?? "").isEmpty ?  "" : signStr
+        let sourceArray = str.components(separatedBy: "?")
+        let buildVersion = Bundle.main.infoDictionary!["CFBundleVersion"] as! String
+        let appVersion = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
+        let uuid = CNLiveBusinessTools.getUidForStat(Date())
+        if sourceArray.count == 1{
+            //是wjjh5且无参数
+            str = String(format: "%@?shareSid=%@&sid=%@&plat=i&ver=%@&version=%@&wjjFrom=apple&wjjUUID=%@&appId=%@&voteId=%@&wjjToken=%@", str,UserInfoManager.shared.userInfo.uid,UserInfoManager.shared.userInfo.uid,buildVersion,appVersion,uuid,CNLiveMCEnvironmentManager.shared.appId,sidSignStr!,UserInfoManager.shared.userInfo.token)
+            return str
+        }
+        //是wjjh5且有参数
+        let paraArr = NSMutableArray(array: ["shareSid=","sid=","plat=","ver=","version=","wjjFrom=","wjjUUID=","appId=","voteId=","wjjToken="])
+        let valueArr = NSMutableArray(array:[UserInfoManager.shared.userInfo.uid,UserInfoManager.shared.userInfo.uid,"i",buildVersion,appVersion,"apple",uuid,CNLiveMCEnvironmentManager.shared.appId,sidSignStr!,UserInfoManager.shared.userInfo.token])
+        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
+    }
+    
+    // MARK: - WKWebViewDelegate
+    // 页面开始加载时调用
+    func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
+        print("didStartProvisionalNavigation")
+    }
+    // 当内容开始返回时调用
+    func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
+        print("didCommit")
+    }
+        
+    // 页面加载完成之后调用
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        print("didFinish")
+//        titleName = webView.title!
+    }
+    // 页面加载失败时调用
+    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        print("didFailProvisionalNavigation")
+    }
+    // 接收到服务器跳转请求之后调用
+    func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
+        print("didReceiveServerRedirectForProvisionalNavigation")
+    }
+    // 在收到响应后，决定是否跳转 -> 默认允许
+    func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
+        
+        print("decidePolicyFornavigationResponse")
+                
+        //允许跳转
+        decisionHandler(.allow)
+        //不允许跳转
+        //        decisionHandler(.cancel)
+    }
+    // 在发送请求之前，决定是否跳转 -> 默认允许
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
+        print("decidePolicyFornavigationAction")
+        
+        var urlStr = (navigationAction.request.url?.absoluteString)!
+                
+        if navigationAction.request.url?.host == WjjH5 {
+
+//            if urlStr.contains("&isWjjReport=true") || urlStr.contains("?isWjjReport=true"){
+//                self.rightNavBtns = [self.moreNavBtn]
+//                self.moreNavBtn.isHidden = false
+//            }else{
+//                self.moreNavBtn.isHidden = true
+//            }
+            
+            urlStr = self.checkURLWithStr(urlStr: urlStr)
+            self.currentUrl = urlStr
+        }
+        
+        if navigationAction.navigationType == .other{
+            //跳转Appstore
+            let url = URL(string: "https://apps.apple.com/cn/app/%E7%BD%91%E5%AE%B6%E5%AE%B6%E5%95%86%E5%AE%B6%E7%89%88/id1337575497")
+            if url == navigationAction.request.url {
+                if UIApplication.shared.canOpenURL(url!) { UIApplication.shared.open(url!, options: [:], completionHandler: nil)
+                }
+            }
+        }else if navigationAction.navigationType == .linkActivated{
+            let webVC =  CNWebViewController()
+            webVC.url = URL(string: urlStr)
+            navigationViewController().pushViewController(webVC, animated: true)
+            decisionHandler(.cancel)
+            return
+        }
+        
+        decisionHandler(.allow)
+    }
+}
@@ -14,6 +14,7 @@ import CNLiveBusinessTools
 let WjjH5 = "wjjh5.cnlive.com"
+let ManageshopH5 = "manageshop.cnlive.com"
 class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
@@ -265,7 +266,14 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
                 }
             }
         }else if navigationAction.navigationType == .linkActivated{
-
+            
+            //以后可判断h5地址 ,可跳转原生页面或网页
+            //暂时只跳h5
+            let webVC =  CNWebViewController()
+            webVC.url = URL(string: urlStr)
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+            decisionHandler(.cancel)
+            return
         }
         decisionHandler(.allow)
@@ -121,8 +121,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             self.upSlideView.type = _idModel?.downType
             self.upSlideView.downPath = _idModel?.downPath
-            self.downSlideView.type = _idModel?.upType
-            self.downSlideView.downPath = _idModel?.upPath
+            self.downSlideView.type =  _idModel?.upType
+            self.downSlideView.downPath =  _idModel?.upPath
             self.topNavView.setTitleString(title:(_idModel?.name)!)
@@ -192,6 +192,9 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         collectionView.backAction = {[weak self] in
             self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
             currentViewController()?.tabBarController?.tabBar.isHidden = false
+            let vc = currentViewController() as! CNMetaCodeHomePageController
+            vc.vNumPage = .VNumPageMain
+
             self?.superScrollView?.isScrollEnabled = true
             let time = DispatchTime.now() + 0.5
@@ -236,6 +239,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true)
             self?.superScrollView?.isScrollEnabled = true
             currentViewController()?.tabBarController?.tabBar.isHidden = false
+            let vc = currentViewController() as! CNMetaCodeHomePageController
+            vc.vNumPage = .VNumPageMain
         }
         return topNavView
     }()
@@ -311,8 +316,37 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         /**隐藏左右view*/
         let fabsOffset: CGFloat = abs(defaultOffset - currentOffset)
-        let leftView:UIView? = self.superScrollView?.viewWithTag(tag-1) 
-        let rightView:UIView? = self.superScrollView?.viewWithTag(tag+1)
+        var leftView:CNCustomIndexView? = self.superScrollView?.viewWithTag(tag-1) as? CNCustomIndexView
+        var rightView:CNCustomIndexView? = self.superScrollView?.viewWithTag(tag+1) as? CNCustomIndexView
+        if leftView == nil{
+            if let haveSub = self.superScrollView?.subviews.filter({ tempLeftView in
+                if tempLeftView is CNCustomIndexView && tempLeftView.tag == tag-1{
+                    leftView = (tempLeftView as! CNCustomIndexView)
+                    return true
+                }else{
+                    return false
+                }
+            }){
+//                print("leftView\(leftView)")
+            }else{
+                
+            }
+        }
+        if rightView == nil{
+            if let haveSub = self.superScrollView?.subviews.filter({ tempRightView in
+                if tempRightView is CNCustomIndexView  && tempRightView.tag == tag+1{
+                    rightView = (tempRightView as! CNCustomIndexView)
+                    return true
+                }else{
+                    return false
+                }
+            }){
+//                print("rightView\(rightView)")
+            }else{
+                
+            }
+        }
+        
         if fabsOffset > 70 {
             leftView?.alpha = 0
             rightView?.alpha = 0
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/16.
-//  单课程大图专辑
+//  单课程大图专辑 | 全部课程列表
 import Foundation
@@ -128,6 +128,9 @@ 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.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))
@@ -137,7 +140,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
                 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)
@@ -202,7 +205,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             let moreLabel = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: 15, width: DownSlideSingleCourseW - 50 - DownSlideRecommendLeftGap   , height: 30))
             moreLabel.text = model.blockName ?? "更多"
-            moreLabel.font = Font_15
+            moreLabel.font = BoldFont_15_Fit
             moreLabel.textColor = HexColor("#333333")
             singleCourseBottomView.addSubview(moreLabel)
@@ -23,28 +23,30 @@ class CNDownSlideView:UIView{
         let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height))
         contentView.backgroundColor = UIColor.clear
         contentView.isUserInteractionEnabled = true
-//        let path:UIBezierPath = UIBezierPath.init(roundedRect: contentView.bounds, byRoundingCorners: [.bottomLeft, .bottomRight], cornerRadii: CGSize.init(width: 20, height: 20))
-//
-//        let maskLayer:CAShapeLayer = CAShapeLayer()
-//        maskLayer.frame = contentView.bounds
-//        maskLayer.path  = path.cgPath
-//        contentView.layer.mask = maskLayer
-        
-//        let imageView = UIImageView(frame: CGRect(x: 10, y: 20, width: contentView.width - 20, height: contentView.height - 40))
-//        imageView.image = UIImage(named: "homePage_collectMoneyImage")
-//        contentView.addSubview(imageView)
-        
         return contentView
     }()
     //h5网页
-    // TODO: H:-10原为self.height-KTabBarHeight,但有白条,改成了-10
-    lazy var webView: WKWebView = {
-        let webView = WKWebView.init(frame: CGRectMake(0, 0, self.width, self.height-KTabBarHeight-10))
-        webView.scrollView.showsVerticalScrollIndicator = false
-        webView.scrollView.showsHorizontalScrollIndicator = false
-        webView.backgroundColor = .clear
-        webView.isOpaque = false
+    lazy var webView: CNWebView = {
+        let configuration = WKWebViewConfiguration()
+        configuration.allowsInlineMediaPlayback = true
+        let preferences = WKPreferences()
+        preferences.javaScriptCanOpenWindowsAutomatically = true
+        preferences.javaScriptEnabled = true
+        configuration.preferences.minimumFontSize = 0.0
+        configuration.preferences = preferences
+        configuration.userContentController = WKUserContentController()
+
+        var url:URL?
+        if (_downPath != ""){
+            url = URL.init(string: _downPath!)
+        }else{
+            url = nil
+        }
+        let webView = CNWebView(frame: CGRectMake(0, 0, Width, self.height-DownSlideBottomViewHeight), configuration: configuration,url: url)
+        
+        webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
+        webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
         return webView
     }()
@@ -74,12 +76,9 @@ class CNDownSlideView:UIView{
 //            self.subviews.forEach { view in
 //                view.removeFromSuperview()
 //            }//会删除button
+            
             if(type == UpDownTypeH5){
                 self.addSubview(self.webView)
-                if (_downPath != ""){
-                    let webUrl: URL! = URL.init(string: _downPath!)
-                    webView.load(URLRequest.init(url:webUrl))
-                }
             }else if(type == UpDownTypePage){
                 self.addSubview(self.upSlideVC.view)
                 self.upSlideVC.downPath = _downPath
@@ -108,18 +107,6 @@ class CNDownSlideView:UIView{
         let bottomView = UIView(frame: CGRect(x:0, y:self.height - DownSlideBottomViewHeight, width: self.width, height: DownSlideBottomViewHeight))
         bottomView.backgroundColor = HexColor("#FFFFFF")
         bottomView.isHidden = true
-        
-//        let path:UIBezierPath = UIBezierPath.init(roundedRect: bottomView.bounds, byRoundingCorners: [.topLeft, .topRight], cornerRadii: CGSize.init(width: 50, height: 50))
-//        let maskLayer:CAShapeLayer = CAShapeLayer()
-//        maskLayer.frame = bottomView.bounds
-//        maskLayer.path  = path.cgPath
-//        bottomView.layer.mask = maskLayer
-//        bottomView.clipsToBounds = true
-        
-//        bottomView.layer.cornerRadius = 50
-//        bottomView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-        
-        
         // 设置阴影效果
         bottomView.layer.masksToBounds = false
         //定义view的阴影颜色
@@ -140,6 +140,7 @@ class CNFrontMainView : UIView{
         enterpriseTipsLabel.font = Font(9)
         enterpriseTipsLabel.text = "企业认证适合企业、个体工商户申请"
         enterpriseTipsLabel.adjustsFontSizeToFitWidth=true
+        enterpriseTipsLabel.isHidden = true
         return enterpriseTipsLabel
     }()
     ///未认证-机构认证提示
@@ -150,6 +151,7 @@ class CNFrontMainView : UIView{
         agencyTipsLabel.font = Font(9)
         agencyTipsLabel.text = "机构认证适合国家机构、社会组织、高校等申请"
         agencyTipsLabel.adjustsFontSizeToFitWidth=true
+        agencyTipsLabel.isHidden = true
         return agencyTipsLabel
     }()
@@ -414,6 +416,8 @@ class CNFrontMainView : UIView{
                 if idModel?.id == 9{
                     //电商
                     //隐藏上滑下滑gif
+                    self.agencyTipsLabel.isHidden = true
+                    self.enterpriseTipsLabel.isHidden = true
                     upMoreGIF.isHidden = true
                     downMoreGIF.isHidden = true
                     self.addStandBtn.isHidden = false
@@ -691,6 +695,10 @@ class CNFrontMainView : UIView{
             let customIndexView = ((self.superview as! CNMainView).superview as! UIScrollView).superview as! CNCustomIndexView
             let baseScrollView = customIndexView.baseScrollView
             baseScrollView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
+            
+            let result:Dictionary = ["AuthVNumPage":1]
+            NotificationCenter.default.post(name:  Notification.Name.AuthVNumPageManage.kAuthVNumPageChangedNotification, object: nil, userInfo: result)
+            
             currentViewController()?.tabBarController?.tabBar.isHidden = false
             customIndexView.superScrollView?.isScrollEnabled = true
@@ -703,7 +711,11 @@ class CNFrontMainView : UIView{
         }else if self.standInfoSubTitleModel?.jumpType == UpDownTypeAuthAlertDown{
             let customIndexView = ((self.superview as! CNMainView).superview as! UIScrollView).superview as! CNCustomIndexView
             let baseScrollView = customIndexView.baseScrollView
-            baseScrollView.setContentOffset(CGPoint(x: 0, y: (baseScrollView.height*2+KNavigationHeight)), animated: true)
+            baseScrollView.setContentOffset(CGPoint(x: 0, y: (baseScrollView.height*2)), animated: true)
+            
+            let result:Dictionary = ["AuthVNumPage":3]
+            NotificationCenter.default.post(name:  Notification.Name.AuthVNumPageManage.kAuthVNumPageChangedNotification, object: nil, userInfo: result)
+            
             currentViewController()?.tabBarController?.tabBar.isHidden = false
             customIndexView.superScrollView?.isScrollEnabled = true
@@ -18,14 +18,30 @@ let UpDownTypeAuthAlertDown = 6///下滑地址 认证-弹窗
 ///上滑显示的VIew
 class CNUpSlideView:UIView{
-    lazy var webView: WKWebView = {
-        let webView = WKWebView.init(frame: CGRectMake(10, KNavigationHeight+KStatusBarHeight+10, self.width - 20, self.height-KNavigationHeight-KStatusBarHeight-10))
-        webView.scrollView.showsVerticalScrollIndicator = false
-        webView.scrollView.showsHorizontalScrollIndicator = false
-        webView.backgroundColor = .clear
-        webView.layer.cornerRadius = 29
-        webView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-        webView.clipsToBounds = true
+    lazy var webView: CNWebView = {
+        let configuration = WKWebViewConfiguration()
+        configuration.allowsInlineMediaPlayback = true
+        let preferences = WKPreferences()
+        preferences.javaScriptCanOpenWindowsAutomatically = true
+        preferences.javaScriptEnabled = true
+        configuration.preferences.minimumFontSize = 0.0
+        configuration.preferences = preferences
+        configuration.userContentController = WKUserContentController()
+
+        var url:URL?
+        if (_downPath != ""){
+            url = URL.init(string: _downPath!)
+        }else{
+            url = nil
+        }
+        let webView = CNWebView(frame: CGRectMake(10, KNavigationHeight+KStatusBarHeight+10, self.width - 20, self.height-KNavigationHeight-KStatusBarHeight-10), configuration: configuration,url: url)
+        
+        webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
+        webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
+        webView.cnWebView.backgroundColor = .clear
+        webView.cnWebView.layer.cornerRadius = 29
+        webView.cnWebView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        webView.cnWebView.clipsToBounds = true
         return webView
     }()
@@ -51,10 +67,6 @@ class CNUpSlideView:UIView{
             }
             if(type == UpDownTypeH5){
                 self.addSubview(self.webView)
-                if (_downPath != ""){
-                    let webUrl: URL! = URL.init(string: _downPath!)
-                    webView.load(URLRequest.init(url:webUrl))
-                }
             }
             else if(type == UpDownTypePage){
@@ -9,7 +9,7 @@ import Foundation
 import MJRefresh
 class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{
-    //下滑tableview背景颜色
+    //下滑tableview背景颜色 浅灰色
     let kCNDownSlideBackgroundColorHex: String = "#F7F8FA"
     ///CNliveDownSlideModel Type
@@ -62,7 +62,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
     }
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.backgroundColor = .white
+        self.view.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         view.addSubview(tableView)
         tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-DownSlideBottomViewHeight-KStatusBarHeight)
         self.addRefreshView()
@@ -221,7 +221,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
             if slideModel.contents.first?.model ?? "0" == "1" || slideModel.contents.first?.model ?? "0" == "2" || slideModel.contents.first?.model ?? "0" == "3" || slideModel.contents.first?.model ?? "0" == "4"{
                 cellType = .playletToCourse
-            }else if slideModel.contents.first?.model ?? "0" == "album_ugc"{
+            }else if slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModelAlbum_ugc{
                 cellType = .playlet
             }else{
                 //新类型
@@ -69,12 +69,12 @@ extension CNHomePageAnimationTransition: UIViewControllerAnimatedTransitioning {
         if fromNaviVC.topViewController is CNHomepageDuanJuDetailViewController{
             guard let selectedCell = toVC.selectedDuanjuCell else { return }
             let fromVC = fromNaviVC.topViewController as! CNHomepageDuanJuDetailViewController
-            UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+            UIView.animate(withDuration: transitonDuration - 0.8, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
                 let frame = selectedCell.convert(selectedCell.totalView.frame, to: toVC.view)
                 fromVC.view.frame = frame
                 fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
                 fromVC.closeBtn.alpha = 0
-                
+                fromVC.tableView.alpha = 0
             }) { (completed) in
                 transitionContext.completeTransition(completed)
             }
@@ -137,6 +137,14 @@ class CNHomepageDuanJuDetailViewController: CNLiveBaseViewController  ,UITableVi
             return cell
         }
     }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumMsgModel
+        //短剧-跳转短剧播放页
+        navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.albumId), animated: pushAnimated)
+
+    }
+    
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0{
             return 45//10+30+5
@@ -167,7 +167,7 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0{
-            return 15+147+20+self.jianjieLblHeight+25+39+23.5+15.5
+            return 15+147+20+self.jianjieLblHeight+25+39+23.5+15.5+18.5
         }else{
             return 75+12*2
         }
@@ -36,7 +36,7 @@ class CNLiveAlbumModel:BaseModel{
     var contentId = ""
     var pid = ""
     var tag = ""
-    var model = ""
+    var model = ""//1,2,3,4课程 album_ugc短剧
     var thirdUrl = ""
     var publishTime = ""
     var shareUrl = ""
@@ -47,6 +47,7 @@ class CNLiveAlbumCell:UITableViewCell{
         let iconImgView = UIImageView(frame: CGRect(x: 15, y: 15, width: 45, height: 45))
         iconImgView.layer.cornerRadius = 5
         iconImgView.clipsToBounds = true
+        iconImgView.contentMode = .scaleAspectFill
         return iconImgView
     }()
     ///标题
@@ -60,13 +61,14 @@ class CNLiveAlbumCell:UITableViewCell{
     }()
     ///副标题
     lazy var subTitleLabel: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.titleLabl.bottom+5, 60, 17))
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.right+15, self.titleLabl.bottom+5, self.titleLabl.width, 17))
         titleLabel.textColor = HexColor("#999999")
         titleLabel.textAlignment = .left
         titleLabel.font = Font_12
         titleLabel.text = "共68集"
         return titleLabel
     }()
+    let playBtnSubLayer = "playBtnSubLayer"
     lazy var playBtn: QMUIButton = {
         let playBtn = QMUIButton.init(type: .custom)
         playBtn.frame = CGRect(x: KSreenWidth-80, y: 0, width: 65, height: 26)
@@ -75,9 +77,17 @@ class CNLiveAlbumCell:UITableViewCell{
         playBtn.clipsToBounds = true
         playBtn.setTitle("播放", for: .normal)
         playBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
-        playBtn.backgroundColor = HexColor("#609AFF")
         playBtn.titleLabel?.font = Font_13
         playBtn.addTarget(self, action: #selector(playBtnAction), for: .touchUpInside)
+        
+        let gradient = CAGradientLayer()
+        gradient.frame = playBtn.bounds
+        gradient.colors = [HexColor("#67C5FF")!.cgColor, HexColor("#609AFF")!.cgColor]
+        gradient.locations = [0, 1]
+        gradient.startPoint = CGPoint(x: 0, y: 0.5)
+        gradient.endPoint = CGPoint(x: 0.5, y: 0.5)
+        gradient.name = playBtnSubLayer
+        playBtn.layer.insertSublayer(gradient, at: 0)
         return playBtn
     }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
@@ -97,7 +107,7 @@ class CNLiveAlbumCell:UITableViewCell{
             //课程-跳转h5网页
             self.cellType = .course
             self.playBtn.setTitle("进入", for: .normal)
-        }else if model.model == "album_ugc"{
+        }else if model.model == kCNDownSlideContentsModelModelAlbum_ugc{
             //短剧-跳转短剧播放页
             self.cellType = .playlet
             self.playBtn.setTitle("播放", for: .normal)
@@ -106,6 +116,7 @@ class CNLiveAlbumCell:UITableViewCell{
         self.subTitleLabel.text = model.subTitle
         self.iconImgView.kf.setImage(with: URL(string: model.poster))
         self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80
+        self.subTitleLabel.width = self.titleLabl.width
         self.playBtn.left = KSreenWidth-80
     }
     func setupNewUIMsgModel(model:CNLiveAlbumMsgModel,isDetail:Bool){
@@ -115,12 +126,14 @@ class CNLiveAlbumCell:UITableViewCell{
         self.subTitleLabel.text = model.subTitle
         self.iconImgView.kf.setImage(with: URL(string: model.albumImg))
         self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80-30
+        self.subTitleLabel.width = self.titleLabl.width
         if self.isDetail{
             self.playBtn.left = KSreenWidth-80
         }else{
             self.playBtn.left = KSreenWidth-80-30
         }
     }
+  
     @objc func playBtnAction(){
         var aid = ""
         if self.albumModel != nil{
@@ -134,7 +147,7 @@ class CNLiveAlbumCell:UITableViewCell{
             if (self.albumModel?.model == "1" || self.albumModel?.model == "2" || self.albumModel?.model == "3" || self.albumModel?.model == "4"){
                 //课程-跳转h5网页
                 self.enterBlock!(self.albumModel!)
-            }else if self.albumModel?.model == "album_ugc"{
+            }else if self.albumModel?.model == kCNDownSlideContentsModelModelAlbum_ugc{
                 //短剧-跳转短剧播放页
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
             }
@@ -11,11 +11,18 @@ class CNLiveAlbumImageCell:UITableViewCell{
     //MARK: - 懒加载
     lazy var iconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: (KSreenWidth - KSreenWidth*(KSreenWidth/DownSlideSingleCourseW))/2, y: 0, width: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW), height: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)))
+        let iconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenWidth))
         iconImgView.contentMode = .scaleAspectFill
         return iconImgView
     }()
+    lazy var titleLabel: UILabel = {
+        let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap+get_system_statusBar_height(), width: KSreenWidth-DownSlideRecommendLeftGap*2, height: 30))
+        titleLbl.font = BoldFont_21
+        titleLbl.textColor = HexColor("#FFFFFF")
+        return titleLbl
+    }()
+    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
@@ -29,6 +36,7 @@ class CNLiveAlbumImageCell:UITableViewCell{
     private func setupUI() {
         contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         self.contentView.addSubview(self.iconImgView)
+        self.contentView.addSubview(self.titleLabel)
         self.contentView.clipsToBounds = true
     }
@@ -18,11 +18,10 @@ class CNLiveDuanjuTitleCell:UITableViewCell{
             if self.cellType == .course || self.cellType == .playletToCourse{
                 self.blockTitleLabl.text = _blockName ?? "全部课程"
-                self.blockTitleLabl.top = (allCourseCellHeight-30)/2
+                self.blockTitleLabl.top = (allCourseCellHeight-30)/2+get_system_statusBar_height()
             }else if self.cellType == .playlet{
                 self.blockTitleLabl.text = _blockName ?? "在追短剧"
                 self.blockTitleLabl.top = (45-30)/2
-
             }
         }
     }
@@ -25,6 +25,7 @@ class CNLivePlayletHomePageCell:UITableViewCell{
     lazy var iconImgView :UIImageView = {
         let iconImgView = UIImageView(frame: CGRect(x: 15, y: 12, width: 57, height: 75))
         iconImgView.layer.cornerRadius = 5
+        iconImgView.contentMode = .scaleAspectFill
         iconImgView.clipsToBounds = true
         return iconImgView
     }()
@@ -78,7 +79,7 @@ class CNLivePlayletHomePageCell:UITableViewCell{
             //付过费 或 免费
             self.payIconImgView.isHidden = true
             //显示已购买 或者 不显示
-            if model.product?.productType == "0"{
+            if model.product?.productType == "0" || model.product?.productType == "4"{
                 //免费
                 self.payIconImgView.isHidden = true
             }else if model.product?.productType == "1"{
@@ -90,8 +91,7 @@ class CNLivePlayletHomePageCell:UITableViewCell{
                 self.payIconImgView.isHidden = false
                 self.payIconImgView.image = UIImage(named: "homePage_payed")
             }else{
-                self.payIconImgView.isHidden = false
-                self.payIconImgView.image = UIImage(named: "homePage_payed")
+                
             }
         }else{
             //需要付费
@@ -41,6 +41,7 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
     lazy var iconImgView :UIImageView = {
         let iconImgView = UIImageView(frame: CGRect(x: 15, y: 20, width: 112, height: 147))
         iconImgView.layer.cornerRadius = 5
+        iconImgView.contentMode = .scaleAspectFill
         iconImgView.clipsToBounds = true
         return iconImgView
     }()
@@ -151,26 +151,26 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
                 guard let selectedCell = toVC.selectedCell else { return }
                 let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
-                UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                UIView.animate(withDuration: transitonDuration - 0.8, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
                     let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
                     fromVC.view.frame = frame
                     fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
                     fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
                     fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
                     fromVC.closeBtn.alpha = 0
-                    
+                    fromVC.tableView.alpha = 0
                 }) { (completed) in
                     transitionContext.completeTransition(completed)
                 }
             }else if fromNaviVC.topViewController is CNHomepageDuanJuDetailViewController{
                 guard let selectedCell = toVC.selectedDuanjuCell else { return }
                 let fromVC = fromNaviVC.topViewController as! CNHomepageDuanJuDetailViewController
-                UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                UIView.animate(withDuration: transitonDuration - 0.8, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
                     let frame = selectedCell.convert(selectedCell.totalView.frame, to: toVC.view)
                     fromVC.view.frame = frame
                     fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
                     fromVC.closeBtn.alpha = 0
-                    
+                    fromVC.tableView.alpha = 0
                 }) { (completed) in
                     transitionContext.completeTransition(completed)
                 }
@@ -185,14 +185,14 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
             guard let selectedCell = toVC.selectedCell else { return }
             let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
-            UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+            UIView.animate(withDuration: transitonDuration - 0.8, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
                 let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
                 fromVC.view.frame = frame
                 fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
                 fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
                 fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
                 fromVC.closeBtn.alpha = 0
-                
+                fromVC.tableView.alpha = 0
             }) { (completed) in
                 transitionContext.completeTransition(completed)
             }
@@ -205,14 +205,14 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
             guard let selectedCell = toVC.selectedCell else { return }
             if fromNaviVC.topViewController is CNUpSlideDetailViewController{
                 let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
-                UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+                UIView.animate(withDuration: transitonDuration - 0.8, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
                     let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
                     fromVC.view.frame = frame
                     fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
                     fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
                     fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
                     fromVC.closeBtn.alpha = 0
-                    
+                    fromVC.tableView.alpha = 0
                 }) { (completed) in
                     transitionContext.completeTransition(completed)
                 }