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

liushiyu
2 parents 4b35123b 5619c354
Showing 33 changed files with 195 additions and 482 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.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/MainView/CNHomePageGuideView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift → metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModel.swift
metaCode/Classes/Main/Util/CNUpSlideAnimationTransition.swift
metaCode/Supporting Files/Assets.xcassets/RenzhenPage/homePage_backViewImage.imageset/4671683516653_.pic.jpg
metaCode/Supporting Files/Assets.xcassets/RenzhenPage/homePage_backViewImage.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/RenzhenPage/homePage_idCardBG.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/RenzhenPage/homePage_idCardBG.imageset/homePage_idCardBG@2x.png
metaCode/Supporting Files/Assets.xcassets/RenzhenPage/homePage_idCardBG.imageset/homePage_idCardBG@3x.png
@@ -695,7 +695,7 @@
 		1938BD152B3D6C6000390A34 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				1938BD272B48009600390A34 /* AuthController */,
+				1938BD272B48009600390A34 /* HomeController */,
 				1938BD1D2B46791400390A34 /* PlayletHomePage */,
 			);
 			path = Controller;
@@ -753,13 +753,13 @@
 			path = PlayletHomePage;
 			sourceTree = "<group>";
 		};
-		1938BD272B48009600390A34 /* AuthController */ = {
+		1938BD272B48009600390A34 /* HomeController */ = {
 			isa = PBXGroup;
 			children = (
 				1938BD282B4800E500390A34 /* push相关 */,
 				1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */,
 			);
-			path = AuthController;
+			path = HomeController;
 			sourceTree = "<group>";
 		};
 		1938BD282B4800E500390A34 /* push相关 */ = {
@@ -2078,7 +2078,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.6.24.02.04.18;
+				CURRENT_PROJECT_VERSION = 1.0.7.24.03.01.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2150,7 +2150,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -2332,7 +2332,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.6.24.02.04.18;
+				CURRENT_PROJECT_VERSION = 1.0.7.24.03.01.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2404,7 +2404,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -90,7 +90,7 @@ class UploadManager: NSObject {
     ///   - resultBlock: 结果
     static private func uploadData(madiaData: NSData, key: String, progress: ProgressBlcok?, success: SuccessBlock?) {
         let param = NSMutableDictionary()
-        param.setValue(APPId, forKey: "appId")
+        param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
         param.setValue("POST", forKey: "verb")
         param.setValue("2", forKey: "storageType")
         param.setValue(kBucketName_QN, forKey: "bucket")
@@ -101,7 +101,7 @@ class UploadManager: NSObject {
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupSignRequestKey(APPKey)//APPKey_wjj APPKey
+        CNLiveNetworking.setupSignRequestKey(CNLiveMCEnvironmentManager.shared.appKey)//APPKey_wjj APPKey
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveMCEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
@@ -17,7 +17,7 @@ let Height: CGFloat = UIScreen.main.bounds.size.height
 let LeftGap: CGFloat = UIScreen.main.bounds.size.width <= 375 ? 23 : 40
 ///主窗口宽度
-let MainViewW: CGFloat = Width-LeftGap*2//Width-50
+let MainViewW: CGFloat = Width-LeftGap*2
 ///下滑页底部工具条高度
 let DownSlideBottomViewHeight: CGFloat = 74
@@ -26,14 +26,6 @@ let CNKeyIsFirstAppearUpSlideHomeGuide: String = &quot;isFirstAppearUpSlideHomeGuideK
 ///存储是否第一次显示首页下滑引导
 let CNKeyIsFirstAppearDownSlideHomeGuide: String = "isFirstAppearDownSlideHomeGuideKey"
-/////用户身份认证状态
-//enum UserIdentityStatus {
-//    ///未认证
-//    case notCertified
-//    ///已经认证
-//    case haveBeenCertified
-//}
-
 ///数据状态
 enum NetAPIStatus {
     ///接口成功
@@ -65,8 +57,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     ///tabBar 的Y坐标位置
     private var tabBarY:CGFloat = 0.0
-    ///用户身份认证状态
-//    private var identityStatus: UserIdentityStatus = .notCertified
     ///接口状态
     private var NetApiStatus: NetAPIStatus = .apiError
     ///接口状态
@@ -127,51 +117,51 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         return errorFreshButton
     }()
-    ///上滑引导View
-    lazy var upSlideGuideView:CNHomePageGuideView = {
-        let upSlideGuideView = CNHomePageGuideView.init(frame: UIScreen.main.bounds)
-        upSlideGuideView.setBottomText(text: "向上滑动")
-        upSlideGuideView.skipAction = {
-            [weak self] in
-            self?.upSlideGuideView.removeFromSuperview()
-            self?.upSlideGifView.removeFromSuperview()
-            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
-            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
-            self?.pageFlowView.scrollView.isScrollEnabled = true
-        }
-        return upSlideGuideView
-    }()
-    ///上滑引导动图
-    lazy var upSlideGifView:UIImageView = {
-        let gif: UIImageView = UIImageView(frame: CGRect(x: 200, y: 30, width: 40, height: 80))
-        gif.loadGif(name: "slide_up")
-        gif.center = self.view.center
-        gif.contentMode = .scaleAspectFill
-        
-        return gif
-    }()
-    
-    ///下滑引导View
-    lazy var downSlideGuideView:CNHomePageGuideView = {
-        let downSlideGuideView = CNHomePageGuideView.init(frame: UIScreen.main.bounds)
-        downSlideGuideView.setBottomText(text: "向下滑动")
-        downSlideGuideView.skipAction = {
-            [weak self ] in
-            self?.downSlideGuideView.removeFromSuperview()
-            self?.downSlideGifView.removeFromSuperview()
-            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
-            self?.pageFlowView.scrollView.isScrollEnabled = true
-        }
-        return downSlideGuideView
-    }()
-    ///下滑引导动图
-    lazy var downSlideGifView:UIImageView = {
-        let gif: UIImageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 40, height: 80))
-        gif.center = self.view.center
-        gif.loadGif(name: "slide_down")
-        gif.contentMode = .scaleAspectFill
-        return gif
-    }()
+//    ///上滑引导View
+//    lazy var upSlideGuideView:CNHomePageGuideView = {
+//        let upSlideGuideView = CNHomePageGuideView.init(frame: UIScreen.main.bounds)
+//        upSlideGuideView.setBottomText(text: "向上滑动")
+//        upSlideGuideView.skipAction = {
+//            [weak self] in
+//            self?.upSlideGuideView.removeFromSuperview()
+//            self?.upSlideGifView.removeFromSuperview()
+//            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
+//            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+//            self?.pageFlowView.scrollView.isScrollEnabled = true
+//        }
+//        return upSlideGuideView
+//    }()
+//    ///上滑引导动图
+//    lazy var upSlideGifView:UIImageView = {
+//        let gif: UIImageView = UIImageView(frame: CGRect(x: 200, y: 30, width: 40, height: 80))
+//        gif.loadGif(name: "slide_up")
+//        gif.center = self.view.center
+//        gif.contentMode = .scaleAspectFill
+//        
+//        return gif
+//    }()
+//    
+//    ///下滑引导View
+//    lazy var downSlideGuideView:CNHomePageGuideView = {
+//        let downSlideGuideView = CNHomePageGuideView.init(frame: UIScreen.main.bounds)
+//        downSlideGuideView.setBottomText(text: "向下滑动")
+//        downSlideGuideView.skipAction = {
+//            [weak self ] in
+//            self?.downSlideGuideView.removeFromSuperview()
+//            self?.downSlideGifView.removeFromSuperview()
+//            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+//            self?.pageFlowView.scrollView.isScrollEnabled = true
+//        }
+//        return downSlideGuideView
+//    }()
+//    ///下滑引导动图
+//    lazy var downSlideGifView:UIImageView = {
+//        let gif: UIImageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 40, height: 80))
+//        gif.center = self.view.center
+//        gif.loadGif(name: "slide_down")
+//        gif.contentMode = .scaleAspectFill
+//        return gif
+//    }()
     ///左右滑动分页view
     lazy var pageFlowView: NewPagedFlowView = {
@@ -266,14 +256,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.makeConstraints()
-//        switch self.identityStatus{
-//
-//        case .notCertified:
-//            self.view.addSubview(self.addCertificationView)
-//        case .haveBeenCertified:
-//            self.addPageView()
-//        }
-        
     }
     // MARK: -事件
@@ -355,32 +337,31 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.view.addSubview(self.pageFlowView)
         self.pageFlowView.reloadData()
-        //首选判断是否显示了上滑引导
-        let isFirstAppearUpSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
-        if let tempGuide = isFirstAppearUpSlideHomeGuide{
-            //已经显示过上滑引导
-            
-            //判断是否显示过下滑引导
-            let isFirstAppearDownSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
-            if let  tempDownGuide = isFirstAppearDownSlideHomeGuide{
-                
-            }else{
-                //没有显示下滑引导
-                self.pageFlowView.scrollView.isScrollEnabled = false
-                UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView)
-                UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView)
-//                self.tabBarController?.tabBar.isHidden = true
-            }
-            
-        }else{
-            //没显示过上滑引导
-            self.pageFlowView.scrollView.isScrollEnabled = false
-            
-            UIApplication.shared.keyWindow!.addSubview(self.upSlideGuideView)
-            UIApplication.shared.keyWindow!.addSubview(self.upSlideGifView)
-//            self.tabBarController?.tabBar.isHidden = true
-        }
+//        //首选判断是否显示了上滑引导
+//        let isFirstAppearUpSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
+//        
+//        if let tempGuide = isFirstAppearUpSlideHomeGuide{
+//            //已经显示过上滑引导
+//            
+//            //判断是否显示过下滑引导
+//            let isFirstAppearDownSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+//            if let  tempDownGuide = isFirstAppearDownSlideHomeGuide{
+//                
+//            }else{
+//                //没有显示下滑引导
+//                self.pageFlowView.scrollView.isScrollEnabled = false
+//                UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView)
+//                UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView)
+//            }
+//            
+//        }else{
+//            //没显示过上滑引导
+//            self.pageFlowView.scrollView.isScrollEnabled = false
+//            
+//            UIApplication.shared.keyWindow!.addSubview(self.upSlideGuideView)
+//            UIApplication.shared.keyWindow!.addSubview(self.upSlideGifView)
+//        }
     }
     // MARK: -左滑手势代理
