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

liushiyu
2 parents 9bf31cd0 b7a716a0
Showing 14 changed files with 349 additions and 64 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/CNWebViewController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/CNHomePageBackgroupView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Supporting Files/Assets.xcassets/Home/homepage_cardBGImg.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/homepage_cardBGImg.imageset/homepage_cardBGImg@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/homepage_cardBGImg.imageset/homepage_cardBGImg@3x.png
metaCode/Supporting Files/Assets.xcassets/Home/homepage_desc_bgImg.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/homepage_desc_bgImg.imageset/homepage_desc_bgImg@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/homepage_desc_bgImg.imageset/homepage_desc_bgImg@3x.png
@@ -8,6 +8,7 @@
 /* Begin PBXBuildFile section */
 		0D39E93D7229931C86EB1161 /* Pods_metaCode_metaCodeUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */; };
+		19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19123FC02ABC11170075C883 /* CNWebViewController.swift */; };
 		19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */; };
 		1DD2808DF02C120276F99F4D /* Pods_metaCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1C55A719CFEE073C06D37CE /* Pods_metaCode.framework */; };
 		7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7905BB482AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift */; };
@@ -114,6 +115,7 @@
 /* Begin PBXFileReference section */
 		0EC910AB9EBD717B04432BC4 /* Pods-metaCode-metaCodeUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode-metaCodeUITests.debug.xcconfig"; path = "Target Support Files/Pods-metaCode-metaCodeUITests/Pods-metaCode-metaCodeUITests.debug.xcconfig"; sourceTree = "<group>"; };
 		170BC5D0622EA2969D110A3B /* Pods-metaCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode.release.xcconfig"; path = "Target Support Files/Pods-metaCode/Pods-metaCode.release.xcconfig"; sourceTree = "<group>"; };
+		19123FC02ABC11170075C883 /* CNWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNWebViewController.swift; sourceTree = "<group>"; };
 		19F1C2322AB5728B0083D06C /* CNIDCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIDCardView.swift; sourceTree = "<group>"; };
 		54E09C540E13D78166D71395 /* Pods_metaCodeTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCodeTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCode_metaCodeUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -561,6 +563,7 @@
 			isa = PBXGroup;
 			children = (
 				7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
+				19123FC02ABC11170075C883 /* CNWebViewController.swift */,
 			);
 			name = Controller;
 			path = HomePage/Controller;
@@ -891,6 +894,7 @@
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
@@ -36,7 +36,17 @@ enum NetAPIStatus {
     case notNetwork
 }
