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

liushiyu
2 parents 86105f9d cc7ae3b3
Showing 15 changed files with 447 additions and 116 deletions
Podfile
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Extensions/String+Extension.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumImageCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveDuanjuTitleCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageHeaderCell.swift
metaCode/Supporting Files/Assets.xcassets/WebView/Contents.json
metaCode/Supporting Files/Assets.xcassets/WebView/web_more.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/WebView/web_more.imageset/web_more@2x.png
metaCode/Supporting Files/Assets.xcassets/WebView/web_more.imageset/web_more@3x.png
@@ -67,6 +67,7 @@ target &#39;metaCode&#39; do
 #  pod 'QMUIKit'
    pod 'YYWebImage', :git => 'https://gitee.com/mirrors/YYWebImage.git'
+   #网页交互
    pod 'WebViewJavascriptBridge'
    #依赖三方私有库,如果里面有.a的时候加上这个
@@ -108,7 +108,9 @@ class CNLiveBaseViewController: UIViewController  {
                 btn.frame = CGRect(x: lastBtn != nil ? (lastBtn!.origin.x - btn.width) : (topNavView.width - CNLiveBaseViewController.kTopNavLeftRightOffset - btn.width), y: topNavViewHeight - btn.height, width: btn.width, height: btn.height)
                 lastBtn = btn
             }
-            rightNavSpace = CGRectGetMaxX(lastBtn!.frame)
+            if _rightNavBtns.count > 0{
+                rightNavSpace = CGRectGetMaxX(lastBtn!.frame)
+            }
             viewWillLayoutSubviews()
         }
     }
@@ -7,7 +7,7 @@
 import UIKit
-
+import CommonCrypto
 extension String {
     /// Calculate text's height from `width` and `front`.
@@ -25,5 +25,63 @@ extension String {
         let substring = self[startIndex..<endIndex]
         return String(substring)
     }
+    
+    //DES加密
+    func crypt(operation:CCOperation, key: String) -> String? {
+            
+            if let keyData = key.data(using: .utf8) {
+                
+                var cryptData: Data?
+                
+                if operation == kCCEncrypt {
+                    cryptData = self.data(using: .utf8)
+                } else {
+                    cryptData = Data(base64Encoded: self, options: .ignoreUnknownCharacters)
+                }
+                
+                if cryptData == nil {
+                    return nil
+                }
+                
+                let algoritm: CCAlgorithm = CCAlgorithm(kCCAlgorithmDES)
+                let option: CCOptions = CCOptions(kCCOptionPKCS7Padding)
+                
+                let keyBytes = [UInt8](keyData)
+                let keyLength = kCCKeySizeDES
+                
+                let dataIn = [UInt8](cryptData!)
+                let dataInlength = cryptData!.count
+                
+                let dataOutAvailable = Int(dataInlength + kCCBlockSizeDES)
+                let dataOut = UnsafeMutablePointer<UInt8>.allocate(capacity: dataOutAvailable)
+                let dataOutMoved = UnsafeMutablePointer<Int>.allocate(capacity: 1)
+                
+                dataOutMoved.initialize(to: 0)
+                
+                let cryptStatus = CCCrypt(operation, algoritm, option, keyBytes, keyLength, keyBytes, dataIn, dataInlength, dataOut, dataOutAvailable, dataOutMoved)
+                
+                var data: Data?
+                
+                if CCStatus(cryptStatus) == CCStatus(kCCSuccess) {
+                    data = Data(bytesNoCopy: dataOut, count: dataOutMoved.pointee, deallocator: .none)
+                }
+                
+                dataOutMoved.deallocate()
+                dataOut.deallocate()
+                
+                if data == nil {
+                    return nil
+                }
+                
+                if operation == kCCEncrypt {
+                    data = data!.base64EncodedData(options: .lineLength64Characters)
+                }
+                
+                return String(data: data!, encoding: .utf8)
+            }
+            
+            return nil
+
+        }
 }
