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

“张旭”
2 parents e664404f 0b8f3858
Showing 13 changed files with 246 additions and 21 deletions
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthFormViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_agency_icon.imageset/mine_form_auth_btn_agency_icon@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_agency_icon.imageset/mine_form_auth_btn_agency_icon@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_enterprise_icon.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_enterprise_icon.imageset/mine_form_auth_btn_enterprise_icon@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_enterprise_icon.imageset/mine_form_auth_btn_enterprise_icon@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_persion_icon.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_persion_icon.imageset/mine_form_auth_btn_persion_icon@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_persion_icon.imageset/mine_form_auth_btn_persion_icon@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_persion_auth_btn.imageset/mine_persion_auth_btn@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_persion_auth_btn.imageset/mine_persion_auth_btn@3x.png
@@ -7,14 +7,17 @@
  
 import Foundation
 import UIKit
+import EmptyDataSet_Swift
  
-class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource {
+class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource,EmptyDataSetSource, EmptyDataSetDelegate {
  
     let kMIneBodyAuthFormViewCellIdentifier = "kMIneBodyAuthFormViewCellIdentifier"
     lazy var tableView: UITableView = {
         let tableView = UITableView.init(frame: .zero, style: .grouped)
         tableView.delegate = self
         tableView.dataSource = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.showsVerticalScrollIndicator = false
@@ -23,6 +26,28 @@ class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDel
         return tableView
     }()
  
+    lazy var dataArray: NSMutableArray = {
+        let array = NSMutableArray.init()
+        if _listModel.userAuth {
+            array.add(["back":"mine_form_auth_btn_persion","icon":"mine_form_auth_btn_persion_icon","name":"个人认证","desc":"适合个人创作者、行业专家、自媒体领域"])
+        }
+        if _listModel.enterpriseAuth && _listModel.agencyAuth {
+            let dict01 = ["back":"mine_form_auth_btn_formal_larg","icon":"mine_form_auth_btn_enterprise_icon","name":"企业认证","desc":"适合企业、个体工商户"]
+            let dict02 = ["back":"mine_form_auth_btn_formal_larg","icon":"mine_form_auth_btn_agency_icon","name":"机构认证","desc":"适合国家机构、社会组织、高校等"]
+            let temp_array = NSMutableArray()
+            temp_array.add(dict01)
+            temp_array.add(dict02)
+            array.add(temp_array as! [Dictionary<String,String>])
+        } else {
+            if _listModel.enterpriseAuth  {
+                array.add(["back":"mine_form_auth_btn_formal","icon":"mine_form_auth_btn_enterprise_icon","name":"企业认证","desc":"适合企业、个体工商户"])
+            }else if _listModel.agencyAuth {
+                array.add(["back":"mine_form_auth_btn_formal","icon":"mine_form_auth_btn_agency_icon","name":"机构认证","desc":"适合国家机构、社会组织、高校等"])
+            }
+        }
+        return array
+    }()
+    
     var _listModel: StandListModel!
  
     init(listModel:StandListModel) {
@@ -48,25 +73,61 @@ class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDel
     }
  
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 2
+        return dataArray.count
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return section == 0 ? 1 : 2
+        return 1
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kMIneBodyAuthFormViewCellIdentifier) as? MineAuthFormTableViewCell else {
             return MineAuthFormTableViewCell()
         }
-        if indexPath.section == 0 && indexPath.row == 1 {
-            cell.mainView.image = UIImage(named: "mine_form_auth_btn_persion")
+        cell.indexPath = indexPath
+        cell.clickBlock = {[weak self] indexPath, view in
+            guard let self = self else { return }
+            let titleLabel = view.viewWithTag(1000) as! UILabel
+            if titleLabel.text == "个人认证" {
+                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .person), animated: true)
+            }
+            if titleLabel.text == "企业认证" {
+                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .enterprise), animated: true)
+            }
+            if titleLabel.text == "机构认证" {
+                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .agency), animated: true)
+            }
+        }
+        let obj = dataArray[indexPath.section]
+        if obj is Dictionary<String, String> {
+            let dict = obj as! Dictionary<String, String>
+            cell.mainView.image = UIImage(named: dict["back"]! as String)
+            cell.headerImageView.image = UIImage(named: dict["icon"]! as String)
+            cell.titleLabel.text = dict["name"]! as String
+            cell.descLabel.text = dict["desc"]! as String
+            cell.whiteView01.isHidden = true
         }