@@ -501,23 +482,23 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     func customIndexViewWillBeiginScroll(scrollView: UIScrollView) {
         self.view.height = KSreenHeight
-        /**开始拖拽移除引导View**/
-        
-        //移除上滑引导
-        if(self.upSlideGuideView.superview != nil){
-            self.upSlideGuideView.removeFromSuperview()
-            self.upSlideGifView.removeFromSuperview()
-            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
-        }
-        
-        //移除下滑引导
-        if (self.downSlideGuideView.superview != nil) {
-            
-            self.downSlideGuideView.removeFromSuperview()
-            self.downSlideGifView.removeFromSuperview()
-            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
-            self.pageFlowView.scrollView.isScrollEnabled = true
-        }
+//        /**开始拖拽移除引导View**/
+//        
+//        //移除上滑引导
+//        if(self.upSlideGuideView.superview != nil){
+//            self.upSlideGuideView.removeFromSuperview()
+//            self.upSlideGifView.removeFromSuperview()
+//            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
+//        }
+//        
+//        //移除下滑引导
+//        if (self.downSlideGuideView.superview != nil) {
+//            
+//            self.downSlideGuideView.removeFromSuperview()
+//            self.downSlideGifView.removeFromSuperview()
+//            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+//            self.pageFlowView.scrollView.isScrollEnabled = true
+//        }
     }
     func customIndexViewDidScroll(scrollView: UIScrollView) {
@@ -566,16 +547,16 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         if scrollView.contentOffset.y == KSreenHeight {
             self.view.height = self.tabBarY
-            //判断是否显示过下滑引导
-            let isFirstAppearDownSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
-            if let  tempDownGuide = isFirstAppearDownSlideHomeGuide{
-                print("不该进来")
-            }else{
-                //没有显示下滑引导
-                UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView)
-                UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView)
-                self.pageFlowView.scrollView.isScrollEnabled = false
-            }
+//            //判断是否显示过下滑引导
+//            let isFirstAppearDownSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+//            if let  tempDownGuide = isFirstAppearDownSlideHomeGuide{
+//                print("不该进来")
+//            }else{
+//                //没有显示下滑引导
+//                UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView)
+//                UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView)
+//                self.pageFlowView.scrollView.isScrollEnabled = false
+//            }
         }
     }
