iOS Team / CNLiveMateCode · Commits

Commit 8d49f8c68dbf280d8f5e6fbda90985d5f396b406

Authored by “张旭”
1 parent 4ef6befb

1. 更换实时热榜背景图 2.实名认证页面 3.选择身份页面

Inline Side-by-side
Showing 23 changed files with 922 additions and 96 deletions
metaCode.xcodeproj/project.pbxproj
  View file @8d49f8c
... ... @@ -138,6 +138,10 @@
138 138 19C735C12BFDCEE900CACF4E /* CNLiveTotalHotListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735C02BFDCEE900CACF4E /* CNLiveTotalHotListController.swift */; };
139 139 19C735C32BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735C22BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift */; };
140 140 19C735C52BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735C42BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift */; };
  141 + 19C735CA2C10647B00CACF4E /* CNLiveDigitalAuthCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735C92C10647B00CACF4E /* CNLiveDigitalAuthCell.swift */; };
  142 + 19C735CC2C11A1F400CACF4E /* CNLiveDigitalThreeCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735CB2C11A1F400CACF4E /* CNLiveDigitalThreeCollectCell.swift */; };
  143 + 19C735CE2C12D19D00CACF4E /* CNLiveRealNameAuthController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735CD2C12D19D00CACF4E /* CNLiveRealNameAuthController.swift */; };
  144 + 19C735D02C12F5F600CACF4E /* CNLiveRealNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19C735CF2C12F5F600CACF4E /* CNLiveRealNameCell.swift */; };
141 145 19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */; };
142 146 19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */; };
143 147 19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */; };
... ... @@ -425,6 +429,10 @@
425 429 19C735C02BFDCEE900CACF4E /* CNLiveTotalHotListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTotalHotListController.swift; sourceTree = "<group>"; };
426 430 19C735C22BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRealHotListDetailCell.swift; sourceTree = "<group>"; };
427 431 19C735C42BFF09BA00CACF4E /* CNLiveRealHotListDetailImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRealHotListDetailImageCell.swift; sourceTree = "<group>"; };
  432 + 19C735C92C10647B00CACF4E /* CNLiveDigitalAuthCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalAuthCell.swift; sourceTree = "<group>"; };
  433 + 19C735CB2C11A1F400CACF4E /* CNLiveDigitalThreeCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDigitalThreeCollectCell.swift; sourceTree = "<group>"; };
  434 + 19C735CD2C12D19D00CACF4E /* CNLiveRealNameAuthController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRealNameAuthController.swift; sourceTree = "<group>"; };
  435 + 19C735CF2C12F5F600CACF4E /* CNLiveRealNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveRealNameCell.swift; sourceTree = "<group>"; };
428 436 19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNDownSlideSingleCourseCell.swift; sourceTree = "<group>"; };
429 437 19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Extension.swift"; sourceTree = "<group>"; };
430 438 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideDetailViewController.swift; sourceTree = "<group>"; };
... ... @@ -1049,6 +1057,7 @@
1049 1057 isa = PBXGroup;
1050 1058 children = (
1051 1059 19C0F7732BDF71CA0097CC8F /* CNLiveDigitalAuthController.swift */,
  1060 + 19C735CD2C12D19D00CACF4E /* CNLiveRealNameAuthController.swift */,
1052 1061 );
1053 1062 path = DigitalAuth;
1054 1063 sourceTree = "<group>";
... ... @@ -1061,6 +1070,16 @@
1061 1070 path = CNLiveTotalHotListController;
1062 1071 sourceTree = "<group>";
1063 1072 };
  1073 + 19C735C82C1063A000CACF4E /* DigitalAuthViews */ = {
  1074 + isa = PBXGroup;
  1075 + children = (
  1076 + 19C735C92C10647B00CACF4E /* CNLiveDigitalAuthCell.swift */,
  1077 + 19C735CB2C11A1F400CACF4E /* CNLiveDigitalThreeCollectCell.swift */,
  1078 + 19C735CF2C12F5F600CACF4E /* CNLiveRealNameCell.swift */,
  1079 + );
  1080 + path = DigitalAuthViews;
  1081 + sourceTree = "<group>";
  1082 + };