-        if indexPath.section == 1 {
-            cell.mainView.image = UIImage(named: "mine_form_auth_btn")
+        if obj is [Dictionary<String,String>] {
+            cell.whiteView01.isHidden = false
+            let dict01 = (obj as! Array<Dictionary<String, String>>).first
+            cell.mainView.image = UIImage(named: dict01!["back"]! as String)
+            cell.headerImageView.image = UIImage(named: dict01!["icon"]! as String)
+            cell.titleLabel.text = dict01!["name"]! as String
+            cell.descLabel.text = dict01!["desc"]! as String
+            let dict02 = (obj as! Array<Dictionary<String, String>>).last
+            cell.headerImageView01.image = UIImage(named: dict02!["icon"]! as String)
+            cell.titleLabel01.text = dict02!["name"]! as String
+            cell.descLabel01.text = dict02!["desc"]! as String
         }
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return adapt_length(length: 190)
+        let obj = dataArray[indexPath.section]
+        if obj is Dictionary<String, String> {
+            return adapt_length(length: 190)
+        }
+        if obj is  [Dictionary<String,String>] {
+            return adapt_length(length: 280)
+        }
+        return adapt_length(length: 0.01)
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
         return adapt_length(length: 10)
@@ -74,19 +135,19 @@ class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDel
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         return adapt_length(length: 10)
     }
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-//        if indexPath.section == 0 {
-//            self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .person), animated: true)
-//        }
-//        if indexPath.section == 1 {
-//            self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .enterprise), animated: true)
-//        }
-//        if indexPath.section == 2 {
-//            self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .agency), animated: true)
-//        }
+}
+
+extension CNLiveMineAuthFormViewController {
+    func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
+        return UIImage(named: "mine_list_source_unusual_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView) -> NSAttributedString? {
+        return NSAttributedString(string: "您已添加此身份,请直接使用", attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
     }
 }
  
+typealias clickWithClickBlock = (_ indexPath: IndexPath,_ view: UIView) -> Void
 class MineAuthFormTableViewCell: UITableViewCell {
  
     lazy var mainView: UIImageView = {
@@ -103,9 +164,71 @@ class MineAuthFormTableViewCell: UITableViewCell {
         view.backgroundColor = .white
         view.layer.masksToBounds = true
         view.layer.cornerRadius = adapt_length(length: 10)
+        view.isUserInteractionEnabled = true
+        view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(clickWithWhiteAction)))
         return view
     }()
  
+    lazy var headerImageView: UIImageView = {
+        let headerImageView = UIImageView.init()
+        headerImageView.backgroundColor = .white
+        headerImageView.contentMode = .scaleAspectFill
+        headerImageView.layer.masksToBounds = true
+        return headerImageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.tag = 1000
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.font = semibold_adapt_font(pointSize: 16)
+        return titleLabel
+    }()
+    
+    lazy var descLabel: UILabel = {
+        let descLabel = UILabel.init()
+        descLabel.textColor = HexColor("#999999")
+        descLabel.font = regular_adapt_font(pointSize: 14)
+        return descLabel
+    }()
+    
+    lazy var whiteView01: UIView = {
+        let view = UIView.init()
+        view.backgroundColor = .white
+        view.isHidden = true
+        view.layer.masksToBounds = true
+        view.layer.cornerRadius = adapt_length(length: 10)
+        view.isUserInteractionEnabled = true
+        view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(clickWithWhite01Action)))
+        return view
+    }()
+    
+    lazy var headerImageView01: UIImageView = {
+        let headerImageView = UIImageView.init()
+        headerImageView.backgroundColor = .white
+        headerImageView.contentMode = .scaleAspectFill
+        headerImageView.layer.masksToBounds = true
+        return headerImageView
+    }()
+    
+    lazy var titleLabel01: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.tag = 1000
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.font = semibold_adapt_font(pointSize: 16)
+        return titleLabel
+    }()
+    
+    lazy var descLabel01: UILabel = {
+        let descLabel = UILabel.init()
+        descLabel.textColor = HexColor("#999999")
+        descLabel.font = regular_adapt_font(pointSize: 12)
+        return descLabel
+    }()
+    
+    var indexPath: IndexPath!
+    var clickBlock: clickWithClickBlock!
+    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         contentView.backgroundColor = .clear
@@ -121,7 +244,65 @@ class MineAuthFormTableViewCell: UITableViewCell {
  
         contentView.addSubview(whiteView)
         whiteView.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-adapt_length(length: 20))