@@ -75,7 +75,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         tableView.delegate = self
         tableView.separatorStyle = .none
         tableView.bounces = false
-//        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier)
         tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier)
         tableView.register(CNLiveDownSlideTodayRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier)
         tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideAllCourseCellIdentifier)
@@ -11,6 +11,10 @@ import WebViewJavascriptBridge
 import CNLiveShareToolKit
 import CommonCrypto
 import CNLiveBusinessTools
+import SKPhotoBrowser
+
+//更新Web控制器导航回调
+typealias cnWebControllerUpdateNavBlock = (_ isFinish:Bool , _ titleName:String ,_ isDecidePolicy:Bool , _ urlStr:String)->Void
 class CNWebView:UIView,WKNavigationDelegate{
@@ -21,11 +25,15 @@ class CNWebView:UIView,WKNavigationDelegate{
         return cnWebView
     }()
-    
     var webUrl:URL?//初始URL
     var currentUrl:String = ""//当前网页的url
     var bridge:WKWebViewJavascriptBridge?
+    //CNWebController
+    var isCNWebController:Bool = false//是否网页控制器
+    var webControllerUpdateNavBlock:cnWebControllerUpdateNavBlock?
+    
+    
     init(frame: CGRect, configuration: WKWebViewConfiguration ,url:URL?) {
         super.init(frame: frame)
         self.configuration = configuration
@@ -56,8 +64,9 @@ class CNWebView:UIView,WKNavigationDelegate{
         self.bridge = WKWebViewJavascriptBridge(for: self.cnWebView)
         self.bridge?.setWebViewDelegate(self)
     }
-    //h5拉起原生分享 js call oc
+    //h5拉起原生
     func configBridgeRegister() -> Void {
+        //h5拉起原生分享 js call oc
         self.bridge?.registerHandler("wjjylzgVideoShare", handler: { data, responseCallback in
 //            print("js call oc\(data)")
             let dic = data as! Dictionary<String, String>
@@ -70,6 +79,33 @@ class CNWebView:UIView,WKNavigationDelegate{
             }
         })
+        // 网页内容图片预览
+        self.bridge?.registerHandler("wjjPreviewImage", handler: { data, responseCallback in
+            //            print("js call oc\(data)")
+            var images = [SKPhoto]()
+            let dic = data as! Dictionary<String, Any>
+            let index = (dic["index"] as! NSString).integerValue
+            let imageArray = dic["imgArr"] as! NSArray
+            var imgArray = NSMutableArray()
+            for dict in imageArray {
+                var imgUrl = ""
+                if let dictemp = dict as? String{
+                    imgArray.add(dictemp)
+                    imgUrl = dictemp
+                }else if let dictemp = dict as? Dictionary<String, Any>{
+                    imgArray.add(dictemp["src"] ?? "")
+                    imgUrl = dictemp["src"] as! String
+                }
+                let photo = SKPhoto.photoWithImageURL(imgUrl)
+                photo.shouldCachePhotoURLImage = false
+                photo.photoURL = imgUrl
+                images.append(photo)
+            }
+            let browser = SKPhotoBrowser(photos: images)
+            browser.initializePageIndex(index)
+            currentViewController()?.present(browser, animated: true)
+
+        })
     }
     required init?(coder: NSCoder) {
@@ -143,7 +179,7 @@ class CNWebView:UIView,WKNavigationDelegate{
     // 页面加载完成之后调用
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         print("didFinish")
-//        titleName = webView.title!
+        self.webControllerUpdateNavBlock?(true, webView.title!, false , "")
     }
     // 页面加载失败时调用
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
@@ -160,8 +196,6 @@ class CNWebView:UIView,WKNavigationDelegate{
         //允许跳转
         decisionHandler(.allow)
-        //不允许跳转
-        //        decisionHandler(.cancel)
     }
     // 在发送请求之前，决定是否跳转 -> 默认允许
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
@@ -170,14 +204,8 @@ class CNWebView:UIView,WKNavigationDelegate{
         var urlStr = (navigationAction.request.url?.absoluteString)!
         if navigationAction.request.url?.host == WjjH5 {
+            self.webControllerUpdateNavBlock?(false, "", true , urlStr)
-//            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
         }
@@ -11,6 +11,7 @@ import WebViewJavascriptBridge
 import CNLiveShareToolKit
 import CommonCrypto
 import CNLiveBusinessTools
+import SKPhotoBrowser
 let WjjH5 = "wjjh5.cnlive.com"
@@ -21,7 +22,7 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
     var bridge:WKWebViewJavascriptBridge?
     var currentUrl:String = ""//当前网页的url
-    lazy var webView: WKWebView = {
+    lazy var webView: CNWebView = {
         let configuration = WKWebViewConfiguration()
         configuration.allowsInlineMediaPlayback = true
         let preferences = WKPreferences()
@@ -30,11 +31,10 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         configuration.preferences.minimumFontSize = 0.0
         configuration.preferences = preferences
         configuration.userContentController = WKUserContentController()
-
-        let webView = WKWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration)
-        webView.scrollView.showsVerticalScrollIndicator = false
-        webView.scrollView.showsHorizontalScrollIndicator = false
-//        webView.navigationDelegate = self
+        let webView = CNWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration, url: _url)
+        webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
+        webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
+        webView.isCNWebController = true
         return webView
     }()
@@ -62,58 +62,29 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         super.viewDidLoad()
         navigationBarHidden = false
         self.view.addSubview(self.webView)
+        self.webView.webControllerUpdateNavBlock = { isFinish , title,isDecidePolicy ,urlStr in
+            if isFinish{
+                self.titleName = title
+            }else if isDecidePolicy{
+                if urlStr.contains("&isWjjReport=true") || urlStr.contains("?isWjjReport=true"){
+                    self.rightNavBtns = [self.moreNavBtn]
+                    self.moreNavBtn.isHidden = false
+                }else{
+                    self.moreNavBtn.isHidden = true
+                }
+            }
+        }
         webView.snp.makeConstraints { make in
             make.top.equalTo(get_system_nav_height())
             make.left.right.bottom.equalToSuperview()
         }
-        webView.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
-                    webView.customUserAgent = newUserAgent
-                    
-                    if (_url != nil){
-                        let urlStr = self.checkURLWithStr(urlStr: _url!.absoluteString)
-                        self.currentUrl = urlStr
-
-                        webView.load(URLRequest.init(url:URL(string: urlStr)!))
-                    }
-                    self.configBridge()
-                    self.configBridgeRegister()
-                }
-            }
-        }
-    }
-
-    func configBridge(){
-        WKWebViewJavascriptBridge.enableLogging()
-        self.bridge = WKWebViewJavascriptBridge(for: self.webView)
-        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: self, topImage: [], topTitles: [], platformType: .all) { title in
-                
-            } completerBlock: { resultType, platformType, typeString in
-                if resultType == .succ{
-                    
-                }
-            }
-
-        })
     }
     //点击...分享获取h5参数oc call js
     func configBridgeCallHander() -> Void {
-        self.bridge?.callHandler("wjjClientGetShareParaFromJS", data: ["":""], responseCallback: { data in
+        self.webView.bridge?.callHandler("wjjClientGetShareParaFromJS", data: ["":""], responseCallback: { data in
 //            print("js call oc\(data)")
             let dic = data as! Dictionary<String, String>
-//            let shareType = dic["shareType"]
-//            let contentIdStr = dic["activityId"]
             let title = dic["title"]
             let desc = dic["desc"]
             let shareImg = dic["shareImg"]
@@ -139,143 +110,15 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         })
     }
-    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: - BtnAction
-    // 内部链接右上角···分享
+    // MARK: - 内部链接右上角···分享
     @objc func moreNavBtnAction(){
         self.configBridgeCallHander()
     }
     override func ClickBackBtn() {
-        if self.webView.canGoBack{
-            self.webView.goBack()
+        if self.webView.cnWebView.canGoBack{
+            self.webView.cnWebView.goBack()
         }else{
             super.ClickBackBtn()
         }
     }
-    
-    // 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{
-            
-            //以后可判断h5地址 ,可跳转原生页面或网页
-            //暂时只跳h5
-            let webVC =  CNWebViewController()
-            webVC.url = URL(string: urlStr)
-            navigationViewController().pushViewController(webVC, animated: pushAnimated)
-            decisionHandler(.cancel)
-            return
-
-        }
-        decisionHandler(.allow)
-    }
 }
