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

niudaojian
2 parents cf0506b2 9382b805
Showing 7 changed files with 173 additions and 5 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineSubBodyListView.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_sub_list_add_info.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_sub_list_add_info.imageset/mine_sub_list_add_info@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_sub_list_add_info.imageset/mine_sub_list_add_info@3x.png
@@ -33,6 +33,7 @@
 		798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44EB2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift */; };
 		798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */; };
 		798A44F02A305BC200815935 /* UIButton+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */; };
+		798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */; };
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
@@ -109,6 +110,7 @@
 		798A44EB2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineAddInfoViewController.swift; sourceTree = "<group>"; };
 		798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseNavigationController.swift; sourceTree = "<group>"; };
 		798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+CNLiveExtension.swift"; sourceTree = "<group>"; };
+		798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineSubBodyListView.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
 		7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
 		7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBar+CNBadge.swift"; sourceTree = "<group>"; };
@@ -364,6 +366,7 @@
 			children = (
 				798A44E72A30134400815935 /* CNLiveMineHeaderView.swift */,
 				798A44E92A30135D00815935 /* CNLiveMineBodyListView.swift */,
+				798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -733,6 +736,7 @@
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
+				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
@@ -25,6 +25,18 @@ class CNLiveBaseViewController: UIViewController {
         }
     }
  
+    /// 是否隐藏导航栏(默认 隐藏)
+    public var _navigationBarHidden: Bool = true
+    public var navigationBarHidden: Bool {
+        get {
+            return _navigationBarHidden
+        }
+        set {
+            _navigationBarHidden = newValue
+            topNavView.isHidden = _navigationBarHidden
+        }
+    }
+    
     /// 设置标题显示
     public var _titleName: String = ""
     public var titleName: String {
@@ -133,6 +145,7 @@ class CNLiveBaseViewController: UIViewController {
  
         let tap = UITapGestureRecognizer.init(target: self, action: #selector(topNavViewTap))
         tap.cancelsTouchesInView = false
+        topNavView.isHidden = true
         topNavView.addGestureRecognizer(tap)
         topNavView.backgroundColor = HexColor("#F7F8FA")
         return topNavView
@@ -7,16 +7,51 @@
  
 import Foundation
  
-
-class CNLiveMineAddInfoViewController : CNLiveBaseViewController {
+class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource {
+    
+    let kCNLiveMineInfoLListTableViewIdentifier = "kCNLiveMineInfoLListTableViewIdentifier"
  
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: .zero, style: .plain)
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.backgroundColor = HexColor("#F7F8FA")
+        tableView.tableFooterView = UIView.init()
+        tableView.rowHeight = 100
+        tableView.separatorStyle = .none
+        tableView.register(MineInfoLListTableViewCell.self, forCellReuseIdentifier: kCNLiveMineInfoLListTableViewIdentifier)
+        return tableView
+    }()
+    
+    override func viewWillAppear(_ animated: Bool) {
+        self.navigationBarHidden = false
+    }
  
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.backgroundColor = HexColor("#f9f9f9")
-        
         self.titleName = "添加身份"
-        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(get_system_nav_height())
+            make.left.right.bottom.equalToSuperview()
+        }
     }
+}
+
+extension CNLiveMineAddInfoViewController {
  
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 2
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineInfoLListTableViewIdentifier) as! MineInfoLListTableViewCell
+        cell.setupWithDataSource(icon: "mine_header_icon_defult_ava", name: "志愿者身份")
+        return cell
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 100
+    }
 }
+//
+//  CNLiveMineSubBodyListView.swift
+//  metaCode
+//
+//  Created by open on 2023/6/7.
+//
+
+import Foundation
+
+class MineInfoLListTableViewCell : UITableViewCell {
+    
+    lazy var mainView: UIImageView = {
+        let mainView = UIImageView.init()
+        mainView.contentMode = .scaleToFill
+        mainView.backgroundColor = .clear
+        mainView.isUserInteractionEnabled = true
+        mainView.image = UIImage(named: "mine_sub_list_add_info")
+        return mainView
+    }()
+    
+    lazy var iconView : UIImageView = {
+        let iconView = UIImageView.init()
+        iconView.contentMode = .scaleToFill
+        iconView.backgroundColor = .clear
+        iconView.layer.masksToBounds = true
+        iconView.layer.cornerRadius = 25
+        return iconView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.backgroundColor = .clear
+        titleLabel.textColor = .black
+        titleLabel.font = BoldFont_18_Fit
+        return titleLabel
+    }()
+    
+    lazy var addBtn: UIButton = {
+        let addBtn = UIButton.init(type: .custom)
+        addBtn.setTitle("  去添加  ", for: .normal)
+        addBtn.setTitleColor(.white, for: .normal)
+        addBtn.backgroundColor = HexColor("#67C5FF")
+        addBtn.titleLabel?.font = BoldFont_15
+        addBtn.layer.cornerRadius = 15
+        addBtn.layer.masksToBounds = true
+        return addBtn
+    }()
+    
+    public func setupWithDataSource(icon: String, name: String) {
+        iconView.image = UIImage(named: icon)
+        titleLabel.text = name
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        
+        addSubview(mainView)
+        mainView.addSubview(iconView)
+        mainView.addSubview(titleLabel)
+        mainView.addSubview(addBtn)
+        
+        setupConstraints()
+    }
+    
+    func setupConstraints() {
+        mainView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(15)
+            make.right.equalToSuperview().offset(-15)
+            make.top.equalToSuperview().offset(5)
+            make.bottom.equalToSuperview().offset(-5)
+        }
+        iconView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(15)
+            make.size.equalTo(50)
+        }
+        titleLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(iconView.snp.right).offset(10)
+        }
+        addBtn.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-15)
+            make.width.equalTo(80)
+            make.height.equalTo(30)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_sub_list_add_info@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_sub_list_add_info@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}