@@ -20,6 +20,8 @@ enum CNLiveHomePageCellType {
     case playletToCourse
 }
+let allCourseCellHeight:CGFloat = 75
+
 class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate,EmptyDataSetSource, EmptyDataSetDelegate {
     //slideModel
@@ -96,8 +98,9 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     private func setupUI() {
         self.view.layer.masksToBounds = true
+        self.view.backgroundColor = .white
         self.view.addSubview(self.tableView)
-        self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
+        self.tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-KStatusBarHeight)
         view.addSubview(closeBtn)
         view.addGestureRecognizer(dismissPanGesture)
     }
@@ -266,7 +269,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
             }else if self.cellType == .course || self.cellType == .playletToCourse{
                 if self.slideModel?.type == SlideModelTypeAllCourse12{
                     //全部课程
-                    return 75
+                    return allCourseCellHeight
                 }else if self.slideModel?.type == SlideModelTypeOneCourse75{
                     //大图课程
                     return KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)
@@ -7,17 +7,46 @@
 import Foundation
 import WebKit
+import WebViewJavascriptBridge
+import CNLiveShareToolKit
+import CommonCrypto
+import CNLiveBusinessTools
+
+
+let WjjH5 = "wjjh5.cnlive.com"
 class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
+    var bridge:WKWebViewJavascriptBridge?
+    var currentUrl:String = ""//当前网页的url
+    
     lazy var webView: WKWebView = {
-        let webView = WKWebView.init(frame: CGRectMake(0, 0, Width, Height))
+        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()
+
+        let webView = WKWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration)
         webView.scrollView.showsVerticalScrollIndicator = false
         webView.scrollView.showsHorizontalScrollIndicator = false
-        webView.navigationDelegate = self
+//        webView.navigationDelegate = self
         return webView
     }()
+    lazy var moreNavBtn: UIButton = {
+        let moreNavBtn = UIButton(type: .custom)
+        moreNavBtn.frame = CGRect(x: 0, y: KStatusBarHeight, width: KNavigationHeight-KStatusBarHeight, height: KNavigationHeight-KStatusBarHeight)
+        moreNavBtn.backgroundColor = .clear
+        moreNavBtn.setImage(UIImage(named: "web_more"), for: .normal)
+        moreNavBtn.addTarget(self, action: #selector(moreNavBtnAction), for: .touchUpInside)
+        return moreNavBtn
+    }()
+
+    
     var _url:URL?
     var url:URL? {
         get{
@@ -25,19 +54,6 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
         }
         set{
             _url = newValue!
-            if (_url != nil){
-                let webUrl: URL! = _url!
-                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
-                        }
-                    }
-                    webView.load(URLRequest.init(url:webUrl))
-                }
-            }
         }
     }
@@ -49,42 +65,197 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
             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
+//            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"]
+
+            var shareUrl = ""
+            if let tempShareUrl = dic["shareUrl"]{
+                if tempShareUrl == ""{
+                    shareUrl = self.currentUrl
+                }else{
+                    shareUrl = tempShareUrl
+                }
+            }else{
+                shareUrl = self.currentUrl 
+            }
+            
+            CNLiveShareManager.showShareViewWithParam(forShareTitle: title, shareUrl: shareUrl, shareDesc: desc, shareImage: shareImg, 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{
+                    
+                }
+            }
+        })
+    }
+
+    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
+    // 内部链接右上角···分享
+    @objc func moreNavBtnAction(){
+        self.configBridgeCallHander()
+    }
+    override func ClickBackBtn() {
+        if self.webView.canGoBack{
+            self.webView.goBack()
+        }else{
+            super.ClickBackBtn()
+        }
     }
     // MARK: - WKWebViewDelegate
     // 页面开始加载时调用
     func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
-        print("didStartProvisionalNavigation")
+//        print("didStartProvisionalNavigation")
     }
     // 当内容开始返回时调用
     func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
-        print("didCommit")
+//        print("didCommit")
     }
