Commit cef837203ea83a8d023c670fe3395171af68b8d9
1 parent
267af1cc
更换首页alllist接口
Showing
5 changed files
with
60 additions
and
31 deletions
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
| @@ -261,7 +261,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -261,7 +261,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 261 | bannerView?.superScrollView = flowView.scrollView | 261 | bannerView?.superScrollView = flowView.scrollView |
| 262 | bannerView?.associatedVCView = self.view | 262 | bannerView?.associatedVCView = self.view |
| 263 | bannerView?.delegate = self | 263 | bannerView?.delegate = self |
| 264 | - let identityModel = dataArray[index] as! CNLiveIdentityModel | 264 | + let identityModel = dataArray[index] as! StandListModel |
| 265 | bannerView?.idModel = identityModel | 265 | bannerView?.idModel = identityModel |
| 266 | return bannerView | 266 | return bannerView |
| 267 | } | 267 | } |
| @@ -381,28 +381,53 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -381,28 +381,53 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 381 | } | 381 | } |
| 382 | } | 382 | } |
| 383 | } | 383 | } |
| 384 | - //MARK: - 网络请求 | 384 | + //MARK: - 网络请求获取身份列表 |
| 385 | func getUserIdentityApi(){ | 385 | func getUserIdentityApi(){ |
| 386 | - CNLiveHomePageViewModel.getUserIdentityApi { listArray, responseType, errorMsg in | ||
| 387 | - switch responseType{ | ||
| 388 | - case .success: | ||
| 389 | - if(listArray.count>0){ | ||
| 390 | - self.addCertificationView.isHidden = true | ||
| 391 | - self.addCertificationView.removeFromSuperview() | ||
| 392 | - self.dataArray.addObjects(from: listArray) | ||
| 393 | - self.addPageView() | ||
| 394 | - self.identityStatus = .haveBeenCertified | ||
| 395 | - self.backgroupView.updateData(idArray: listArray ) | ||
| 396 | - }else{ | ||
| 397 | - self.identityStatus = .notCertified | ||
| 398 | - } | ||
| 399 | - | ||
| 400 | - case .failed: | ||
| 401 | - showMessage(message: errorMsg) | ||
| 402 | - case .noNetwork: | ||
| 403 | - showMessage(message: "网络未连接") | 386 | + CNLiveMineViewModel.requestAuthStandList(page: 1) { result, respStatue in |
| 387 | + if respStatue == .success{ | ||
| 388 | + let listArray:NSArray = (result as! StandListBaseModel).list as NSArray | ||
| 389 | + if (listArray.count > 0){ | ||
| 390 | + self.addCertificationView.isHidden = true | ||
| 391 | + self.addCertificationView.removeFromSuperview() | ||
| 392 | + self.dataArray.addObjects(from: listArray as! [Any]) | ||
| 393 | + self.addPageView() | ||
| 394 | + self.identityStatus = .haveBeenCertified | ||
| 395 | + self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>) | ||
| 396 | + }else{ | ||
| 397 | + self.identityStatus = .notCertified | ||
| 404 | } | 398 | } |
| 399 | + } | ||
| 400 | + else if (respStatue == .failed){ | ||
| 401 | +// showMessage(message: "") | ||
| 402 | + | ||
| 403 | + // TODO: 需做接口失败页面UI | ||
| 404 | + }else if (respStatue == .noNetwork){ | ||
| 405 | +// showMessage(message: "网络未连接") | ||
| 406 | + // TODO: 需做无网络页面UI | ||
| 407 | + } | ||
| 405 | } | 408 | } |
| 406 | } | 409 | } |
| 410 | +// func getUserIdentityApi(){ | ||
| 411 | +// CNLiveHomePageViewModel.getUserIdentityApi { listArray, responseType, errorMsg in | ||
| 412 | +// switch responseType{ | ||
| 413 | +// case .success: | ||
| 414 | +// if(listArray.count>0){ | ||
| 415 | +// self.addCertificationView.isHidden = true | ||
| 416 | +// self.addCertificationView.removeFromSuperview() | ||
| 417 | +// self.dataArray.addObjects(from: listArray) | ||
| 418 | +// self.addPageView() | ||
| 419 | +// self.identityStatus = .haveBeenCertified | ||
| 420 | +// self.backgroupView.updateData(idArray: listArray ) | ||
| 421 | +// }else{ | ||
| 422 | +// self.identityStatus = .notCertified | ||
| 423 | +// } | ||
| 424 | +// | ||
| 425 | +// case .failed: | ||
| 426 | +// showMessage(message: errorMsg) | ||
| 427 | +// case .noNetwork: | ||
| 428 | +// showMessage(message: "网络未连接") | ||
| 429 | +// } | ||
| 430 | +// } | ||
| 431 | +// } | ||
| 407 | 432 | ||
| 408 | } | 433 | } |
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
| @@ -98,8 +98,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | @@ -98,8 +98,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | ||
| 98 | weak var superScrollView:UIScrollView? | 98 | weak var superScrollView:UIScrollView? |
| 99 | 99 | ||
| 100 | //IDmodel | 100 | //IDmodel |
| 101 | - var _idModel : CNLiveIdentityModel? | ||
| 102 | - var idModel : CNLiveIdentityModel? { | 101 | + var _idModel : StandListModel? |
| 102 | + var idModel : StandListModel? { | ||
| 103 | get{ | 103 | get{ |
| 104 | _idModel | 104 | _idModel |
| 105 | } | 105 | } |
metaCode/Classes/Main/HomePage/View/CNHomePageBackgroupView.swift
| @@ -96,17 +96,17 @@ class CNHomePageBackgroupView: UIView{ | @@ -96,17 +96,17 @@ class CNHomePageBackgroupView: UIView{ | ||
| 96 | 96 | ||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | - func updateData(idArray:Array<CNLiveIdentityModel>){ | 99 | + func updateData(idArray:Array<StandListModel>){ |
| 100 | for i in (0..<idArray.count){ | 100 | for i in (0..<idArray.count){ |
| 101 | 101 | ||
| 102 | let subView: CNHomePageBackgroupSubView = CNHomePageBackgroupSubView.init(frame: self.bounds) | 102 | let subView: CNHomePageBackgroupSubView = CNHomePageBackgroupSubView.init(frame: self.bounds) |
| 103 | subView.frame = self.bounds | 103 | subView.frame = self.bounds |
| 104 | 104 | ||
| 105 | - let idModel:CNLiveIdentityModel = idArray[i] | 105 | + let idModel:StandListModel = idArray[i] |
| 106 | let navTitle:String = idModel.name! | 106 | let navTitle:String = idModel.name! |
| 107 | subView.setTitle(title: navTitle) | 107 | subView.setTitle(title: navTitle) |
| 108 | 108 | ||
| 109 | - subView.imageView.kf.setImage(with: URL(string: idModel.backgroundImg!),placeholder: UIImage(named: "homePage_backgroup_red")) | 109 | + subView.imageView.kf.setImage(with: URL(string: idModel.backgroundImg),placeholder: UIImage(named: "homePage_backgroup_red")) |
| 110 | 110 | ||
| 111 | //更新双向链表 | 111 | //更新双向链表 |
| 112 | let lastSubView: CNHomePageBackgroupSubView? = self.dataArray.last | 112 | let lastSubView: CNHomePageBackgroupSubView? = self.dataArray.last |
metaCode/Classes/Main/HomePage/View/CNMainView.swift
| @@ -100,8 +100,8 @@ class CNFrontMainView : UIView{ | @@ -100,8 +100,8 @@ class CNFrontMainView : UIView{ | ||
| 100 | }() | 100 | }() |
| 101 | 101 | ||
| 102 | //IDmodel | 102 | //IDmodel |
| 103 | - var _idModel : CNLiveIdentityModel? | ||
| 104 | - var idModel : CNLiveIdentityModel? { | 103 | + var _idModel : StandListModel? |
| 104 | + var idModel : StandListModel? { | ||
| 105 | get{ | 105 | get{ |
| 106 | _idModel | 106 | _idModel |
| 107 | } | 107 | } |
| @@ -119,7 +119,11 @@ class CNFrontMainView : UIView{ | @@ -119,7 +119,11 @@ class CNFrontMainView : UIView{ | ||
| 119 | //显示textview 添加身份 | 119 | //显示textview 添加身份 |
| 120 | self.textView.isHidden = false | 120 | self.textView.isHidden = false |
| 121 | self.textView.text = newValue!.description | 121 | self.textView.text = newValue!.description |
| 122 | - addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor!) | 122 | + var backgroundColor = "#004FE0" |
| 123 | + if (newValue!.backgroundColor != ""){ | ||
| 124 | + backgroundColor = newValue!.backgroundColor | ||
| 125 | + } | ||
| 126 | + addStandBtn.backgroundColor = HexColor(backgroundColor ) | ||
| 123 | } | 127 | } |
| 124 | _idModel = newValue | 128 | _idModel = newValue |
| 125 | } | 129 | } |
| @@ -221,8 +225,8 @@ class CNMainView : UIView{ | @@ -221,8 +225,8 @@ class CNMainView : UIView{ | ||
| 221 | } | 225 | } |
| 222 | 226 | ||
| 223 | //IDmodel | 227 | //IDmodel |
| 224 | - var _idModel : CNLiveIdentityModel? | ||
| 225 | - var idModel : CNLiveIdentityModel? { | 228 | + var _idModel : StandListModel? |
| 229 | + var idModel : StandListModel? { | ||
| 226 | get{ | 230 | get{ |
| 227 | _idModel | 231 | _idModel |
| 228 | } | 232 | } |
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
| @@ -144,7 +144,7 @@ class StandListModel: BaseModel { | @@ -144,7 +144,7 @@ class StandListModel: BaseModel { | ||
| 144 | var timeString: String = "" | 144 | var timeString: String = "" |
| 145 | var auth: Bool = false | 145 | var auth: Bool = false |
| 146 | var backgroundImg: String = "" | 146 | var backgroundImg: String = "" |
| 147 | - var backgroundColour: String = "" | 147 | + var backgroundColor: String = "" |
| 148 | var description: String = "" | 148 | var description: String = "" |
| 149 | var cardImg: String = "" | 149 | var cardImg: String = "" |
| 150 | var downPath: String = "" | 150 | var downPath: String = "" |