@@ -131,20 +131,6 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     }
-//    private(set) var userInfo: UserInfoModel {
-//
-//        set {
-//            _userInfo = newValue
-//        }
-//
-//        get {
-//            if _userInfo != nil && (_userInfo?.uid.count)! > 0 {
-//                return _userInfo!
-//            }
-//            return UserInfoManager.readUserInfo()
-//        }
-//    }
-    
     // MARK: - 懒加载
     ///颜色数据
@@ -269,12 +255,6 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: true)
     }
-//    func addCustomGestureRecognizer(){
-//        let singleTap: UITapGestureRecognizer = UITapGestureRecognizer.init(target: self, action: #selector(singleCellTapAction))
-//
-//        self.addGestureRecognizer(singleTap)
-//    }
-    
     // MARK: - 设置前置视图容器
     func isHiddenMainFrontContentView(isHidden:Bool){
         self.mainView.isHiddenMainFrontContentView(isHidden: isHidden)
@@ -107,7 +107,16 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             bgBackView.layer.cornerRadius = 12
             bgBackView.backgroundColor = .white
-            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
+            var titleTop:CGFloat = DownSlideRecommendLeftGap
+            if model.blockSubTitle?.count ?? 0 > 0{
+                let subtitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 17))
+                subtitleLbl.text = model.blockSubTitle
+                subtitleLbl.font = Font_12
+                subtitleLbl.textColor = HexColor("#999999")
+                bgBackView.addSubview(subtitleLbl)
+                titleTop = DownSlideRecommendLeftGap+17+1
+            }
+            let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: titleTop, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
             titleLbl.text = model.blockName ?? "全部课程"
             titleLbl.font = BoldFont_21
             titleLbl.textColor = HexColor("#333333")
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by daojian on 2023/6/7.
-//  首页引导
+//  认证-首页引导
 import Foundation