-class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate,UIGestureRecognizerDelegate{
+///垂直方向页面
+enum VNumPage {
+    ///下滑页 第一页
+    case VNumPageDown
+    ///主要页面 第二页
+    case VNumPageMain
+    ///上滑页 第三页
+    case VNumPageUp
+}
+
+class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate,UIGestureRecognizerDelegate,WKNavigationDelegate{
     ///NewPagedFlowView 开始滑动时的偏移量
@@ -48,6 +58,9 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
 //    private var identityStatus: UserIdentityStatus = .notCertified
     ///接口状态
     private var NetApiStatus: NetAPIStatus = .apiError
+    ///接口状态
+    public var vNumPage: VNumPage = .VNumPageMain
+    
     // MARK: - 懒加载
     ///数据源
@@ -201,6 +214,15 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        switch vNumPage {
+        case .VNumPageMain://中间主页
+                self.tabBarController?.tabBar.isHidden = false
+        case .VNumPageUp://上滑页
+                self.tabBarController?.tabBar.isHidden = true
+        case .VNumPageDown://下滑页
+                self.tabBarController?.tabBar.isHidden = true
+        }
+        
         print("uid = ",UserInfoManager.shared.userInfo.uid)
@@ -354,6 +376,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         bannerView?.superScrollView = flowView.scrollView
         bannerView?.associatedVCView = self.view
         bannerView?.delegate  = self
+        bannerView?.upSlideView.webView.navigationDelegate = self
+        bannerView?.downSlideView.webView.navigationDelegate = self
         let identityModel = dataArray[index] as! StandListModel
         bannerView?.idModel = identityModel
         return bannerView
@@ -423,7 +447,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
-    //MARK: - CNCustomIndexView 代理方法
+    //MARK: - CNCustomIndexView 代理方法  垂直方向滑动
     func customIndexViewWillBeiginScroll(scrollView: UIScrollView) {
         self.view.height = KSreenHeight
@@ -458,6 +482,17 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     func customIndexViewDidEndScroll(scrollView: UIScrollView) {
+        if scrollView.contentOffset.y == 0{//下滑页
+            self.tabBarController?.tabBar.isHidden = true
+            vNumPage = .VNumPageDown
+        }else if scrollView.contentOffset.y == KSreenHeight{//默认主页
+            self.tabBarController?.tabBar.isHidden = false
+            vNumPage = .VNumPageMain
+        }else if scrollView.contentOffset.y == KSreenHeight*2{//上滑页
+            self.tabBarController?.tabBar.isHidden = true
+            vNumPage = .VNumPageUp
+        }
+        
         if scrollView.contentOffset.y == KSreenHeight {
             self.view.height = self.tabBarY
@@ -473,6 +508,63 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
         }
     }
+    
+    // MARK: - WKWebViewDelegate
+    // 页面开始加载时调用
+    func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
+        print("didStartProvisionalNavigation")
+    }
+    // 当内容开始返回时调用
+    func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
+        print("didCommit")
+    }
+    // 页面加载完成之后调用
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        print("didFinish")
+    }
+    // 页面加载失败时调用
+    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        print("didFailProvisionalNavigation")
+    }
+    // 接收到服务器跳转请求之后调用
+    func webView(_ webView: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
+        print("didReceiveServerRedirectForProvisionalNavigation")
+    }
+    // 在收到响应后，决定是否跳转 -> 默认允许
+    func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
+        print("decidePolicyFor")
+        //允许跳转
+        decisionHandler(.allow)
+        //不允许跳转
+//        decisionHandler(.cancel)
+    }
+    // 在发送请求之前，决定是否跳转 -> 默认允许
+    @available(iOS 13.0, *)
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void) {
+        print("decidePolicyFor")
+        let url:String = navigationAction.request.url!.absoluteString
+        print("navigationAction:\(navigationAction.navigationType.rawValue)")
+        print(url)
+        if(navigationAction.navigationType == .linkActivated){
+            let webVC =  CNWebViewController()
+            webVC.url = url
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+            decisionHandler(.cancel, preferences)
+            return
+        }else if(navigationAction.navigationType == .other){
+            if(url.contains("wjjh5.cnlive.com")){
+                
+                decisionHandler(.allow, preferences)
+                return
+            }else
+            {
+                decisionHandler(.cancel, preferences)
+                return
+            }
+        }
+        decisionHandler(.allow, preferences)
+    }
+    
     //MARK: - 网络请求获取身份列表
     func getUserIdentityApi()
     {
+//
+//  CNWebViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/9/21.
+//
+
+import Foundation
+import WebKit
+
+class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
+    
+    lazy var webView: WKWebView = {
+        let webView = WKWebView.init(frame: CGRectMake(0, 0, Width, Height))
+        webView.scrollView.showsVerticalScrollIndicator = false
+        webView.scrollView.showsHorizontalScrollIndicator = false
+        webView.navigationDelegate = self
+        return webView
+    }()
+    
+    var _url:String?
+    var url:String? {
+        get{
+            return _url
+        }
+        set{
+            _url = newValue!
+            if (_url != ""){
+                let webUrl: URL! = URL.init(string: _url!)
+                webView.load(URLRequest.init(url:webUrl))
+            }
+        }
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBarHidden = false
+        self.view.addSubview(self.webView)
+        webView.snp.makeConstraints { make in
+            make.top.equalTo(get_system_nav_height())
+            make.left.right.bottom.equalToSuperview()
+        }
+        
+    }
+    
+    // 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("decidePolicyFor")
+        //允许跳转
+        decisionHandler(.allow)
+        //不允许跳转
+        //        decisionHandler(.cancel)
+    }
+    // 在发送请求之前，决定是否跳转 -> 默认允许
+    @available(iOS 13.0, *)
+    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, preferences: WKWebpagePreferences, decisionHandler: @escaping (WKNavigationActionPolicy, WKWebpagePreferences) -> Void) {
+        
+        decisionHandler(.allow, preferences)
+    }
+}
@@ -20,13 +20,15 @@ class CNCustomIndexTopView : UIView{
         let titleLabel = UILabel.init(frame: CGRectMake(10, 0, 75, 35))
         titleLabel.bottom = self.bottom - 5
         titleLabel.textColor = .white
+        titleLabel.textAlignment = .left
         titleLabel.font = UIFont.systemFont(ofSize: 24, weight: .semibold)
+        titleLabel.adjustsFontSizeToFitWidth=true
         return titleLabel
     }()
     ///关闭按钮
     lazy var closeBtn: UIButton = {
         let  closeBtn = UIButton(type: .custom)
-        closeBtn.frame = CGRect(x: self.width - 30, y: 0, width: 30, height: 30)
+        closeBtn.frame = CGRect(x: self.width - 50, y: 0, width: 50, height: 50)
         closeBtn.centerY = self.titleLabel.centerY
         closeBtn.setImage(UIImage(named: "homePage_close_icon"), for: .normal)
         closeBtn.addTarget(self, action: #selector(closeBtnAction), for: .touchUpInside)
@@ -45,6 +47,16 @@ class CNCustomIndexTopView : UIView{
     func initUI(){
         self.addSubview(self.titleLabel)
         self.addSubview(self.closeBtn)
+        self.titleLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview()
+            make.right.equalTo(closeBtn.snp.left)
+        }
+        self.closeBtn.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview()
+            make.width.equalTo(50)
+        }
     }
     //MARK: - 公开方法
@@ -108,6 +120,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             _idModel = newValue
             self.upSlideView.url = _idModel?.upPath
             self.downSlideView.url = _idModel?.downPath
+            self.topNavView.setTitleString(title:(_idModel?.name)!)
         }
     }