1064 1083 19CC4D502ADD126D00308E2A /* Util */ = {
1065 1084 isa = PBXGroup;
1066 1085 children = (
... ... @@ -1510,6 +1529,7 @@
1510 1529 7CD675232A26F8F8008354C1 /* View */ = {
1511 1530 isa = PBXGroup;
1512 1531 children = (
  1532 + 19C735C82C1063A000CACF4E /* DigitalAuthViews */,
1513 1533 1938BD4E2B51316200390A34 /* VerticalViews */,
1514 1534 1938BD4B2B512D3000390A34 /* Shop */,
1515 1535 );
... ... @@ -1848,6 +1868,7 @@
1848 1868 1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */,
1849 1869 191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
1850 1870 1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */,
  1871 + 19C735CC2C11A1F400CACF4E /* CNLiveDigitalThreeCollectCell.swift in Sources */,
1851 1872 798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
1852 1873 799172382AF090CD00DC01A8 /* CNLiveShopBodyListView.swift in Sources */,
1853 1874 19565ED42AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift in Sources */,
... ... @@ -1936,6 +1957,7 @@
1936 1957 79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */,
1937 1958 19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */,
1938 1959 19C0F76D2BDB48750097CC8F /* CNBindingManageCell.swift in Sources */,
  1960 + 19C735CE2C12D19D00CACF4E /* CNLiveRealNameAuthController.swift in Sources */,
1939 1961 1917331D2B10A15A007BCC04 /* CNLivePlayerFailureView.swift in Sources */,
1940 1962 7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
1941 1963 19C735C32BFED49700CACF4E /* CNLiveRealHotListDetailCell.swift in Sources */,
... ... @@ -1998,11 +2020,13 @@
1998 2020 19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
1999 2021 1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */,
2000 2022 790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
  2023 + 19C735D02C12F5F600CACF4E /* CNLiveRealNameCell.swift in Sources */,
2001 2024 7999415C2B4E8E8E0014C721 /* CNLiveRefresh.swift in Sources */,
2002 2025 19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
2003 2026 7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
2004 2027 19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */,
2005 2028 1917330A2B10864F007BCC04 /* Array+CNLiveExtensions.swift in Sources */,
  2029 + 19C735CA2C10647B00CACF4E /* CNLiveDigitalAuthCell.swift in Sources */,
2006 2030 191732FB2B0AF34A007BCC04 /* CNLiveShopGoodsDetailsModel.swift in Sources */,
2007 2031 191733152B109FD7007BCC04 /* CNLivePlayerTopNaviView.swift in Sources */,
2008 2032 794FF1052B01FC8800385E85 /* CNLiveShopOrderSearchViewController.swift in Sources */,
... ...
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveDigitalAuthController.swift
  View file @8d49f8c
... ... @@ -3,12 +3,12 @@
3 3 // metaCode
4 4 //
5 5 // Created by zx on 2024/4/29.
6   -// 数字认证页面-选择领域
  6 +// 数字认证页面-选择身份
7 7  
8 8 import Foundation
9 9 import SnapKit
10 10  
11   -class CNLiveDigitalAuthController:CNLiveBaseViewController{
  11 +class CNLiveDigitalAuthController:CNLiveBaseViewController,UITableViewDataSource, UITableViewDelegate{
12 12  
13 13 lazy var bgImgView :UIImageView = {
14 14 let iconImgView = UIImageView()
... ... @@ -41,33 +41,85 @@ class CNLiveDigitalAuthController:CNLiveBaseViewController{
41 41 whiteBgView.clipsToBounds = true
42 42 return whiteBgView
43 43 }()
44   - lazy var blueLineView :UIView = {
45   - let blueLineView = UIView()
46   - blueLineView.backgroundColor = HexColor("#1F64E3")
47   - blueLineView.layer.cornerRadius = 1.75
48   - blueLineView.clipsToBounds = true
49   - return blueLineView
  44 + lazy var whiteTopView :UIView = {
  45 + let whiteTopView = UIView()
  46 + whiteTopView.backgroundColor = HexColor("#E8EFFE")
  47 + whiteTopView.clipsToBounds = true
  48 + return whiteTopView
50 49 }()
51 50 lazy var changeLabel: UILabel = {
52   - let titleLabel = UILabel()
53   - titleLabel.textColor = HexColor("#333333")
54   - titleLabel.text = "选择您当前所在领域"
55   - titleLabel.font = Font_16
56   - return titleLabel
  51 + let changeLabel = UILabel()
  52 + changeLabel.textColor = HexColor("#333333")
  53 + changeLabel.text = "请选择您本人当前真实身份"
  54 + changeLabel.font = Font_16
  55 + return changeLabel
57 56 }()
58 57  
59 58 lazy var dataArray :NSMutableArray = {
60 59 let dataArray = NSMutableArray()
61 60 return dataArray
62 61 }()
  62 + let kCNLiveDigitalAuthCellIdentifier = "kCNLiveDuanjuTitleCellIdentifier"
  63 +
  64 + lazy var tableView : UITableView = {
  65 + let tableView = UITableView(frame: .zero, style: .plain)
  66 + tableView.dataSource = self
  67 + tableView.delegate = self
  68 + tableView.separatorStyle = .none
  69 + tableView.tableFooterView = UIView.init()
  70 + tableView.register(CNLiveDigitalAuthCell.self, forCellReuseIdentifier: kCNLiveDigitalAuthCellIdentifier)
  71 + return tableView
  72 + }()
  73 + var currentSeleIndex = 0
  74 +
  75 + lazy var chengnuoLabel: UILabel = {
  76 + let changeLabel = UILabel()
  77 + changeLabel.textColor = HexColor("#999999")
  78 + changeLabel.text = "您承诺信息真实，元码将记录该次承诺"
  79 + changeLabel.font = Font_12
  80 + changeLabel.textAlignment = .center
  81 + return changeLabel
  82 + }()
  83 + lazy var xuanzeLabel: UILabel = {
  84 + let changeLabel = UILabel()
  85 + changeLabel.textColor = HexColor("#999999")
  86 + changeLabel.text = "选择个人认证后，不可再进行企业认证或机构认证"
  87 + changeLabel.font = Font_12
  88 + changeLabel.textAlignment = .center
  89 + return changeLabel
  90 + }()
  91 + lazy var nextBtn: UIButton = {
  92 + let nextBtn = UIButton(type: .custom)
  93 + nextBtn.setTitle("下一步", for: .normal)
  94 + nextBtn.setTitleColor(.white, for: .normal)
  95 + nextBtn.backgroundColor = HexColor("#1961FE")
  96 + nextBtn.layer.cornerRadius = 22
  97 + nextBtn.clipsToBounds = true
  98 + nextBtn.addTarget(self, action: #selector(nextBtnAction), for: .touchUpInside)
  99 + return nextBtn
  100 + }()
63 101  
64 102  
  103 + var channelId:String = ""
  104 + var vsid:String = ""
  105 + var sid:String = ""
  106 + init(channelId: String, vsid: String, sid: String) {
  107 + super.init(nibName: nil, bundle: nil)
  108 + self.channelId = channelId
  109 + self.vsid = vsid
  110 + self.sid = sid
  111 + }
  112 +
  113 + required init?(coder: NSCoder) {
  114 + fatalError("init(coder:) has not been implemented")
  115 + }
  116 +
65 117 override func viewDidLoad() {
66 118 super.viewDidLoad()
67 119 navigationBarHidden = false
68 120 titleName = "元码数字认证"
69 121 self.initUI()
70   - self.loadData()
  122 + self.getAuthenticationsApi(channelId: self.channelId, vsid: self.vsid, sid: self.sid)
71 123 }
72 124  
73 125 deinit {
... ... @@ -75,6 +127,7 @@ class CNLiveDigitalAuthController:CNLiveBaseViewController{
75 127 }
76 128  
77 129 func initUI(){
  130 + self.view.backgroundColor = .white
78 131 self.view.addSubview(self.bgImgView)
79 132 self.bgImgView.snp.makeConstraints { make in
80 133 make.top.equalTo(KNavigationHeight)
... ... @@ -102,25 +155,128 @@ class CNLiveDigitalAuthController:CNLiveBaseViewController{
102 155 make.right.equalToSuperview().offset(-15)
103 156 }
104 157  
105   - self.whiteBgView.addSubview(self.blueLineView)
106   - self.blueLineView.snp.makeConstraints { make in
107   - make.top.equalTo(24)
108   - make.left.equalTo(17)
109   - make.width.equalTo(3)
110   - make.height.equalTo(15)
  158 + self.whiteBgView.addSubview(self.whiteTopView)
  159 + self.whiteTopView.snp.makeConstraints { make in
  160 + make.height.equalTo(53)
  161 + make.top.left.right.equalToSuperview()
111 162 }
112   -
113   - self.whiteBgView.addSubview(self.changeLabel)
  163 +
  164 + self.whiteTopView.addSubview(self.changeLabel)
114 165 self.changeLabel.snp.makeConstraints { make in
115   - make.centerY.equalTo(self.blueLineView.snp.centerY)
116   - make.left.equalTo(30)
  166 + make.centerY.equalToSuperview()
  167 + make.height.equalTo(23)
  168 + make.left.equalTo(20)
  169 + make.right.equalToSuperview().offset(-20)
  170 + }
  171 +
  172 + self.whiteBgView.addSubview(self.tableView)
  173 + self.tableView.snp.makeConstraints { make in
  174 + make.top.equalTo(53)
  175 + make.left.equalTo(0)
  176 + make.width.equalToSuperview()
  177 + make.bottom.equalTo(self.whiteBgView.snp.bottom).offset(-110)
  178 + }
  179 + self.whiteBgView.addSubview(self.nextBtn)
  180 + self.nextBtn.snp.makeConstraints { make in
  181 + make.bottom.equalToSuperview().offset(-15)
  182 + make.height.equalTo(44)
  183 + make.left.equalTo(15)
  184 + make.right.equalToSuperview().offset(-15)
  185 + }
  186 +
  187 + self.whiteBgView.addSubview(self.xuanzeLabel)
  188 + self.xuanzeLabel.snp.makeConstraints { make in
  189 + make.bottom.equalTo(self.nextBtn.snp.top).offset(-10)
  190 + make.height.equalTo(17)
  191 + make.left.equalTo(10)
  192 + make.right.equalToSuperview().offset(-10)
  193 + }
  194 +
  195 + self.whiteBgView.addSubview(self.chengnuoLabel)
  196 + self.chengnuoLabel.snp.makeConstraints { make in
  197 + make.bottom.equalTo(self.xuanzeLabel.snp.top).offset(-5)
  198 + make.height.equalTo(17)
  199 + make.left.equalTo(10)
  200 + make.right.equalToSuperview().offset(-10)
117 201 }
  202 +
  203 + }
  204 +
  205 + func numberOfSections(in tableView: UITableView) -> Int {
  206 + 1
  207 + }
  208 + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
  209 + return self.dataArray.count
  210 + }
  211 +
  212 + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
  213 + guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalAuthCellIdentifier) as? CNLiveDigitalAuthCell
  214 + else {
  215 + let cell = CNLiveDigitalAuthCell()
  216 + return cell
  217 + }
  218 + if self.currentSeleIndex == indexPath.row{
  219 + cell.tblCellIsSelect = true
  220 + }else{
  221 + cell.tblCellIsSelect = false
  222 + }
  223 + let model = self.dataArray[indexPath.row] as! MineAuthenticationsChildModel
  224 + cell.childModel = model
  225 + cell.selectBlock = {[weak self] currCell in
  226 + if let idxPath = self?.tableView.indexPath(for: currCell){
  227 + self!.currentSeleIndex = idxPath.row
  228 + self!.tableView.reloadData()
  229 + }
  230 + }
  231 + return cell
  232 + }
  233 +
  234 + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
118 235  
119 236 }
120 237  
121   - func loadData(){
122   - self.dataArray = NSMutableArray(array: ["来华留学生","大学生"])
123   - self.setDataUI()
  238 + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
  239 + return 160
  240 + }
  241 +
  242 +
  243 + @objc func nextBtnAction(){
  244 +
  245 + if UserInfoManager.shared.userInfo.userMsgUsers?.verifyUsers.count ?? 0 > 0{
  246 + //实名认证过->身份管理页面
  247 +
  248 + }else{
  249 + //未实名认证->实名认证
  250 + self.navigationController?.pushViewController(CNLiveRealNameAuthController(), animated: true)
  251 + }
  252 + }
  253 +
  254 + //行业认证列表
  255 + func getAuthenticationsApi(channelId:String ,vsid:String,sid:String)
  256 + {
  257 + showLoading(message: "")
  258 + CNLiveMineViewModel.requestsIndustryInfo(channelId: channelId, sid: sid, vsid: vsid) { result, respStatue in
  259 + if respStatue == .success{//UserInfoManager.shared.userInfo.uid vsid "1342671" "2"
  260 + if let res = result as? [MineAuthenticationsChildModel]{
  261 + //添加每个MineAuthenticationsBaseModel到self.dataArray对应的 频道列表model里
  262 + if res.count > 0{
  263 + //所有二级行业
  264 + var totalTwoChildsArr = Array<MineAuthenticationsChildModel>()
  265 + res.forEach { twoChildModels in
  266 + twoChildModels.child.forEach { twoChildModel in
  267 + totalTwoChildsArr.append(twoChildModel)
  268 + }
  269 + }
  270 + self.dataArray = NSMutableArray(array: totalTwoChildsArr)
  271 + self.tableView.reloadData()
  272 + }else{
  273 +
  274 + }
  275 + }
  276 + }else{
  277 +
  278 + }
  279 + }
124 280 }
125 281  
126 282 func setDataUI(){
... ...
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/CNLiveRealNameAuthController.swift 0 → 100644
  View file @8d49f8c
  1 +//
  2 +// CNLiveRealNameAuthController.swift
  3 +// metaCode
  4 +//
  5 +// Created by zx on 2024/6/7.
  6 +// 实名认证页面
  7 +
  8 +import Foundation
  9 +import SnapKit
  10 +import QMUIKit
  11 +
  12 +class CNLiveRealNameAuthController:CNLiveBaseViewController,UITableViewDataSource,UITableViewDelegate{
  13 + lazy var bgImgView :UIImageView = {
  14 + let iconImgView = UIImageView()
  15 + iconImgView.image = UIImage(named: "auth_blueBg")
  16 + return iconImgView
  17 + }()
  18 +
  19 + lazy var yuanmaLabel: UILabel = {
  20 + let titleLabel = UILabel()
  21 + titleLabel.textColor = .white
  22 + titleLabel.text = "元码数字认证"
  23 + titleLabel.font = Font_24
  24 + titleLabel.adjustsFontSizeToFitWidth=true
  25 + return titleLabel
  26 + }()
  27 +
  28 + lazy var yuanmaDescLabel: UILabel = {
  29 + let titleLabel = UILabel()
  30 + titleLabel.textColor = .white
  31 + titleLabel.text = "真我，连接世界\n实名认证，让信任搭建沟通的桥梁"
  32 + titleLabel.numberOfLines = 2
  33 + titleLabel.font = Font_13
  34 + return titleLabel
  35 + }()
  36 +
  37 + lazy var whiteBgView :UIView = {
  38 + let whiteBgView = UIView()
  39 + whiteBgView.backgroundColor = .white
  40 + whiteBgView.layer.cornerRadius = 12
  41 + whiteBgView.clipsToBounds = true
  42 + return whiteBgView
  43 + }()
  44 +
  45 + lazy var whiteTopBgView :UIImageView = {
  46 + let whiteBgView = UIImageView()
  47 + whiteBgView.image = UIImage(named: "realName_bg")
  48 + return whiteBgView
  49 + }()
  50 + lazy var whiteTopBgZGWView :UIImageView = {
  51 + let whiteBgView = UIImageView()
  52 + whiteBgView.image = UIImage(named: "realName_zgw")
  53 + return whiteBgView
  54 + }()
  55 + lazy var whiteTopBgSFZView :UIImageView = {
  56 + let whiteBgView = UIImageView()
  57 + whiteBgView.image = UIImage(named: "realName_jumin")
  58 + return whiteBgView
  59 + }()
  60 + lazy var tishiDescLabel: UILabel = {
  61 + let titleLabel = UILabel()
  62 + titleLabel.textColor = HexColor("#748DC1")
  63 + titleLabel.text = "公安部推出的法定身份证件，由中国网元码根据国家相关法律法规要求，由特定行政机关签发，请放心使用"
  64 + titleLabel.numberOfLines = 2
  65 + titleLabel.font = Font_12
  66 + titleLabel.adjustsFontSizeToFitWidth = true
  67 + return titleLabel
  68 + }()
  69 +
  70 + lazy var dataArray :NSMutableArray = {
  71 + let dataArray = NSMutableArray()
  72 + return dataArray
  73 + }()
  74 + let kCNLiveRealNameCellIdentifier = "kCNLiveRealNameCellIdentifier"
  75 + lazy var tableView : UITableView = {
  76 + let tableView = UITableView(frame: .zero, style: .plain)
  77 + tableView.dataSource = self
  78 + tableView.delegate = self
  79 + tableView.separatorStyle = .none
  80 + tableView.tableFooterView = UIView.init()
  81 + tableView.register(CNLiveRealNameCell.self, forCellReuseIdentifier: kCNLiveRealNameCellIdentifier)
  82 + return tableView
  83 + }()
  84 +
  85 + lazy var xinxiLabel: UILabel = {
  86 + let changeLabel = UILabel()
  87 + changeLabel.textColor = HexColor("#999999")
  88 + changeLabel.text = "中国网元码保障您的信息安全备份"
  89 + changeLabel.font = Font_12
  90 + changeLabel.textAlignment = .center
  91 + return changeLabel
  92 + }()
  93 + lazy var nextBtn: UIButton = {
  94 + let nextBtn = UIButton(type: .custom)
  95 + nextBtn.setTitle("下一步", for: .normal)
  96 + nextBtn.setTitleColor(.white, for: .normal)
  97 + nextBtn.backgroundColor = HexColor("#1961FE")
  98 + nextBtn.layer.cornerRadius = 22
  99 + nextBtn.clipsToBounds = true
  100 + nextBtn.addTarget(self, action: #selector(nextBtnAction), for: .touchUpInside)
  101 + return nextBtn
  102 + }()
  103 + override func viewDidLoad() {
  104 + super.viewDidLoad()
  105 + navigationBarHidden = false
  106 + titleName = "元码数字认证"
  107 + self.initUI()
  108 + }
  109 +
  110 + func initUI(){
  111 + self.view.backgroundColor = .white
  112 + self.view.addSubview(self.bgImgView)
  113 + self.bgImgView.snp.makeConstraints { make in
  114 + make.top.equalTo(KNavigationHeight)
  115 + make.left.right.equalToSuperview()
  116 + make.height.equalTo(KSreenWidth*457/375)
  117 + }
  118 +
  119 + self.view.addSubview(self.yuanmaLabel)
  120 + self.yuanmaLabel.snp.makeConstraints { make in
  121 + make.top.equalTo(KNavigationHeight+adapt_length(length: 45))
  122 + make.left.equalTo(adapt_length(length: 30))
  123 + }
  124 +
  125 + self.view.addSubview(self.yuanmaDescLabel)
  126 + self.yuanmaDescLabel.snp.makeConstraints { make in
  127 + make.top.equalTo(self.yuanmaLabel.snp.bottom).offset(adapt_length(length: 10))
  128 + make.left.equalTo(adapt_length(length: 30))
  129 + }
  130 +
  131 + self.view.addSubview(self.whiteBgView)
  132 + self.whiteBgView.snp.makeConstraints { make in
  133 + make.top.equalTo(self.yuanmaDescLabel.snp.bottom).offset(adapt_length(length: 31))
  134 + make.bottom.equalToSuperview()
  135 + make.left.equalTo(15)
  136 + make.right.equalToSuperview().offset(-15)
  137 + }
  138 +
  139 + self.whiteBgView.addSubview(self.whiteTopBgView)
  140 + self.whiteTopBgView.snp.makeConstraints { make in
  141 + make.centerX.equalToSuperview()
  142 + make.top.equalToSuperview()
  143 + make.width.equalTo(KSreenWidth*235/375)
  144 + make.height.equalTo(KSreenWidth*45/375)
  145 + }
  146 +
  147 + self.whiteTopBgView.addSubview(self.whiteTopBgZGWView)
  148 + self.whiteTopBgZGWView.snp.makeConstraints { make in
  149 + make.left.equalTo(KSreenWidth*44.5/375)
  150 + make.centerY.equalToSuperview()
  151 + make.width.equalTo(KSreenWidth*40.5/375)
  152 + make.height.equalTo(KSreenWidth*30/375)
  153 + }
  154 +
  155 + self.whiteTopBgView.addSubview(self.whiteTopBgSFZView)
  156 + self.whiteTopBgSFZView.snp.makeConstraints { make in
  157 + make.right.equalToSuperview().offset(-KSreenWidth*44.5/375)
  158 + make.centerY.equalToSuperview()
  159 + make.width.equalTo(KSreenWidth*84.5/375)
  160 + make.height.equalTo(KSreenWidth*25.5/375)
  161 + }
  162 + self.whiteBgView.addSubview(self.tishiDescLabel)
  163 + self.tishiDescLabel.snp.makeConstraints { make in
  164 + make.top.equalTo(self.whiteTopBgView.snp.bottom).offset(10)
  165 + make.left.equalTo(15)
  166 + make.right.equalToSuperview().offset(-15)
  167 + make.height.equalTo(33)
  168 + }
  169 +
  170 + self.whiteBgView.addSubview(self.tableView)
  171 + self.tableView.snp.makeConstraints { make in
  172 + make.top.equalTo(self.tishiDescLabel.snp.bottom).offset(10)
  173 + make.left.equalTo(15)
  174 + make.right.equalToSuperview().offset(-15)
  175 + make.height.equalTo(122*2+50)
  176 + }
  177 + self.whiteBgView.addSubview(self.xinxiLabel)
  178 + self.xinxiLabel.snp.makeConstraints { make in
  179 + make.bottom.equalToSuperview().offset(-30)
  180 + make.height.equalTo(17)
  181 + make.left.equalTo(10)
  182 + make.right.equalToSuperview().offset(-10)
  183 + }
  184 + self.whiteBgView.addSubview(self.nextBtn)
  185 + self.nextBtn.snp.makeConstraints { make in
  186 + make.bottom.equalTo(self.xinxiLabel.snp.top).offset(-10)
  187 + make.height.equalTo(44)
  188 + make.left.equalTo(15)
  189 + make.right.equalToSuperview().offset(-15)
  190 + }
  191 +
  192 + }
  193 +
  194 + deinit {
  195 +
  196 + }
  197 +
  198 + @objc func nextBtnAction(){
  199 +
  200 + }
  201 +
  202 + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
  203 + return 3
  204 + }
  205 +
  206 + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
  207 + guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveRealNameCellIdentifier) as? CNLiveRealNameCell
  208 + else {
  209 + let cell = CNLiveRealNameCell()
  210 + return cell
  211 + }
  212 + cell.type = indexPath.row+100
  213 + return cell
  214 + }
  215 +
  216 + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
  217 +
  218 + }
  219 +
  220 + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
  221 + return 122
  222 + }
  223 +
  224 +}
... ...
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/CNLiveDigitalAuthCell.swift 0 → 100644
  View file @8d49f8c
  1 +//
  2 +// CNLiveDigitalAuthCell.swift
  3 +// metaCode
  4 +//
  5 +// Created by zx on 2024/6/5.
  6 +// 数字认证cell
  7 +
  8 +import Foundation
  9 +import Kingfisher
  10 +import SnapKit
  11 +
  12 +typealias SelectBlock = (_ currentCell: CNLiveDigitalAuthCell) -> Void
  13 +class CNLiveDigitalAuthCell: UITableViewCell, UICollectionViewDelegate, UICollectionViewDataSource {
  14 +
  15 + lazy var lineView :UIView = {
  16 + let lineView = UIView(frame: CGRect(x: 0, y: 19, width: 3, height: 15))
  17 + lineView.backgroundColor = HexColor("#1F64E3")
  18 + return lineView
  19 + }()
  20 +
  21 + lazy var twoTitleLabel: UILabel = {
  22 + let titleLabel = UILabel.init(frame: CGRectMake(self.lineView.right+19, 15, KSreenWidth-30-40, 23))
  23 + titleLabel.textColor = HexColor("#1F64E3")
  24 + titleLabel.textAlignment = .left
  25 + titleLabel.font = Font_16
  26 + return titleLabel
  27 + }()
  28 + //3级身份列表
  29 + lazy var threeArr: [MineAuthenticationsChildIdentitiesModel] = {
  30 + var threeArr = [MineAuthenticationsChildIdentitiesModel]()
  31 + return threeArr
  32 + }()
  33 + let kCNLiveDigitalThreeCollectCellID = "kCNLiveDigitalThreeCollectCellID"
  34 + lazy var threeCollectionView: UICollectionView = {
  35 + let layout = UICollectionViewFlowLayout()
  36 + layout.itemSize = CGSizeMake(100, 93)
  37 + layout.minimumLineSpacing = 10
  38 + layout.scrollDirection = .horizontal
  39 + let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
  40 + collectionView.delegate = self
  41 + collectionView.dataSource = self
  42 + collectionView.backgroundColor = .white
  43 + collectionView.register(CNLiveDigitalThreeCollectCell.self, forCellWithReuseIdentifier: kCNLiveDigitalThreeCollectCellID)
  44 + return collectionView
  45 + }()
  46 +
  47 +
  48 + //childModel
  49 + var _childModel : MineAuthenticationsChildModel?
  50 + var childModel : MineAuthenticationsChildModel? {
  51 + get{
  52 + _childModel
  53 + }
  54 + set{
  55 + _childModel = newValue!
  56 + setupNewUI(model: _childModel!)
  57 + }
  58 + }
  59 +
  60 + var _tblCellIsSelect:Bool = false
  61 + var tblCellIsSelect:Bool{
  62 + get{
  63 + _tblCellIsSelect
  64 + }
  65 + set{
  66 + _tblCellIsSelect = newValue
  67 + }
  68 + }
  69 + var currentSeleIndex = 0
  70 + var selectBlock:SelectBlock?
  71 +
  72 + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
  73 + super.init(style: style, reuseIdentifier: reuseIdentifier)
  74 +
  75 + self.contentView.addSubview(self.lineView)
  76 + self.contentView.addSubview(self.twoTitleLabel)
  77 + self.contentView.addSubview(self.threeCollectionView)
  78 + self.threeCollectionView.snp.makeConstraints { make in
  79 + make.left.right.equalToSuperview()
  80 + make.top.equalTo(self.twoTitleLabel.snp.bottom).offset(20)
  81 + make.height.equalTo(93)
  82 + }
  83 + }
  84 + required init?(coder: NSCoder) {
  85 + fatalError("init(coder:) has not been implemented")
  86 + }
  87 +
  88 + func setupNewUI(model:MineAuthenticationsChildModel){
  89 + self.twoTitleLabel.text = model.name
  90 + self.threeArr = model.identities
  91 + self.threeCollectionView.reloadData()
  92 + }
  93 +
  94 + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
  95 + self.childModel?.identities.count ?? 0
  96 + }
  97 +
  98 + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
  99 + let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveDigitalThreeCollectCellID, for: indexPath) as! CNLiveDigitalThreeCollectCell
  100 + if indexPath.row == currentSeleIndex{
  101 + if self.tblCellIsSelect == true{
  102 + cell.cellIsSelected = true
  103 + }else{
  104 + cell.cellIsSelected = false
  105 + }
  106 + }else{
  107 + cell.cellIsSelected = false
  108 + }
  109 + cell.identitiesModel = self.threeArr[indexPath.row]
  110 + return cell
  111 + }
  112 +
  113 + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
  114 +// let identitiesModel = self.threeArr[indexPath.row]
  115 + currentSeleIndex = indexPath.row
  116 + self.threeCollectionView.reloadData()
  117 + self.selectBlock?(self)
  118 + }
  119 +
  120 +}