+            make.left.equalToSuperview().offset(adapt_length(length: 30))
+            make.right.equalToSuperview().offset(-adapt_length(length: 30))
+            make.height.equalTo(adapt_length(length: 80))
+        }
+        
+        whiteView.addSubview(headerImageView)
+        headerImageView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(adapt_length(length: 5))
+            make.size.equalTo(adapt_length(length: 70))
+        }
+        whiteView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(headerImageView.snp.top).offset(adapt_length(length: 10))
+            make.left.equalTo(headerImageView.snp.right).offset(adapt_length(length: 10))
+            make.right.equalToSuperview().offset(-adapt_length(length: 10))
         }
+        whiteView.addSubview(descLabel)
+        descLabel.snp.makeConstraints { make in
+            make.bottom.equalTo(headerImageView.snp.bottom).offset(-adapt_length(length: 10))
+            make.left.equalTo(headerImageView.snp.right).offset(adapt_length(length: 10))
+            make.right.equalToSuperview().offset(-adapt_length(length: 10))
+        }
+        
+        contentView.addSubview(whiteView01)
+        whiteView01.snp.makeConstraints { make in
+            make.bottom.equalTo(whiteView.snp.top).offset(-adapt_length(length: 10))
+            make.left.equalToSuperview().offset(adapt_length(length: 30))
+            make.right.equalToSuperview().offset(-adapt_length(length: 30))
+            make.height.equalTo(adapt_length(length: 80))
+        }
+        
+        whiteView01.addSubview(headerImageView01)
+        headerImageView01.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(adapt_length(length: 5))
+            make.size.equalTo(adapt_length(length: 70))
+        }
+        whiteView01.addSubview(titleLabel01)
+        titleLabel01.snp.makeConstraints { make in
+            make.top.equalTo(headerImageView01.snp.top).offset(adapt_length(length: 10))
+            make.left.equalTo(headerImageView01.snp.right).offset(adapt_length(length: 10))
+            make.right.equalToSuperview().offset(-adapt_length(length: 10))
+        }
+        whiteView01.addSubview(descLabel01)
+        descLabel01.snp.makeConstraints { make in
+            make.bottom.equalTo(headerImageView01.snp.bottom).offset(-adapt_length(length: 10))
+            make.left.equalTo(headerImageView01.snp.right).offset(adapt_length(length: 10))
+            make.right.equalToSuperview().offset(-adapt_length(length: 10))
+        }
+    }
+    
+    @objc func clickWithWhiteAction() {
+        self.clickBlock(indexPath,whiteView)
+    }
+    
+    @objc func clickWithWhite01Action() {
+        self.clickBlock(indexPath,whiteView01)
     }
  
     required init?(coder: NSCoder) {
@@ -155,7 +155,7 @@ final class StandListModel: BaseModel {//, TableCodable {
     var upType: Int = 0//下滑类型1:h5 2:原生页面 3店铺详情 4 店铺控制台
     var downType: Int = 0//上滑类型1:h5 2:原生页面 3店铺详情 4 店铺控制台
     var downPath: String = ""//底部h5url 或原生页面pageId-
-    var userAuth: Bool = false//是否显示个人认证
+    var userAuth: Bool = true//是否显示个人认证
     var enterpriseAuth: Bool = false//是否显示企业认证
     var agencyAuth: Bool = false//是否显示机构认证
     var auth: Bool = false//身份是否验证
@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "mine_persion_auth_btn@2x.png",
+      "filename" : "mine_form_auth_btn_agency_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "mine_persion_auth_btn@3x.png",
+      "filename" : "mine_form_auth_btn_agency_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_form_auth_btn_enterprise_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_form_auth_btn_enterprise_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_form_auth_btn_persion_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_form_auth_btn_persion_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}