@@ -171,6 +184,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         collectionView.backgroundColor = .clear
         collectionView.backAction = {[weak self] in
             self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
+            currentViewController()?.tabBarController?.tabBar.isHidden = false
             self?.superScrollView?.isScrollEnabled = true
             let time = DispatchTime.now() + 0.5
@@ -210,11 +224,12 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     /// 顶部自定义导航
     lazy var topNavView: CNCustomIndexTopView = {
-        let topNavView = CNCustomIndexTopView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: KNavigationHeight))
+        let topNavView = CNCustomIndexTopView.init(frame: CGRect(x: 0, y: 30, width: self.width, height: KNavigationHeight))
         topNavView.alpha = 0
         topNavView.closeAction = { [weak self ] in
             self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true)
             self?.superScrollView?.isScrollEnabled = true
+            currentViewController()?.tabBarController?.tabBar.isHidden = false
         }
         return topNavView
     }()
@@ -236,7 +251,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         self.addSubview(self.baseScrollView)
         self.addSubview(self.topNavView)
-        self.topNavView.setTitleString(title: "志愿者")
+//        self.topNavView.setTitleString(title: "志愿者")
         self.baseScrollView.addSubview(self.downSlideView)
         self.baseScrollView.addSubview(self.mainView)
@@ -54,7 +54,6 @@ class CNDownSlideView:UIView{
         }
         set{
             _url = newValue!
-//            _url = "https://www.baidu.com"
             if (_url != ""){
                 let webUrl: URL! = URL.init(string: _url!)
                 webView.load(URLRequest.init(url:webUrl))
@@ -28,6 +28,7 @@ class CNHomePageBackgroupSubView : UIView
         let titleLabel = UILabel.init(frame: CGRectMake(25, KNavigationHeight - 20, KSreenWidth - 50, 35))
         titleLabel.textColor = .white
         titleLabel.font = UIFont.systemFont(ofSize: 20, weight: .semibold)
+        titleLabel.adjustsFontSizeToFitWidth=true
         return titleLabel
     }()
@@ -27,23 +27,49 @@ class CNFrontMainView : UIView{
     }
     ///视图总容器
-    lazy var frontContentView : UIView = {
+    lazy var frontTotolContentView : UIView = {
-        let frontContentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
-        frontContentView.backgroundColor = UIColor.white
-        frontContentView.clipsToBounds = true
-        frontContentView.layer.cornerRadius = 20
-        frontContentView.addSubview(self.contentView)
-        return frontContentView
+        let frontTotolContentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
+        frontTotolContentView.backgroundColor = UIColor.white
+        frontTotolContentView.clipsToBounds = true
+        frontTotolContentView.layer.cornerRadius = 20
+        return frontTotolContentView
     }()
-    /// 已认证-身份卡片
-    lazy var iDCardView:CNIDCardView = {
+    ///未认证-前置视图身份描述容器
+    lazy var frontDescContentView : UIView = {
-        let iDCardView:CNIDCardView = CNIDCardView(frame: CGRect(x: 20, y: 25, width: self.width-40, height: (self.width-40) * 0.64))
-        return iDCardView
+        let frontDescContentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
+        frontDescContentView.backgroundColor = UIColor.white
+        frontDescContentView.clipsToBounds = true
+        frontDescContentView.layer.cornerRadius = 20
+        frontDescContentView.addSubview(self.textViewBgImgView)
+        textViewBgImgView.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.equalToSuperview()
+            make.right.equalToSuperview()
+            make.bottom.equalToSuperview()
+        }
+        
+        frontDescContentView.addSubview(self.addStandBtn)
+        addStandBtn.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-30)
+            make.width.equalTo(150)
+            make.height.equalTo(39)
+        }
+                
+        frontDescContentView.addSubview(self.textView)
+        textView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(40)
+            make.left.equalToSuperview().offset(30)
+            make.right.equalToSuperview().offset(-30)
+            make.bottom.equalTo(addStandBtn.snp.top).offset(-30)
+        }
+        
+        return frontDescContentView
+        
     }()