+        
     // 页面加载完成之后调用
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        print("didFinish")
+//        print("didFinish")
         titleName = webView.title!
     }
     // 页面加载失败时调用
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        print("didFailProvisionalNavigation")
+//        print("didFailProvisionalNavigation")
     }
     // 接收到服务器跳转请求之后调用
     func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
-        print("didReceiveServerRedirectForProvisionalNavigation")
+//        print("didReceiveServerRedirectForProvisionalNavigation")
     }
     // 在收到响应后，决定是否跳转 -> 默认允许
     func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
-        print("decidePolicyFor")
+        
+//        print("decidePolicyFornavigationResponse")
+                
         //允许跳转
         decisionHandler(.allow)
         //不允许跳转
         //        decisionHandler(.cancel)
     }
     // 在发送请求之前，决定是否跳转 -> 默认允许
-    @available(iOS 13.0, *)
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void) {
+    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
@@ -93,7 +264,10 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
                 if UIApplication.shared.canOpenURL(url!) { UIApplication.shared.open(url!, options: [:], completionHandler: nil)
                 }
             }
+        }else if navigationAction.navigationType == .linkActivated{
+
+
         }
-        decisionHandler(.allow, preferences)
+        decisionHandler(.allow)
     }
 }
@@ -73,39 +73,6 @@ class CNIDCardView: UIView{
             if respStatue == .success {
                 let cardArray = result as! NSMutableArray
                 self.cardUIWithArray(cardArr: cardArray)
-                
-//                if cardArray.count > 0{
-//                    for i in (0..<cardArray.count){
-//                        let idCardModel = cardArray[i] as! MineStandInfoModel
-//                        let siBianGap:CGFloat = 17
-//                        let labelsGap:CGFloat = 10
-//                        
-//                        let keyLabel = UILabel.init()
-//                        keyLabel.textColor = HexColor(_idModel?.backgroundColor ?? "")
-//                        keyLabel.textAlignment = .left
-//                        keyLabel.font = Font(15)
-//                        keyLabel.backgroundColor = .clear
-//                        keyLabel.text = idCardModel.name ?? ""
-//                        keyLabel.frame = CGRect(x: siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: 70, height: 21)
-//                        keyLabel.adjustsFontSizeToFitWidth = true
-//                        keyLabel.tag = 10000+i
-//                        self.addSubview(keyLabel)
-//                        
-//                        let valueLabel = UILabel.init()
-//                        valueLabel.textColor = HexColor(_idModel?.backgroundColor ?? "")
-//                        valueLabel.textAlignment = .left
-//                        valueLabel.font = Font(15)
-//                        valueLabel.backgroundColor = .clear
-//                        valueLabel.text = idCardModel.userInfo ?? ""
-//                        valueLabel.frame = CGRect(x: keyLabel.right+labelsGap+siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: self.width-keyLabel.right-labelsGap-siBianGap-5, height: 21)
-//                        valueLabel.adjustsFontSizeToFitWidth = true
-//                        valueLabel.tag = 20000+i
-//                        self.addSubview(valueLabel)
-//
-//                    }
-//                }else{
-//                    //没数据
-//                }
             }
         }
     }
@@ -116,6 +83,24 @@ class CNIDCardView: UIView{
                 view.removeFromSuperview()
             }
         }
