* [x] 数字简历页面-官方认证-数字资产页-官方认证-一排三个,➕放在最后一个

* [x] 数字简历页面-官方认证-数字资产页-官方认证-已审核的排序放在前面 * [x] 数字简历页面-官方认证-数字资产页-切换实名对象没有刷新页面数据

* [x] 数字简历页面-官方认证-数字资产页-官方认证-一排三个,➕放在最后一个
* [x] 数字简历页面-官方认证-数字资产页-官方认证-已审核的排序放在前面 * [x] 数字简历页面-官方认证-数字资产页-切换实名对象没有刷新页面数据
“张旭”
1 parent 5552beec
Showing 4 changed files with 96 additions and 45 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/数字认证身份相关页面/CNLiveDigitalAssetsController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/数字资产cell/CNLiveDigitalFirstCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/数字资产cell/CNLiveDigitalSecCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/数字资产cell/CNLiveDigitalSecCollectionCell.swift
@@ -102,8 +102,8 @@ class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSou
                         }
                     }
                     self!.dataArray.removeAllObjects()
-                    self!.dataArray.addObjects(from: listBaseModel.list)
-                    self!.dataArray.add(MineAuthListModel())
+                    self!.dataArray.addObjects(from: arr)
+                    self!.dataArray.add(MineAuthListModel())//加号
                     self!.tableView.reloadData()
                 }
@@ -125,6 +125,9 @@ class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSou
                 let cell = CNLiveDigitalFirstCell()
                 return cell
             }
+            cell.digitalFirstChangePersonBlock = {
+                self.loadData()
+            }
             return cell
         }else if indexPath.row == 1{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDigitalSecCellIdentifier) as? CNLiveDigitalSecCell
@@ -151,7 +154,13 @@ class CNLiveDigitalAssetsController:CNLiveBaseViewController, UITableViewDataSou
         if indexPath.row == 0{
             return adapt_length(length: 121+20)
         }else if indexPath.row == 1{
-            return adapt_length(length: 152+15)
+            let cellH:CGFloat = adapt_length(length: 152+15)
+            if self.dataArray.count == 0{
+                return cellH
+            }else{
+                let hang:CGFloat = CGFloat((self.dataArray.count-1)/3+1)
+                return adapt_length(length: 53)+100*hang+15
+            }
         }else{
             return 317+15
         }
@@ -10,8 +10,11 @@ import Kingfisher
 import SnapKit
 //typealias SelectBlock = (_ currentCell: CNLiveDigitalAuthCell ,_ identitiesId:String) -> Void
+//刷新tableView
+typealias DigitalFirstChangePersonBlock = () -> Void
+
 class CNLiveDigitalFirstCell: UITableViewCell {
-    
+    var digitalFirstChangePersonBlock:DigitalFirstChangePersonBlock?
     lazy var whiteView :UIView = {
         let whiteView = UIView(frame: CGRect(x: 15, y:adapt_length(length: 20), width: KSreenWidth-30, height: adapt_length(length: 121)))
         whiteView.backgroundColor = .white
@@ -213,6 +216,10 @@ class CNLiveDigitalFirstCell: UITableViewCell {
                     let (gender, age) = self.extractGenderAndAge(fromIDCardNumber: UserInfoManager.shared.userInfo.currentUser?.idNo ?? "")
                     let ageStr = String(format: "%d", age ?? 0)
                     self.phoneTitleLabel.text = gender+" | "+ageStr+"岁"+" | "+UserInfoManager.shared.userInfo.mobile
+                    //刷新数字资产页面
+                    if self.digitalFirstChangePersonBlock != nil{
+                        self.digitalFirstChangePersonBlock?()
+                    }
                 }
             })
         }
@@ -31,9 +31,10 @@ class CNLiveDigitalSecCell: UITableViewCell, UICollectionViewDelegate, UICollect
     let kCNLiveDigitalSecCollectCellID = "kCNLiveDigitalSecCollectCellID"
     lazy var threeCollectionView: UICollectionView = {
         let layout = UICollectionViewFlowLayout()
-        layout.itemSize = CGSizeMake(adapt_length(length: 60), adapt_length(length: 60+3+17))
-        layout.minimumLineSpacing =  (KSreenWidth-30-adapt_length(length: 60)*3-36)/2//22
-        layout.scrollDirection = .horizontal
+        layout.itemSize = CGSizeMake(100, 100)
+        layout.minimumLineSpacing =  0//(KSreenWidth-30- 100*3-36)/2//22
+        layout.minimumInteritemSpacing = 0 // 图标之间的间距
+        layout.scrollDirection = .vertical
         let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dataSource = self
@@ -41,7 +42,7 @@ class CNLiveDigitalSecCell: UITableViewCell, UICollectionViewDelegate, UICollect
         collectionView.register(CNLiveDigitalSecCollectionCell.self, forCellWithReuseIdentifier: kCNLiveDigitalSecCollectCellID)
         return collectionView
     }()
-    var currSeleIndex = 0
+//    var currSeleIndex = 0
     var _digitalListModels : [MineAuthListModel]?
     var digitalListModels : [MineAuthListModel]? {
@@ -60,6 +61,12 @@ class CNLiveDigitalSecCell: UITableViewCell, UICollectionViewDelegate, UICollect
         self.backgroundColor = .clear
         self.selectionStyle = .none
         self.contentView.addSubview(self.whiteView)
+        self.whiteView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(15)
+            make.left.equalTo(15)
+            make.right.equalToSuperview().offset(-15)
+            make.bottom.equalToSuperview()
+        }
         self.whiteView.addSubview(self.myIdentityTitleLabel)
         self.myIdentityTitleLabel.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(adapt_length(length: 15))