-    
     //未认证下 textview
     lazy var textView: UITextView = {
         let textView = UITextView.init()
@@ -57,10 +83,10 @@ class CNFrontMainView : UIView{
         textView.clipsToBounds = true
         textView.layer.cornerRadius = 14
         textView.isUserInteractionEnabled = false
+        textView.backgroundColor = .clear
         return textView
     }()
-    
-    ///点击添加身份 按钮
+    ///未认证-点击添加身份 按钮
     lazy var addStandBtn: UIButton = {
         let addStandBtn = UIButton(type: .custom)
         addStandBtn.clipsToBounds = true
@@ -73,32 +99,55 @@ class CNFrontMainView : UIView{
         return addStandBtn
     }()
-    ///前置视图容器
-    lazy var contentView : UIView = {
+    ///已认证-前置视图卡片容器
+    lazy var frontCardContentView : UIView = {
-        let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
-        contentView.backgroundColor = UIColor.white
-        contentView.clipsToBounds = true
-        contentView.layer.cornerRadius = 20
-        contentView.addSubview(self.addStandBtn)
-        addStandBtn.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-30)
-            make.width.equalTo(150)
-            make.height.equalTo(39)
-        }
-                
-        contentView.addSubview(self.textView)
-        textView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(40)
-            make.left.equalToSuperview().offset(30)
-            make.right.equalToSuperview().offset(-30)
-            make.bottom.equalTo(addStandBtn.snp.top).offset(-30)
+        let frontCardContentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
+        frontCardContentView.backgroundColor = UIColor.white
+        frontCardContentView.clipsToBounds = true
+        frontCardContentView.layer.cornerRadius = 20
+        frontCardContentView.addSubview(self.cardViewBgImgView)
+        cardViewBgImgView.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.equalToSuperview()
+            make.right.equalToSuperview()
+            make.bottom.equalToSuperview()
         }
-        return contentView
+        frontCardContentView.addSubview(self.iDCardView)
+        iDCardView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(25)
+            make.width.equalTo(self.width-40)
+            make.height.equalTo((self.width-40) * 0.64)
+        }
+        return frontCardContentView
     }()