+        
+        var maxLblWidth:CGFloat = 0
+        for model in cardArr {
+            let idCardMdl = model as! MineStandInfoModel
+            
+            let keyLabel = UILabel.init()
+            keyLabel.textAlignment = .left
+            keyLabel.font = Font(15)
+            keyLabel.backgroundColor = .clear
+            keyLabel.text = idCardMdl.name ?? ""
+            keyLabel.sizeToFit()
+            let lblWidth = keyLabel.bounds.size.width
+            if maxLblWidth < lblWidth{
+                //更新更大的label宽度
+                maxLblWidth = lblWidth
+            }
+        }
+        
         let cardArray = NSMutableArray(array: cardArr)
         if cardArray.count > 0{
             for i in (0..<cardArray.count){
@@ -123,16 +108,48 @@ class CNIDCardView: UIView{
                 let siBianGap:CGFloat = 17
                 let labelsGap:CGFloat = 10
-                let keyLabel = UILabel.init()
-                keyLabel.textColor = HexColor(_idModel?.backgroundColor ?? "")
-                keyLabel.textAlignment = .left
-                keyLabel.font = Font(15)
-                keyLabel.backgroundColor = .clear
-                keyLabel.text = idCardModel.name ?? ""
-                keyLabel.frame = CGRect(x: siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: 70, height: 21)
-                keyLabel.adjustsFontSizeToFitWidth = true
-                keyLabel.tag = 10000+i
-                self.addSubview(keyLabel)
+                var keyLblRight:CGFloat = 0
+                if idCardModel.name?.count == 2{
+                    //2个字特殊处理,2边对齐
+                    let keyLabel1 = UILabel.init()
+                    keyLabel1.textColor = HexColor(_idModel?.backgroundColor ?? "")
+                    keyLabel1.textAlignment = .left
+                    keyLabel1.font = Font(15)
+                    keyLabel1.backgroundColor = .clear
+                    keyLabel1.text = idCardModel.name?.subString(start: 0, length: 1) ?? ""
+                    keyLabel1.sizeToFit()
+                    keyLabel1.frame = CGRect(x: siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: maxLblWidth, height: keyLabel1.bounds.size.height)
+                    keyLabel1.adjustsFontSizeToFitWidth = true
+                    keyLabel1.tag = 10000+i+100
+                    self.addSubview(keyLabel1)
+
+                    let keyLabel2 = UILabel.init()
+                    keyLabel2.textColor = HexColor(_idModel?.backgroundColor ?? "")
+                    keyLabel2.textAlignment = .right
+                    keyLabel2.font = Font(15)
+                    keyLabel2.backgroundColor = .clear
+                    keyLabel2.text = idCardModel.name?.subString(start: 1, length: 1) ?? ""
+                    keyLabel2.sizeToFit()
+                    keyLabel2.frame = CGRect(x: siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: maxLblWidth, height: keyLabel1.bounds.size.height)
+                    keyLabel2.adjustsFontSizeToFitWidth = true
+                    keyLabel2.tag = 10000+i+200
+                    self.addSubview(keyLabel2)
+                    keyLblRight = keyLabel2.right
+                }else{
+                    //其他字数左对齐
+                    let keyLabel = UILabel.init()
+                    keyLabel.textColor = HexColor(_idModel?.backgroundColor ?? "")
+                    keyLabel.textAlignment = .left
+                    keyLabel.font = Font(15)
+                    keyLabel.backgroundColor = .clear
+                    keyLabel.text = idCardModel.name ?? ""
+                    keyLabel.sizeToFit()
+                    keyLabel.frame = CGRect(x: siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: keyLabel.bounds.size.width, height: keyLabel.bounds.size.height)
+                    keyLabel.adjustsFontSizeToFitWidth = true
+                    keyLabel.tag = 10000+i
+                    self.addSubview(keyLabel)
+                    keyLblRight = keyLabel.right
+                }
                 let valueLabel = UILabel.init()
                 valueLabel.textColor = HexColor(_idModel?.backgroundColor ?? "")
@@ -140,7 +157,7 @@ class CNIDCardView: UIView{
                 valueLabel.font = Font(15)
                 valueLabel.backgroundColor = .clear
                 valueLabel.text = idCardModel.userInfo ?? ""
-                valueLabel.frame = CGRect(x: keyLabel.right+labelsGap+siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: self.width-keyLabel.right-labelsGap-siBianGap-5, height: 21)
+                valueLabel.frame = CGRect(x: keyLblRight+labelsGap+siBianGap, y: siBianGap+CGFloat(i)*21+CGFloat(i)*labelsGap, width: self.width-keyLblRight-labelsGap-siBianGap-5, height: 21)
                 valueLabel.adjustsFontSizeToFitWidth = true
                 valueLabel.tag = 20000+i
                 self.addSubview(valueLabel)
@@ -56,35 +56,51 @@ class CNFrontMainView : UIView{
             make.bottom.equalToSuperview()
         }
+        
+        frontDescContentView.addSubview(self.agencyTipsLabel)
+        agencyTipsLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-62-36-8)
+            make.width.equalTo(self.width-60)
+        }
+        
+        frontDescContentView.addSubview(self.enterpriseTipsLabel)
+        enterpriseTipsLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalTo(self.agencyTipsLabel.snp.top).offset(-2)
+            make.width.equalTo(self.agencyTipsLabel.snp.width)
+        }
+
+        
         frontDescContentView.addSubview(self.addStandBtn)
         addStandBtn.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-30)