@@ -68,9 +75,10 @@ class CNLiveDigitalSecCell: UITableViewCell, UICollectionViewDelegate, UICollect
         self.whiteView.addSubview(self.threeCollectionView)
         self.threeCollectionView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview().offset(adapt_length(length: 18))
+            make.left.equalToSuperview().offset(adapt_length(length: 18))
             make.top.equalTo(adapt_length(length: 53))
-            make.height.equalTo(adapt_length(length: 60+7+17))
+//            make.height.equalTo(adapt_length(length: 60+7+17))
+            make.bottom.equalToSuperview()
             make.width.equalToSuperview().offset(adapt_length(length: -36))
         }
@@ -136,18 +144,26 @@ class CNLiveDigitalSecCell: UITableViewCell, UICollectionViewDelegate, UICollect
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveDigitalSecCollectCellID, for: indexPath) as! CNLiveDigitalSecCollectionCell
         cell.authListModel = self.digitalListModels?[indexPath.row]
-        if indexPath.row == currSeleIndex
-        {//
-            cell.cellIsSelected = true
-        }else{
-        //
-            cell.cellIsSelected = false
-        }
+//        if indexPath.row == currSeleIndex
+//        {//
+//            cell.cellIsSelected = true
+//        }else{
+//        //
+//            cell.cellIsSelected = false
+//        }
         return cell
     }
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        // 假设图标高度为100
+        let padding: CGFloat = 0//(KSreenWidth-30-100*3-36)/2//10 // 图标间的间距
+        let numberOfItemsPerRow: CGFloat = 3
+        let availableWidth = collectionView.bounds.width - (numberOfItemsPerRow - 1) * padding
+        let itemWidth = availableWidth / numberOfItemsPerRow
+        return CGSize(width: itemWidth, height: 100) // 假设图标高度为100
+    }
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        self.currSeleIndex = indexPath.row
+//        self.currSeleIndex = indexPath.row
         self.threeCollectionView.reloadData()
     }
 }
@@ -7,6 +7,7 @@
 import Foundation
 import Kingfisher
+import SnapKit
 class CNLiveDigitalSecCollectionCell: UICollectionViewCell {
@@ -42,35 +43,34 @@ class CNLiveDigitalSecCollectionCell: UICollectionViewCell {
         return titleLabel
     }()
-    //是否选中
-    var _cellIsSelected : Bool = false
-    var cellIsSelected : Bool {
-        get{
-            _cellIsSelected
-        }
-        set{
-            _cellIsSelected = newValue
-             
-            if _cellIsSelected == true{
-                //选中
-                self.iconImgView.layer.borderWidth = 1
-                self.iconImgView.layer.borderColor = HexColor("#1961FE")?.cgColor
-            }else{
-                //未选中
-                self.iconImgView.layer.borderWidth = 0
-                self.iconImgView.layer.borderColor = HexColor("#1961FE")?.cgColor
-            }
-            
-                
-//            self.rightIconImgView.isHidden = !_cellIsSelected
-        }
-    }
+//    //是否选中
+//    var _cellIsSelected : Bool = false
+//    var cellIsSelected : Bool {
+//        get{
+//            _cellIsSelected
+//        }
+//        set{
+//            _cellIsSelected = newValue
+//             
+//            if _cellIsSelected == true{
+//                //选中
+//                self.iconImgView.layer.borderWidth = 1
+//                self.iconImgView.layer.borderColor = HexColor("#1961FE")?.cgColor
+//            }else{
+//                //未选中
+//                self.iconImgView.layer.borderWidth = 0
+//                self.iconImgView.layer.borderColor = HexColor("#1961FE")?.cgColor
+//            }
+//            
+//                
+////            self.rightIconImgView.isHidden = !_cellIsSelected
+//        }
+//    }
     lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(0, self.iconImgView.bottom+8, 60, 17))
+        let titleLabel = UILabel.init(frame: CGRectMake(0, self.iconImgView.bottom+8, 100, 17))
         titleLabel.textColor = HexColor("#1961FE")
         titleLabel.textAlignment = .center
-        titleLabel.adjustsFontSizeToFitWidth = true
         titleLabel.font = Font_12
         return titleLabel
     }()
@@ -83,14 +83,33 @@ class CNLiveDigitalSecCollectionCell: UICollectionViewCell {
         return closeBtn
     }()
-    
     override init(frame: CGRect) {
         super.init(frame: frame)
+        self.contentView.backgroundColor = .clear
         self.contentView.addSubview(self.iconImgView)
-//        self.iconImgView.addSubview(self.rightIconImgView)
+        self.iconImgView.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.width.height.equalTo(60)
+            make.centerX.equalToSuperview()
+        }
         self.contentView.addSubview(self.titleLabel)
+        self.titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.iconImgView.snp.bottom).offset(8)
+            make.left.right.equalToSuperview()
+        }
         self.contentView.addSubview(self.addBtn)
+        self.addBtn.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.width.height.equalTo(60)
+            make.centerX.equalToSuperview()
+        }
         self.contentView.addSubview(self.bottomTitleLabel)
+        self.bottomTitleLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.iconImgView.snp.bottom).offset(-16)
+            make.height.equalTo(16)
+            make.width.equalTo(60)
+            make.centerX.equalToSuperview()
+        }
         self.bottomTitleLabel.isHidden = true
     }