... ...
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/CNLiveDigitalThreeCollectCell.swift 0 → 100644
  View file @8d49f8c
  1 +//
  2 +// CNLiveDigitalThreeCollectCell.swift
  3 +// metaCode
  4 +//
  5 +// Created by zx on 2024/6/6.
  6 +//
  7 +
  8 +import Foundation
  9 +import Kingfisher
  10 +
  11 +class CNLiveDigitalThreeCollectCell: UICollectionViewCell {
  12 +
  13 + //identitiesModel
  14 + var _identitiesModel : MineAuthenticationsChildIdentitiesModel?
  15 + var identitiesModel : MineAuthenticationsChildIdentitiesModel? {
  16 + get{
  17 + _identitiesModel
  18 + }
  19 + set{
  20 + _identitiesModel = newValue!
  21 + setupNewUI(model: _identitiesModel!)
  22 + }
  23 + }
  24 +
  25 + lazy var iconImgView :UIImageView = {
  26 + let iconImgView = UIImageView(frame: CGRect(x: 18, y: 0, width: 64, height: 64))
  27 + iconImgView.contentMode = .scaleAspectFill
  28 + iconImgView.clipsToBounds = true
  29 + return iconImgView
  30 + }()
  31 + lazy var rightIconImgView :UIImageView = {
  32 + let iconImgView = UIImageView(frame: CGRect(x: self.iconImgView.width-15, y: self.iconImgView.height-15, width: 15, height: 15))
  33 + iconImgView.image = UIImage(named: "auth_selected")
  34 + return iconImgView
  35 + }()
  36 + //是否选中
  37 + var _cellIsSelected : Bool = false
  38 + var cellIsSelected : Bool {
  39 + get{
  40 + _cellIsSelected
  41 + }
  42 + set{
  43 + _cellIsSelected = newValue
  44 +
  45 + self.rightIconImgView.isHidden = !_cellIsSelected
  46 + }
  47 + }
  48 +
  49 + lazy var titleLabel: UILabel = {
  50 + let titleLabel = UILabel.init(frame: CGRectMake(0, self.iconImgView.bottom+5, 100, 23))
  51 + titleLabel.textColor = HexColor("#333333")
  52 + titleLabel.textAlignment = .center
  53 + titleLabel.font = Font_16
  54 + return titleLabel
  55 + }()
  56 +
  57 + override init(frame: CGRect) {
  58 + super.init(frame: frame)
  59 + self.contentView.addSubview(self.iconImgView)
  60 + self.iconImgView.addSubview(self.rightIconImgView)
  61 + self.contentView.addSubview(self.titleLabel)
  62 +
  63 + }
  64 +
  65 + required init?(coder: NSCoder) {
  66 + fatalError("init(coder:) has not been implemented")
  67 + }
  68 +
  69 + func setupNewUI(model:MineAuthenticationsChildIdentitiesModel){
  70 + self.titleLabel.text = model.name
  71 + self.iconImgView.kf.setImage(with: URL(string: model.icon))
  72 + }
  73 +}