+            make.bottom.equalToSuperview().offset(-62)
             make.width.equalTo(150)
-            make.height.equalTo(39)
+            make.height.equalTo(36)
         }
         frontDescContentView.addSubview(self.personalStandBtn)
         personalStandBtn.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-self.width/2)
-            make.bottom.equalToSuperview().offset(-45)
+            make.bottom.equalTo(self.addStandBtn.snp.bottom)
             make.width.equalTo(120)
-            make.height.equalTo(36)
+            make.height.equalTo(self.addStandBtn.snp.height)
         }
         frontDescContentView.addSubview(self.enterpriseStandBtn)
         enterpriseStandBtn.snp.makeConstraints { make in
             make.left.equalTo(self.personalStandBtn.snp.right)
-            make.bottom.equalToSuperview().offset(-45)
+            make.bottom.equalTo(self.addStandBtn.snp.bottom)
             make.width.equalTo(120)
-            make.height.equalTo(36)
+            make.height.equalTo(self.addStandBtn.snp.height)
         }
         frontDescContentView.addSubview(self.unStandBtnBgView)
         unStandBtnBgView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(30)
-            make.bottom.equalToSuperview().offset(-45)
+            make.bottom.equalTo(self.addStandBtn.snp.bottom)
             make.width.equalTo(self.width-60)
-            make.height.equalTo(36)
+            make.height.equalTo(self.addStandBtn.snp.height)
         }
@@ -116,6 +132,27 @@ class CNFrontMainView : UIView{
         return textView
     }()
+    ///未认证-企业认证提示
+    lazy var enterpriseTipsLabel: UILabel = {
+        let enterpriseTipsLabel = UILabel.init(frame: CGRectMake(0, 0, 0, 0))
+        enterpriseTipsLabel.textColor = .white
+        enterpriseTipsLabel.textAlignment = .center
+        enterpriseTipsLabel.font = Font(9)
+        enterpriseTipsLabel.text = "企业认证适合企业、个体工商户申请"
+        enterpriseTipsLabel.adjustsFontSizeToFitWidth=true
+        return enterpriseTipsLabel
+    }()
+    ///未认证-机构认证提示
+    lazy var agencyTipsLabel: UILabel = {
+        let agencyTipsLabel = UILabel.init(frame: CGRectMake(0, 0, 0, 0))
+        agencyTipsLabel.textColor = .white
+        agencyTipsLabel.textAlignment = .center
+        agencyTipsLabel.font = Font(9)
+        agencyTipsLabel.text = "机构认证适合国家机构、社会组织、高校等申请"
+        agencyTipsLabel.adjustsFontSizeToFitWidth=true
+        return agencyTipsLabel
+    }()
+    
     ///未认证-店铺认证 按钮(一个按钮时)
     lazy var addStandBtn: UIButton = {
         let addStandBtn = UIButton(type: .custom)
@@ -206,21 +243,21 @@ class CNFrontMainView : UIView{
             make.left.equalToSuperview()
             make.top.equalToSuperview()
             make.width.equalTo((self.width-60)/3)
-            make.height.equalTo(36)
+            make.height.equalToSuperview()
         }
         unStandBtnBgView.addSubview(self.StandBtn2)
         StandBtn2.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.top.equalToSuperview()
             make.width.equalTo(self.StandBtn1.snp.width)
-            make.height.equalTo(36)
+            make.height.equalToSuperview()
         }
         unStandBtnBgView.addSubview(self.StandBtn3)
         StandBtn3.snp.makeConstraints { make in
             make.right.equalToSuperview()
             make.top.equalToSuperview()
             make.width.equalTo(self.StandBtn1.snp.width)
-            make.height.equalTo(36)
+            make.height.equalToSuperview()
         }
         unStandBtnBgView.addSubview(self.line1View)
