no message

“张旭”
1 parent 577595cd
Showing 4 changed files with 2 additions and 240 deletions
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/MainView/CNMainView.swift
@@ -179,9 +179,7 @@ class CNWebView:UIView,WKNavigationDelegate{
     // 页面加载完成之后调用
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         print("didFinish")
-//        if (self.webControllerUpdateNavBlock?(true, "", false, "") != nil){
         self.webControllerUpdateNavBlock?(true, webView.title!, false , "")
-//        }
     }
     // 页面加载失败时调用
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
@@ -198,8 +196,6 @@ class CNWebView:UIView,WKNavigationDelegate{
         //允许跳转
         decisionHandler(.allow)
-        //不允许跳转
-        //        decisionHandler(.cancel)
     }
     // 在发送请求之前，决定是否跳转 -> 默认允许
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
@@ -208,16 +204,8 @@ class CNWebView:UIView,WKNavigationDelegate{
         var urlStr = (navigationAction.request.url?.absoluteString)!
         if navigationAction.request.url?.host == WjjH5 {
-//            if (self.webControllerUpdateNavBlock?(false, "", true, "") != nil){
             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
         }
@@ -32,7 +32,6 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         configuration.preferences = preferences
         configuration.userContentController = WKUserContentController()
         let webView = CNWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration, url: _url)
-//        let webView = WKWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration)
         webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
         webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
         webView.isCNWebController = true
@@ -79,83 +78,13 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
             make.top.equalTo(get_system_nav_height())
             make.left.right.bottom.equalToSuperview()
         }
-//        webView.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
-//                    webView.cnWebView.customUserAgent = newUserAgent
-//                    
-//                    if (_url != nil){
-//                        let urlStr = self.checkURLWithStr(urlStr: _url!.absoluteString)
-//                        self.currentUrl = urlStr
-//
-//                        webView.cnWebView.load(URLRequest.init(url:URL(string: urlStr)!))
-//                    }
-//                    self.configBridge()
-//                    self.configBridgeRegister()
-//                }
-//            }
-//        }
     }
-//    func configBridge(){
-//        WKWebViewJavascriptBridge.enableLogging()
-//        self.bridge = WKWebViewJavascriptBridge(for: self.webView.cnWebView)
-//        self.bridge?.setWebViewDelegate(self)
-//    }
-//    
-//    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>
-//            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{
-//                    
-//                }
-//            }
-//
-//        })
-//        
-//        // 网页内容图片预览
-//        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)
-//
-//        })
-//    }
-
     //点击...分享获取h5参数oc call js
     func configBridgeCallHander() -> Void {
         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"]
@@ -181,62 +110,7 @@ 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()
     }
@@ -247,77 +121,4 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
             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)
@@ -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: -设置前置视图容器