... ...
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/CNLiveRealNameCell.swift 0 → 100644
  View file @8d49f8c
  1 +//
  2 +// CNLiveRealNameCell.swift
  3 +// metaCode
  4 +//
  5 +// Created by zx on 2024/6/7.
  6 +// 实名认证cell
  7 +
  8 +import Foundation
  9 +import Kingfisher
  10 +import SnapKit
  11 +import QMUIKit
  12 +
  13 +class CNLiveRealNameCell: UITableViewCell, QMUITextFieldDelegate {
  14 +
  15 + lazy var nameLabel: UILabel = {
  16 + let titleLabel = UILabel()
  17 + titleLabel.textColor = HexColor("#333333")
  18 + titleLabel.text = "本人姓名"
  19 + titleLabel.font = BoldFont_16
  20 + titleLabel.adjustsFontSizeToFitWidth = true
  21 + return titleLabel
  22 + }()
  23 + lazy var nameTF :QMUITextField = {
  24 + let searchTF = QMUITextField()
  25 + searchTF.backgroundColor = HexColor("#F7F7F7")
  26 + searchTF.qmui_borderWidth = 0.5
  27 + searchTF.qmui_borderColor = HexColor("#DCDCDC")
  28 + searchTF.textInsets = UIEdgeInsets(top: 0, left: 15, bottom: 0, right: 15)
  29 + searchTF.clearButtonMode = .always
  30 + searchTF.textColor = HexColor("#999999")
  31 + searchTF.font = Font_16
  32 + searchTF.delegate = self
  33 + return searchTF
  34 + }()
  35 + lazy var nameDescLabel: UILabel = {
  36 + let titleLabel = UILabel()
  37 + titleLabel.textColor = HexColor("#999999")
  38 + titleLabel.text = "按本人有效身份证件填写"
  39 + titleLabel.font = Font_12
  40 + return titleLabel
  41 + }()
  42 +
  43 + var _type:Int = 0//100姓名 101类型 102号码
  44 + var type:Int{
  45 + get{
  46 + _type
  47 + }
  48 + set{
  49 + _type = newValue
  50 +
  51 + if _type == 100{//100姓名
  52 + self.nameLabel.text = "本人姓名"
  53 + let attributedPlaceholder = NSAttributedString(string: "请输入本人姓名", attributes: [.foregroundColor: HexColor("#999999")!, .font: self.nameTF.font!])
  54 + self.nameTF.attributedPlaceholder = attributedPlaceholder
  55 + self.nameTF.isUserInteractionEnabled = true
  56 + self.nameDescLabel.text = "按本人有效身份证件填写"
  57 +
  58 + }else if _type == 101{//101类型
  59 + self.nameLabel.text = "证件类型"
  60 + let attributedPlaceholder = NSAttributedString(string: "居民身份证", attributes: [.foregroundColor: HexColor("#999999")!, .font: self.nameTF.font!])
  61 + self.nameTF.attributedPlaceholder = attributedPlaceholder
  62 + self.nameTF.isUserInteractionEnabled = false
  63 + self.nameDescLabel.text = "中国大陆地区用户推荐设置居民身份证"
  64 + }else if _type == 102{//102号码
  65 + self.nameLabel.text = "证件号码"
  66 + let attributedPlaceholder = NSAttributedString(string: "请输入证件号码", attributes: [.foregroundColor: HexColor("#999999")!, .font: self.nameTF.font!])
  67 + self.nameTF.attributedPlaceholder = attributedPlaceholder
  68 + self.nameTF.isUserInteractionEnabled = true
  69 + self.nameDescLabel.text = "请认真核对您的证件号码，证件号码一经提交"
  70 + }else{
  71 +
  72 + }
  73 + }
  74 + }
  75 + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
  76 + super.init(style: style, reuseIdentifier: reuseIdentifier)
  77 + self.selectionStyle = .none
  78 + self.contentView.addSubview(self.nameLabel)
  79 + self.contentView.addSubview(self.nameTF)
  80 + self.contentView.addSubview(self.nameDescLabel)
  81 + self.nameLabel.snp.makeConstraints { make in
  82 + make.top.equalTo(10)
  83 + make.left.equalTo(20)
  84 + make.height.equalTo(23)
  85 + }
  86 + self.nameTF.snp.makeConstraints { make in
  87 + make.top.equalTo(self.nameLabel.snp.bottom).offset(5)
  88 + make.left.equalTo(20)
  89 + make.right.equalToSuperview().offset(-20)
  90 + make.height.equalTo(53)
  91 + }
  92 + self.nameDescLabel.snp.makeConstraints { make in
  93 + make.top.equalTo(self.nameTF.snp.bottom).offset(5)
  94 + make.left.equalTo(20)
  95 + make.right.equalToSuperview().offset(-20)
  96 + make.height.equalTo(17)
  97 + }
  98 + }
  99 +
  100 + required init?(coder: NSCoder) {
  101 + fatalError("init(coder:) has not been implemented")
  102 + }
  103 +
  104 + // MARK: - UITextFieldDelegate
  105 + func textFieldDidEndEditing(_ textField: UITextField) {
  106 +
  107 + }
  108 + func textFieldShouldReturn(_ textField: UITextField) -> Bool {
  109 +// self.view.endEditing(true)
  110 + return true
  111 + }
  112 +
  113 +
  114 +}
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
  View file @8d49f8c