@@ -268,16 +305,17 @@ class CNFrontMainView : UIView{
     lazy var upMoreGIF: UIImageView = {
         let  upMoreGIF = UIImageView()
         upMoreGIF.frame = CGRect(x: self.width - 50, y: 0, width: 50, height: 30)
+        upMoreGIF.contentMode = .scaleAspectFit
         return upMoreGIF
     }()
     //下滑更多Gif
     lazy var downMoreGIF: UIImageView = {
         let  downMoreGIF = UIImageView()
         downMoreGIF.frame = CGRect(x: self.width - 50, y: 0, width: 96, height: 30)
+        downMoreGIF.contentMode = .scaleAspectFit
         return downMoreGIF
     }()
-    // MARK: - 已认证
     ///已认证-前置视图卡片容器
     lazy var frontCardContentView : UIView = {
@@ -296,7 +334,7 @@ class CNFrontMainView : UIView{
         frontCardContentView.addSubview(self.iDCardView)
         iDCardView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-(45-30)/2.0-30-10)
+            make.bottom.equalToSuperview().offset(-62)
             make.width.equalTo(262*KSreenWidth/375)
             make.height.equalTo(0.52*262*KSreenWidth/375)
         }
@@ -352,22 +390,11 @@ class CNFrontMainView : UIView{
                     self.upMoreGIF.removeFromSuperview()
                 }
                 frontCardContentView.addSubview(self.upMoreGIF)
-                upMoreGIF.snp.makeConstraints { make in
-                    make.top.equalToSuperview().offset(5)
-                    make.right.equalToSuperview().offset(-self.width/2+24)
-                    make.width.equalTo(48)
-                    make.height.equalTo(30)
-                }
                 if frontCardContentView.contains(self.downMoreGIF){
                     self.downMoreGIF.removeFromSuperview()
                 }
                 frontCardContentView.addSubview(self.downMoreGIF)
-                downMoreGIF.snp.makeConstraints { make in
-                    make.top.equalTo(self.iDCardView.snp.bottom).offset((45-30)/2.0)
-                    make.centerX.equalToSuperview()
-                    make.width.equalTo(96)
-                    make.height.equalTo(30)
-                }
+                self.setUpMoreGIFAndDownMoreGIF()
                 //上滑 下滑引导gif
                 upMoreGIF.kf.setImage(with: URL(string: newValue!.upGuideImg))
                 downMoreGIF.kf.setImage(with: URL(string: newValue!.downGuideImg))
@@ -477,6 +504,22 @@ class CNFrontMainView : UIView{
                         self.enterpriseStandBtn.isHidden = true
                         self.unStandBtnBgView.isHidden = true
                     }
+                    
+                    //有企业认证显示提示lbl
+                    if idModel!.enterpriseAuth{
+                        self.enterpriseTipsLabel.isHidden = false
+                        self.enterpriseTipsLabel.textColor = HexColor(newValue!.backgroundColor)
+                    }else{
+                        self.enterpriseTipsLabel.isHidden = true
+                    }
+                    //有机构认证显示提示lbl
+                    if idModel!.agencyAuth{
+                        self.agencyTipsLabel.isHidden = false
+                        self.agencyTipsLabel.textColor = HexColor(newValue!.backgroundColor)
+                    }else{
+                        self.agencyTipsLabel.isHidden = false
+                    }
+                    
                 }
                 self.addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
