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

# Conflicts: # metaCode/Classes/Config/Database/CNLiveIdentityDB.swift

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode/Classes/Config/Database/CNLiveIdentityDB.swift
liushiyu
2 parents c25aa29d 69d94854
Showing 5 changed files with 75 additions and 48 deletions
metaCode/Classes/Config/Database/CNLiveIdentityDB.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNHomePageBackgroupView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/HomePage/ViewModel/CNHomePageViewModel.swift
@@ -12,12 +12,17 @@ import WCDBSwift
 let CNLiveIdentityTableName = "CNLiveIdentityTable"
 ///身份model
-final class CNLiveIdentityModel: BaseModel,TableCodable {
-    var id: String = ""
-    var name: String?
-    var icon: String?
-    var createTime: String?
-    var enable: Bool?
+
+class CNLiveIdentityModel: BaseModel,TableCodable {
+    var id: String = ""//ID号
+    var name: String? = ""//名称
+    var icon: String? = ""//小圆图标
+    var createTime: String? = ""//注册时间
+    var enable: Bool?//没用
+    var backgroundImg:String? = ""//首页背景图
+    var backgroundColour:String? = ""//添加身份按钮背景色
+    var description:String? = ""//首页身份说明描述
+    var auth: Bool?//身份是否验证
     enum CodingKeys: String, CodingTableKey {
         typealias Root = CNLiveIdentityModel
@@ -30,6 +35,10 @@ final class CNLiveIdentityModel: BaseModel,TableCodable {
         case icon
         case createTime
         case enable
+        case backgroundImg
+        case backgroundColour
+        case description
+        case auth
     }
 }
@@ -138,11 +138,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.tabBarY = (self.tabBarController?.tabBar.top)!
-
-//        for i in (0..<5) {
-//            self.dataArray.add("122")
-//        }
-        
         self.getUserIdentityApi()
         self.setupUI()
@@ -266,6 +261,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         bannerView?.superScrollView = flowView.scrollView
         bannerView?.associatedVCView = self.view
         bannerView?.delegate  = self
+        let identityModel = dataArray[index] as! CNLiveIdentityModel
+        
         return bannerView
     }
@@ -395,6 +392,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                         self.dataArray.addObjects(from: listArray)
                         self.addPageView()
                         self.identityStatus = .haveBeenCertified
+                        self.backgroupView.updateData(idArray: listArray )
                     }else{
                         self.identityStatus = .notCertified
                     }
@@ -7,6 +7,8 @@
 import Foundation
 import UIKit
+import Kingfisher
+
 class CNHomePageBackgroupSubView : UIView
 {
     ///前面的视图
@@ -90,48 +92,55 @@ class CNHomePageBackgroupView: UIView{
     //创建UI
     func initUI(){
+
-        for i in (0..<5){
-            
+    }
+    
+    func updateData(idArray:Array<CNLiveIdentityModel>){
+        for i in (0..<idArray.count){
+
             let subView: CNHomePageBackgroupSubView = CNHomePageBackgroupSubView.init(frame: self.bounds)
             subView.frame = self.bounds
-            
-            
-            if (i == 0) {
-                subView.setTitle(title: "志愿者")
-                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
-                subView.name = "志愿者"
-            }
-            else if(i == 1){
-                subView.setTitle(title: "退伍军人")
-                subView.setImage(image: UIImage(named: "homePage_backgroup_blue"))
-                subView.name = "退伍军人"
-
-            }
-            else if(i == 2){
-                subView.setTitle(title: "慈善家")
-                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
-                subView.name = "慈善家"
-            }
-            else if(i == 3){
-                subView.setTitle(title: "退休干部")
-                subView.setImage(image: UIImage(named: "homePage_backgroup_blue"))
-                subView.name = "退休干部"
-
-            }
-            else if(i == 4){
-                subView.setTitle(title: "退休医生")
-                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
-                subView.name = "退伍军人"
+            let idModel:CNLiveIdentityModel = idArray[i]
+            let navTitle:String = idModel.name!
+            subView.setTitle(title: navTitle)
+            subView.imageView.kf.setImage(with: URL(string: idModel.backgroundImg!))
+            //.setImageWith(URL(string: idModel.backgroundImg ?? "")!, placeholderImage: UIImage(named: "homePage_backgroup_red"))
+//            if (i == 0) {
+//
+//                subView.name = navTitle
+//            }
+//            else if(i == 1){
+//                subView.setTitle(title: "退伍军人")
+//                subView.setImage(image: UIImage(named: "homePage_backgroup_blue"))
+//                subView.name = "退伍军人"
+//
+//            }
+//            else if(i == 2){
+//                subView.setTitle(title: "慈善家")
+//                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
+//                subView.name = "慈善家"
+//
+//            }
+//            else if(i == 3){
+//                subView.setTitle(title: "退休干部")
+//                subView.setImage(image: UIImage(named: "homePage_backgroup_blue"))
+//                subView.name = "退休干部"
+//
+//            }
+//            else if(i == 4){
+//                subView.setTitle(title: "退休医生")
+//                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
+//                subView.name = "退伍军人"
+//
+//            }
-            }
-            
             //更新双向链表
             let lastSubView: CNHomePageBackgroupSubView? = self.dataArray.last
             lastSubView?.nextSubView = subView
             subView.preSubView = lastSubView
-            
+
             self.dataArray.append(subView)
             if i==0 {
@@ -139,7 +148,7 @@ class CNHomePageBackgroupView: UIView{
                 self.currentApearViewIndex = i
             }
         }
-        
+
         //倒序添加子view
         for i in self.dataArray.enumerated().reversed() {
@@ -148,10 +157,9 @@ class CNHomePageBackgroupView: UIView{
         }
-        
+
         let subView: CNHomePageBackgroupSubView = CNHomePageBackgroupSubView.init(frame: self.bounds)
         subView.frame = self.bounds
-        
     }
     //MARK: - 公开方法
@@ -27,6 +27,14 @@ class CNFrontMainView : UIView{
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+    lazy var nameLabel: UILabel = {
+        let nameLabel = UILabel.init()
+        nameLabel.textColor = .white
+        nameLabel.font = Font_16
+        nameLabel.text = "啊啊"
+        nameLabel.textColor = .red
+        return nameLabel
+    }()
     lazy var imageView:UIImageView = {
@@ -55,6 +63,10 @@ class CNFrontMainView : UIView{
         imageView.image = UIImage.init(named: "homePage_mainView_front");
         contentView.addSubview(imageView)
+        nameLabel.frame = CGRect(x: 0, y: 0, width: 100, height: 30)
+        nameLabel.text = "啊啊"
+        contentView.addSubview(nameLabel)
+        
         return contentView
     }()
@@ -27,7 +27,7 @@ class CNLiveHomePageViewModel:NSObject {
         //从网络获取
         CNLiveNetworking.setAllowRequestDefaultArgument(false)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: "\(APPBaseMCUrl)/identityApi/list?sid=\(UserInfoManager.shared.userInfo.uid)&page=1&pageSize=1000", param: nil, cacheType: .networkOnly) { task , result, error in
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: "\(APPBaseMCUrl)/identityApi/allList?sid=\(UserInfoManager.shared.userInfo.uid)&page=1&pageSize=1000", param: nil, cacheType: .networkOnly) { task , result, error in
             if((error) != nil){
                 //网络请求失败