@@ -17,7 +17,7 @@ class CNIDCardView: UIView{
         }
         set{
             _idModel = newValue
-            self.iDCardBGView.kf.setImage(with: URL(string: _idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
+            self.iDCardBGView.kf.setImage(with: URL(string: _idModel!.cardImg))
             if _idModel?.id == 9{
                 //电商 , 拼接数据
                 let nameArr = ["公司名称","认证时间","编号"]
@@ -512,14 +512,14 @@ class CNFrontMainView : UIView{
                     //有企业认证显示提示lbl
                     if idModel!.enterpriseAuth{
                         self.enterpriseTipsLabel.isHidden = false
-                        self.enterpriseTipsLabel.textColor = HexColor(newValue!.backgroundColor)
+                        self.enterpriseTipsLabel.textColor = HexColor(newValue!.tipsColour)
                     }else{
                         self.enterpriseTipsLabel.isHidden = true
                     }
                     //有机构认证显示提示lbl
                     if idModel!.agencyAuth{
                         self.agencyTipsLabel.isHidden = false
-                        self.agencyTipsLabel.textColor = HexColor(newValue!.backgroundColor)
+                        self.agencyTipsLabel.textColor = HexColor(newValue!.tipsColour)
                     }else{
                         self.agencyTipsLabel.isHidden = false
                     }
@@ -833,7 +833,7 @@ class CNBackMainView : UIView{
     lazy var imageView:UIImageView = {
         let tempImageView:UIImageView = UIImageView(frame: CGRect(x: 10, y: 10, width: self.width-20, height: self.height - 20))
-        tempImageView.image = UIImage(named: "homePage_backViewImage")
+        tempImageView.image = UIImage(named: "")
         return tempImageView
     }()
@@ -943,13 +943,6 @@ class CNMainView : UIView{
         self.backView.isHidden = true;
-        
-//        self.layer.cornerRadius = 20;
-//        self.layer.shadowOpacity = 1;
-//        self.layer.shadowColor = UIColor("#eeeeee")?.cgColor
-//        self.layer.shadowOffset = CGSize(width: 10, height: 10)
-//        self.layer.shadowRadius = 10;
-
     }
     // MARK: -设置前置视图容器
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/12/28.
-//
+//  首页-根控制器
 import Foundation
 import MJRefresh
@@ -69,12 +69,14 @@ extension CNHomePageAnimationTransition: UIViewControllerAnimatedTransitioning {
         if fromNaviVC.topViewController is CNHomepageDuanJuDetailViewController{
             guard let selectedCell = toVC.selectedDuanjuCell else { return }
             let fromVC = fromNaviVC.topViewController as! CNHomepageDuanJuDetailViewController
+            
+            fromVC.view.isHidden = true
             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)
             }
@@ -147,6 +147,7 @@ final class StandListModel: BaseModel {//, TableCodable {
     var backgroundColor: String = kCNDownSlideBackgroundColorHex//企业认证按钮背景色-
     var atPersonageColour: String = kCNDownSlideBackgroundColorHex//个人认证按钮背景色-
     var backgroundColour: String = ""//-
+    var tipsColour: String = ""//-企业,机构 提醒文本颜色
     var description: String = ""//首页身份说明描述-
     var descBackgroundImg: String = ""//首页文字背景图
     var cardImg: String = ""//卡片背景图-
@@ -13,6 +13,8 @@ class CNLiveDownSlideModel: BaseModel {
     var blockId: String?
     ///大块标题
     var blockName: String?
+    ///大块副标题
+    var blockSubTitle: String?
     ///类型 type=4一排两个 74今日推荐 12列表全部课程 75单课程大图/
     var type: String?
     ///显示几行
@@ -150,6 +150,7 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
             if fromNaviVC.topViewController is CNUpSlideDetailViewController{
                 guard let selectedCell = toVC.selectedCell else { return }
                 let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
+                fromVC.view.isHidden = true
                 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)
@@ -158,13 +159,14 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
                     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
+                fromVC.view.isHidden = true
                 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
@@ -184,7 +186,7 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
             guard let toVC = transitionContext.viewController(forKey: .to) as? CNUpSlideViewController else { return }
             guard let selectedCell = toVC.selectedCell else { return }
             let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
-            
+            fromVC.view.isHidden = true
             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
@@ -205,6 +207,7 @@ extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
             guard let selectedCell = toVC.selectedCell else { return }
             if fromNaviVC.topViewController is CNUpSlideDetailViewController{
                 let fromVC = fromNaviVC.topViewController as! CNUpSlideDetailViewController
+                fromVC.view.isHidden = true
                 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
-{
-  "images" : [
-    {
-      "filename" : "4671683516653_.pic.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "homePage_idCardBG@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "homePage_idCardBG@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "证件@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "证件@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "4651683514228_.pic.jpg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "4771683609542_.pic.jpg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "4431683250159_.pic.jpg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}