@@ -488,22 +531,12 @@ class CNFrontMainView : UIView{
                     self.upMoreGIF.removeFromSuperview()
                 }
                 frontDescContentView.addSubview(self.upMoreGIF)
-                upMoreGIF.snp.makeConstraints { make in
-                    make.top.equalToSuperview().offset(5)
-                    make.right.equalToSuperview().offset(-self.width/2+24)
-                    make.width.equalTo(48)
-                    make.height.equalTo(30)
-                }
                 if frontDescContentView.contains(self.downMoreGIF){
                     self.downMoreGIF.removeFromSuperview()
                 }
                 frontDescContentView.addSubview(self.downMoreGIF)
-                downMoreGIF.snp.makeConstraints { make in
-                    make.top.equalTo(self.personalStandBtn.snp.bottom).offset((45-30)/2.0)
-                    make.centerX.equalTo(self.personalStandBtn.snp.right)
-                    make.width.equalTo(96)
-                    make.height.equalTo(30)
-                }
+
+                self.setUpMoreGIFAndDownMoreGIF()
                 //上滑 下滑引导gif
                 upMoreGIF.kf.setImage(with: URL(string: newValue!.upGuideImg))
                 downMoreGIF.kf.setImage(with: URL(string: newValue!.downGuideImg))
@@ -516,6 +549,22 @@ class CNFrontMainView : UIView{
         } 
     }
+    func setUpMoreGIFAndDownMoreGIF(){
+        upMoreGIF.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(20)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(96)
+            make.height.equalTo(30)
+        }
+        downMoreGIF.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-19)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(96)
+            make.height.equalTo(30)
+        }
+    }
+    
+    
     let unStandBtnBgViewLayer = "unStandBtnBgViewLayer"
     func setUnStandBtnBgViewLayer(startHex:String,endHex:String){
         let payLayer = self.subLayer(name: unStandBtnBgViewLayer, viewLayer: self.unStandBtnBgView.layer)
@@ -13,7 +13,6 @@ class CNLiveAlbumImageCell:UITableViewCell{
     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)))
         iconImgView.contentMode = .scaleAspectFill
-        iconImgView.clipsToBounds = true
         return iconImgView
     }()
@@ -30,7 +29,7 @@ class CNLiveAlbumImageCell:UITableViewCell{
     private func setupUI() {
         contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         self.contentView.addSubview(self.iconImgView)
-        
+        self.contentView.clipsToBounds = true
     }
@@ -18,10 +18,10 @@ class CNLiveDuanjuTitleCell:UITableViewCell{
             if self.cellType == .course || self.cellType == .playletToCourse{
                 self.blockTitleLabl.text = _blockName ?? "全部课程"
-                self.blockTitleLabl.top = KStatusBarHeight+10
+                self.blockTitleLabl.top = (allCourseCellHeight-30)/2
             }else if self.cellType == .playlet{
                 self.blockTitleLabl.text = _blockName ?? "在追短剧"
-                self.blockTitleLabl.top = 10
+                self.blockTitleLabl.top = (45-30)/2
             }
         }
@@ -95,7 +95,7 @@ class CNLivePlayletHomePageCell:UITableViewCell{
             }
         }else{
             //需要付费
-            if model.product?.productType == "0"{
+            if model.product?.productType == "0" || model.product?.productType == "4"{
                 //免费
                 self.payIconImgView.isHidden = true
             }else if model.product?.productType == "1"{
@@ -242,7 +242,7 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
             //需要付费
             self.paymentBtn.isUserInteractionEnabled = true
             self.paymentChangeStatus(isPayed: false)
-            if model.product?.albumProductType == "0"{
+            if model.product?.albumProductType == "0" || model.product?.albumProductType == "4"{
                 //免费
                 self.payIconImgView.isHidden = true
             }else if model.product?.albumProductType == "1"{
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "web_more@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "web_more@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}