+    /// 已认证-身份卡片
+    lazy var iDCardView:CNIDCardView = {
+
+        let iDCardView:CNIDCardView = CNIDCardView(frame: CGRect(x: 20, y: 25, width: self.width-40, height: (self.width-40) * 0.64))
+        return iDCardView
+    }()
+    
+    /// 已认证-身份卡片
+    lazy var textViewBgImgView:UIImageView = {
+
+        let textViewBgImgView:UIImageView = UIImageView()
+        textViewBgImgView.clipsToBounds = true
+        textViewBgImgView.layer.cornerRadius = 20
+        return textViewBgImgView
+    }()
+    
+    /// 已认证-卡片后的背景图
+    lazy var cardViewBgImgView:UIImageView = {
+
+        let cardViewBgImgView:UIImageView = UIImageView()
+        cardViewBgImgView.clipsToBounds = true
+        cardViewBgImgView.layer.cornerRadius = 20
+        return cardViewBgImgView
+    }()
     //IDmodel
     var _idModel : StandListModel?
@@ -112,37 +161,33 @@ class CNFrontMainView : UIView{
             if(auth == true){
             //已认证身份
                 //显示证件View
-                iDCardView.isHidden = false
+                frontCardContentView.isHidden = false
                 iDCardView.idModel = newValue!
-                contentView.isHidden = true
-                
+                frontDescContentView.isHidden = true
+                cardViewBgImgView.kf.setImage(with: URL(string: _idModel!.cardBackgroundImg), placeholder: UIImage(named: "homepage_cardBGImg"))
             }else
             {//未认证身份
-                iDCardView.isHidden = true
+                frontCardContentView.isHidden = true
                 //显示textview 添加身份
-                contentView.isHidden = false
+                frontDescContentView.isHidden = false
                 textView.text = newValue!.description
                 addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
-                textView.backgroundColor = HexColor(newValue!.backgroundColor, alpha: 0.1)
+                textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
             }
         } 
     }
     func initUI()
     {
-        self.addSubview(self.frontContentView)
-        self.frontContentView.addSubview(self.contentView)
-        self.frontContentView.addSubview(self.iDCardView)
+        self.addSubview(self.frontTotolContentView)
+        self.frontTotolContentView.addSubview(self.frontDescContentView)
+        self.frontTotolContentView.addSubview(self.frontCardContentView)
+        
         self.makeConstraints()
     }
     func makeConstraints(){
-        self.iDCardView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalToSuperview().offset(25)
-            make.width.equalTo(self.width-40)
-            make.height.equalTo((self.width-40) * 0.64)
-        }
+        
     }
     // MARK: -按钮点击事件
@@ -291,7 +336,7 @@ class CNMainView : UIView{
     // MARK: - <##><##>设置前置视图容器
     func isHiddenMainFrontContentView(isHidden:Bool){
-        self.frontView.contentView.isHidden = isHidden
+        self.frontView.frontTotolContentView.isHidden = isHidden
     }
     // MARK: - 事件
@@ -136,21 +136,24 @@ class StandListBaseModel: BaseModel {
 final class StandListModel: BaseModel, TableCodable {
-    var icon: String?//小圆图标
-    var name: String?//名称
-    var enable: Bool = false//没用
     var id: Int = 0//ID号
+    var name: String?//名称
+    var icon: String?//小圆图标
     var createTime: Int = 0//注册时间
-    var createTimeString: String = ""
-    var timeString: String = ""
-    var auth: Bool = false//身份是否验证
+    var enable: Bool = false//没用
     var backgroundImg: String = ""//首页背景图
     var backgroundColor: String = ""//添加身份按钮背景色
     var backgroundColour: String = ""
     var description: String = ""//首页身份说明描述
+    var descBackgroundImg: String = ""//首页文字背景图
     var cardImg: String = ""//卡片背景图
-    var downPath: String = ""//下滑h5
+    var cardBackgroundImg: String = ""//首页卡片背景图
     var upPath: String = ""//上滑h5
+    var downPath: String = ""//下滑h5
+    var auth: Bool = false//身份是否验证
+    
+    var createTimeString: String = ""
+    var timeString: String = ""
     override func mapping(mapper: HelpingMapper) {
         mapper <<<
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_cardBGImg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "homepage_cardBGImg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "homepage_desc_bgImg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "homepage_desc_bgImg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}