... ... @@ -377,7 +377,7 @@ class CNFrontMainView : UIView{
377 377 set{
378 378 _idModel = newValue
379 379 let auth = newValue!.userAuth
380   - if(auth == false){//true
  380 + if(auth == true){
381 381 //已认证身份 //显示数字认证
382 382 //显示证件View
383 383 // frontCardContentView.isHidden = false
... ... @@ -646,20 +646,32 @@ class CNFrontMainView : UIView{
646 646 if _idModel!.id == 9 {
647 647 self.pushStandVC(authType: .person)
648 648 }else{
649   - var type: CNLiveMineInputAuthType = .person
650 649 if self.idModel!.userAuth{
651   - type = .person
  650 + //我的数字认证
  651 + print("1")
652 652 }else{
653   - type = .enterprise
  653 + //个人认证
  654 + print("1")
654 655 }
655   -// else if self.idModel!.enterpriseAuth{
  656 + }
  657 +// //跳转到 1按钮时认证页面 电商 / 个人 / 企业 / 机构
  658 +// if _idModel!.id == 9 {
  659 +// self.pushStandVC(authType: .person)
  660 +// }else{
  661 +// var type: CNLiveMineInputAuthType = .person
  662 +// if self.idModel!.userAuth{
  663 +// type = .person
  664 +// }else{
656 665 // type = .enterprise
657   -// }else if self.idModel!.agencyAuth{
658   -// type = .agency
659 666 // }
660   - self.btnClickAuthType = type
661   - self.getStandInfo(identityId:String(self.idModel!.id))
662   - }
  667 +//// else if self.idModel!.enterpriseAuth{
  668 +//// type = .enterprise
  669 +//// }else if self.idModel!.agencyAuth{
  670 +//// type = .agency
  671 +//// }
  672 +// self.btnClickAuthType = type
  673 +// self.getStandInfo(identityId:String(self.idModel!.id))
  674 +// }
663 675 }
664 676 @objc func personalStandBtnAction() {
665 677 //跳转到 2个按钮时 第一个认证页面
... ... @@ -693,7 +705,8 @@ class CNFrontMainView : UIView{
693 705 @objc func StandBtn1Action() {
694 706 //跳转到 个人认证页面
695 707 self.btnClickAuthType = .person
696   - self.getStandInfo(identityId:String(self.idModel!.id))
  708 + self.pushStandVC(authType: .person)
  709 +// self.getStandInfo(identityId:String(self.idModel!.id))
697 710 }
698 711 @objc func StandBtn2Action() {
699 712 //跳转到 企业认证页面
... ... @@ -780,8 +793,11 @@ class CNFrontMainView : UIView{
780 793 }else{
781 794  
782 795 if authType == .person{
783   - //个人
784   - navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
  796 + //个人认证
  797 + //跳转选择身份页面
  798 + navigationViewController().pushViewController(CNLiveDigitalAuthController(channelId: String(format: "%d", self.idModel?.id ?? 0), vsid: UserInfoManager.shared.userInfo.currentUser?.vsid ?? "", sid: UserInfoManager.shared.userInfo.uid), animated: true)
  799 +
  800 +// navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
785 801 }else if authType == .enterprise{
786 802 //企业
787 803 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .enterprise), animated: pushAnimated)
... ... @@ -802,26 +818,29 @@ class CNFrontMainView : UIView{
802 818 if standInfoBaseModel.authInfos.first?.inputType == 17 && self.btnClickAuthType == .person{
803 819 //弹窗
804 820 self.show17Alert(index: 1)
805   - }else if standInfoBaseModel.enterpriseAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .enterprise{
806   - self.show17Alert(index: 2)
807   - }else if standInfoBaseModel.agencyAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .agency{
808   - self.show17Alert(index: 3)
809   - }else{
  821 + }
  822 +// else if standInfoBaseModel.enterpriseAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .enterprise{
  823 +// self.show17Alert(index: 2)
  824 +// }else if standInfoBaseModel.agencyAuthInfos.first?.inputType == 17 && self.btnClickAuthType == .agency{
  825 +// self.show17Alert(index: 3)
  826 +// }
  827 + else{
810 828 //没有弹窗类型,跳转身份认证
811 829 self.pushStandVC(authType: self.btnClickAuthType)
812 830 }
813   - }else{
814   - //网络请求失败
815   - showMessage(message: "请求失败")
816 831 }
  832 +// else{
  833 +// //网络请求失败
  834 +// showMessage(message: "请求失败")
  835 +// }
817 836 }
818 837 }
819 838  
820 839 //弹出弹窗
821 840 func show17Alert(index:Int){
822 841  
823   - //test
824   - navigationViewController().pushViewController(CNLiveDigitalAuthController(), animated: true)
  842 +// //test
  843 +// navigationViewController().pushViewController(CNLiveDigitalAuthController(), animated: true)
825 844  
826 845  
827 846 delegate.window?.addSubview(self.alertBgView)
... ... @@ -840,13 +859,15 @@ class CNFrontMainView : UIView{
840 859 subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
841 860 alertBgImgStr = subTitleModel.image ?? ""
842 861 }else if index == 2{
843   - let subTitle = self.idModel?.standInfoBaseModel?.enterpriseAuthInfos.first?.subTitle
844   - subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
845   - alertBgImgStr = subTitleModel.image ?? ""
  862 +// let subTitle = self.idModel?.standInfoBaseModel?.enterpriseAuthInfos.first?.subTitle
  863 +// subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
  864 +// alertBgImgStr = subTitleModel.image ?? ""
  865 + alertBgImgStr = ""//改成默认图
846 866 }else if index == 3{
847   - let subTitle = self.idModel?.standInfoBaseModel?.agencyAuthInfos.first?.subTitle
848   - subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
849   - alertBgImgStr = subTitleModel.image ?? ""
  867 +// let subTitle = self.idModel?.standInfoBaseModel?.agencyAuthInfos.first?.subTitle
  868 +// subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
  869 +// alertBgImgStr = subTitleModel.image ?? ""
  870 + alertBgImgStr = ""//改成默认图
850 871 }
851 872 self.alertBgImgView.kf.setImage(with: URL(string: alertBgImgStr))
852 873 self.standInfoSubTitleModel = subTitleModel
... ...
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
  View file @8d49f8c
... ... @@ -260,14 +260,11 @@ final class StandListModel: BaseModel {//, TableCodable {
260 260 }
261 261  
262 262 // !!!: /api/contentApi/authentications 接口标记
263   -class MineAuthenticationsBaseModel: BaseModel {
264   - var data = [MineAuthenticationsChildModel]()//
265   -}
266 263 class MineAuthenticationsChildModel: BaseModel {
267 264 var industryId: Int = 0
268 265 var name: String = ""
269   - var child = [MineAuthenticationsChildModel]()//卡片标签
270   - var identities = [MineAuthenticationsChildIdentitiesModel]()//报名项说明
  266 + var child = [MineAuthenticationsChildModel]()//二级/一级
  267 + var identities = [MineAuthenticationsChildIdentitiesModel]()//三级
271 268 }
272 269 class MineAuthenticationsChildIdentitiesModel: BaseModel {
273 270 var id: Int = 0
... ... @@ -282,7 +279,7 @@ class MineAuthenticationsChildIdentitiesModel: BaseModel {
282 279 var userAuth: Int = 0
283 280 }
284 281  
285   -// !!!: /api/identityApi/getUserMsg 接口标记
  282 +// !!!: /api/identityApi/getUserMsg 接口标记 身份信息
286 283 class MineGetUserMsgUsersModel: BaseModel {
287 284 var id: Int = 0
288 285 var nick: String = ""
... ... @@ -293,6 +290,7 @@ class MineGetUserMsgUsersModel: BaseModel {
293 290 var verifyUsers = [MineGetUserMsgVerifyUsersModel]()
294 291  
295 292 }
  293 +//实名认证用户model
296 294 class MineGetUserMsgVerifyUsersModel: BaseModel {
297 295 var vsid: String = ""
298 296 var name: String = ""
... ... @@ -303,17 +301,19 @@ class MineGetUserMsgVerifyUsersModel: BaseModel {
303 301 // !!!: /api/identityApi/getIdentity 接口标记
304 302 class MineStandInfoBaseModel: BaseModel {
305 303 var authInfos = [MineStandInfoModel]()//个人认证
306   - var enterpriseAuthInfos = [MineStandInfoModel]()//企业认证
307   - var agencyAuthInfos = [MineStandInfoModel]()//机构认证
308 304 var icon: String = ""
309 305 var name: String = ""
310 306 var identityId: Int = 0
311   - var code: String = ""
312   - var cardImg: String = ""
313 307 var authTime: Int = 0
314 308 var userStatus: Int = 0
315   - var upPath: String = ""
316   - var downPath: String = ""
  309 +
  310 +// var code: String = ""
  311 +// var cardImg: String = ""
  312 +// var upPath: String = ""
  313 +// var downPath: String = ""
  314 +// var enterpriseAuthInfos = [MineStandInfoModel]()//企业认证
  315 +// var agencyAuthInfos = [MineStandInfoModel]()//机构认证
  316 +
317 317 }
318 318  
319 319 class MineStandInfoModel: BaseModel {
... ...
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
  View file @8d49f8c
... ... @@ -795,20 +795,20 @@ class CNLiveMineViewModel: NSObject {
795 795 }
796 796 }
797 797 }
798   - if authType == .enterprise {
799   - for authinfo in newsModel.enterpriseAuthInfos {
800   - if authinfo.input {
801   - tempArray.add(authinfo)
802   - }
803   - }
804   - }
805   - if authType == .agency {
806   - for authinfo in newsModel.agencyAuthInfos {
807   - if authinfo.input {
808   - tempArray.add(authinfo)
809   - }
810   - }
811   - }
  798 +// if authType == .enterprise {
  799 +// for authinfo in newsModel.enterpriseAuthInfos {
  800 +// if authinfo.input {
  801 +// tempArray.add(authinfo)
  802 +// }
  803 +// }
  804 +// }
  805 +// if authType == .agency {
  806 +// for authinfo in newsModel.agencyAuthInfos {
  807 +// if authinfo.input {
  808 +// tempArray.add(authinfo)
  809 +// }
  810 +// }
  811 +// }
812 812 resultBlock(tempArray,.success)
813 813 }else if (type == .effect) {
814 814 CNLiveSaveAuthStateDB.shared.save(object: newsModel, key: identityId)
... ... @@ -818,17 +818,20 @@ class CNLiveMineViewModel: NSObject {
818 818 if newsModel.authInfos.count > 0 {
819 819 let tempArray = NSMutableArray.init(array: newsModel.authInfos)
820 820 resultBlock(tempArray,.success)
821   - } else if newsModel.enterpriseAuthInfos.count > 0 {
822   - let tempArray = NSMutableArray.init(array: newsModel.enterpriseAuthInfos)
823   - resultBlock(tempArray,.success)
824   - } else if newsModel.agencyAuthInfos.count > 0 {
825   - let tempArray = NSMutableArray.init(array: newsModel.agencyAuthInfos)
826   - resultBlock(tempArray,.success)
827   - } else if newsModel.authInfos.count > 0 && newsModel.enterpriseAuthInfos.count > 0 {
828   - let tempArray_ent = NSMutableArray.init(array: newsModel.enterpriseAuthInfos)
829   - let tempArray_persion = NSMutableArray.init(array: newsModel.authInfos)
830   - resultBlock([tempArray_persion, tempArray_ent],.success)
831   - } else {
  821 + }
  822 +// else if newsModel.enterpriseAuthInfos.count > 0 {
  823 +// let tempArray = NSMutableArray.init(array: newsModel.enterpriseAuthInfos)
  824 +// resultBlock(tempArray,.success)
  825 +// } else if newsModel.agencyAuthInfos.count > 0 {
  826 +// let tempArray = NSMutableArray.init(array: newsModel.agencyAuthInfos)
  827 +// resultBlock(tempArray,.success)
  828 +// }
  829 +// else if newsModel.authInfos.count > 0 && newsModel.enterpriseAuthInfos.count > 0 {
  830 +// let tempArray_ent = NSMutableArray.init(array: newsModel.enterpriseAuthInfos)
  831 +// let tempArray_persion = NSMutableArray.init(array: newsModel.authInfos)
  832 +// resultBlock([tempArray_persion, tempArray_ent],.success)
  833 +// }
  834 + else {
832 835 resultBlock(Array<Any>(),.success)
833 836 }
834 837 }
... ... @@ -839,7 +842,8 @@ class CNLiveMineViewModel: NSObject {
839 842 }
840 843 } else {
841 844 if CNLiveNetworking.isNetworking() {
842   - showMessage(message: "获取失败")
  845 + let resp = result as! NSDictionary
  846 + showMessage(message: resp["errorMessage"] as! String)
843 847 resultBlock(NSNull(),.failed)
844 848 } else {
845 849 showMessage(message: "似乎与网络断开链接")
... ... @@ -951,7 +955,7 @@ class CNLiveMineViewModel: NSObject {
951 955 CNLiveMineViewModel.requestsStandInfo(identityId: id, type: .effect, authType: authType) { result, respStatue in
952 956 if respStatue == .success {
953 957 let listBaseModel = result as! MineStandInfoBaseModel
954   - if listBaseModel.authTime > 0 || listBaseModel.code.count > 0 {
  958 + if listBaseModel.authTime > 0 {//|| listBaseModel.code.count > 0 {
955 959 showMessage(message: listBaseModel.name.count > 0 ? "恭喜您通过认证，您已是\(listBaseModel.name )" : "恭喜您通过认证")
956 960 resultBlock(listBaseModel, .success)
957 961 NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
... ...
metaCode/Classes/Main/Model/CNLiveDownSlideModel.swift
  View file @8d49f8c
... ... @@ -23,6 +23,8 @@ class CNLiveDownSlideModel: BaseModel {
23 23 var blockName: String = ""
24 24 ///大块副标题
25 25 var blockSubTitle: String = ""
  26 + ///热榜窄图
  27 + var blockIcon: String = ""
26 28 ///类型 type=4一排两个 74今日推荐 12列表全部课程 75单课程大图
27 29 var type: String = ""
28 30 ///区块封面图
... ...
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
  View file @8d49f8c
... ... @@ -216,7 +216,7 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
216 216 if self.slideModel != nil{
217 217 view.addSubview(hotListView)
218 218 hotListView.addSubview(self.hotListImgView)
219   - self.hotListImgView.kf.setImage(with: URL(string: self.slideModel!.background))
  219 + self.hotListImgView.kf.setImage(with: URL(string: self.slideModel!.blockIcon))
220 220 hotListView.addSubview(self.realHotCollectionView)
221 221 view.addSubview(hotListBtn)
222 222 self.realHotCollectionView.frame = CGRect(x: 0, y: DownSlideRealHotListDetaiH-DownSlideRealHotListDetaiCollectCellH, width: KSreenWidth, height: DownSlideRealHotListDetaiCollectCellH)
... ...
metaCode/Supporting Files/Assets.xcassets/AuthPage/auth_selected.imageset/Contents.json 0 → 100644
  View file @8d49f8c
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "filename" : "auth_selected@2x.png",
  9 + "idiom" : "universal",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "filename" : "auth_selected@3x.png",
  14 + "idiom" : "universal",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "author" : "xcode",
  20 + "version" : 1
  21 + }
  22 +}
... ...
metaCode/Supporting Files/Assets.xcassets/AuthPage/auth_selected.imageset/auth_selected@2x.png 0 → 100644
View file @8d49f8c

1.02 KB
metaCode/Supporting Files/Assets.xcassets/AuthPage/auth_selected.imageset/auth_selected@3x.png 0 → 100644
View file @8d49f8c

1.92 KB
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_bg.imageset/Contents.json 0 → 100644
  View file @8d49f8c
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "filename" : "realName_bg@2x.png",
  9 + "idiom" : "universal",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "filename" : "realName_bg@3x.png",
  14 + "idiom" : "universal",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "author" : "xcode",
  20 + "version" : 1
  21 + }
  22 +}
... ...
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_bg.imageset/realName_bg@2x.png 0 → 100644
View file @8d49f8c

3.04 KB
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_bg.imageset/realName_bg@3x.png 0 → 100644
View file @8d49f8c

6.22 KB
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_jumin.imageset/Contents.json 0 → 100644
  View file @8d49f8c
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "filename" : "realName_jumin@2x.png",
  9 + "idiom" : "universal",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "filename" : "realName_jumin@3x.png",
  14 + "idiom" : "universal",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "author" : "xcode",
  20 + "version" : 1
  21 + }
  22 +}
... ...
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_jumin.imageset/realName_jumin@2x.png 0 → 100644
View file @8d49f8c

15.7 KB
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_jumin.imageset/realName_jumin@3x.png 0 → 100644
View file @8d49f8c

31 KB
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_zgw.imageset/Contents.json 0 → 100644
  View file @8d49f8c
  1 +{
  2 + "images" : [
  3 + {
  4 + "idiom" : "universal",
  5 + "scale" : "1x"
  6 + },
  7 + {
  8 + "filename" : "realName_zgw@2x.png",
  9 + "idiom" : "universal",
  10 + "scale" : "2x"
  11 + },
  12 + {
  13 + "filename" : "realName_zgw@3x.png",
  14 + "idiom" : "universal",
  15 + "scale" : "3x"
  16 + }
  17 + ],
  18 + "info" : {
  19 + "author" : "xcode",
  20 + "version" : 1
  21 + }
  22 +}
... ...
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_zgw.imageset/realName_zgw@2x.png 0 → 100644
View file @8d49f8c

6.66 KB
metaCode/Supporting Files/Assets.xcassets/AuthPage/realName_zgw.imageset/realName_zgw@3x.png 0 → 100644
View file @8d49f8c

13 KB