iOS Team / CNLiveMateCode · Commits

Commit 944d06efa77b1cef5e8ec70d8508df5faff098d3

Authored by “张旭”
1 parent f482494a

网页高度过高问题 , 认证左右滑取消弹簧 ,

Inline Side-by-side
Showing 4 changed files with 35 additions and 4 deletions
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
  View file @944d06e
... ... @@ -60,7 +60,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
60 60 ///接口状态
61 61 private var NetApiStatus: NetAPIStatus = .apiError
62 62 ///接口状态
63   - public var vNumPage: VNumPage = .VNumPageMain
  63 + public var vNumPage: VNumPage = .VNumPageMain{
  64 + didSet {
  65 + print("已设置 vNumPage的值为：\(vNumPage)")
  66 + }
  67 + }
64 68  
65 69  
66 70 // MARK: - 懒加载
... ... @@ -166,7 +170,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
166 170 ///左右滑动分页view
167 171 lazy var pageFlowView: NewPagedFlowView = {
168 172 let pageFlowView = NewPagedFlowView.init(frame: CGRectMake(0, 0, Width, Height))
169   -
  173 + pageFlowView.scrollView.bounces = false
170 174 pageFlowView.delegate = self
171 175 pageFlowView.dataSource = self
172 176 pageFlowView.minimumPageAlpha = 0.1
... ...
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
  View file @944d06e
... ... @@ -31,7 +31,7 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
31 31 configuration.preferences.minimumFontSize = 0.0
32 32 configuration.preferences = preferences
33 33 configuration.userContentController = WKUserContentController()
34   - let webView = CNWebView(frame: CGRectMake(0, 0, Width, Height), configuration: configuration, url: _url)
  34 + let webView = CNWebView(frame: CGRectMake(0, KNavigationHeight, Width, Height-KNavigationHeight), configuration: configuration, url: _url)
35 35 webView.cnWebView.scrollView.showsVerticalScrollIndicator = false
36 36 webView.cnWebView.scrollView.showsHorizontalScrollIndicator = false
37 37 webView.isCNWebController = true
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/CNCustomIndexView.swift
  View file @944d06e
... ... @@ -116,8 +116,9 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
116 116 _idModel
117 117 }
118 118 set{
  119 + _idModel = newValue!
119 120 self.mainView.idModel = newValue!
120   - _idModel = newValue
  121 +
121 122 self.upSlideView.idModel = _idModel
122 123 self.upSlideView.type = _idModel?.downType
123 124 self.upSlideView.downPath = _idModel?.downPath
... ...
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
  View file @944d06e
... ... @@ -171,6 +171,32 @@ final class StandListModel: BaseModel {//, TableCodable {
171 171 //身份详情model
172 172 var standInfoBaseModel:MineStandInfoBaseModel?
173 173  
  174 + // 重载 == 运算符
  175 + static func == (lhs: StandListModel, rhs: StandListModel) -> Bool {
  176 +
  177 + if lhs.id == rhs.id &&
  178 + lhs.name == rhs.name &&
  179 + lhs.icon == rhs.icon &&
  180 + lhs.createTime == rhs.createTime &&
  181 + lhs.enable == rhs.enable &&
  182 + lhs.backgroundImg == rhs.backgroundImg &&
  183 + lhs.upGuideImg == rhs.upGuideImg &&
  184 + lhs.downGuideImg == rhs.downGuideImg &&
  185 + lhs.backgroundColor == rhs.backgroundColor
  186 + {//剩下不写了 ,只判断id都可以
  187 + return true
  188 + }
  189 + else
  190 + {
  191 + return false
  192 +
  193 + }
  194 + }
  195 + // 重载 != 运算符
  196 + static func != (lhs: StandListModel, rhs: StandListModel) -> Bool {
  197 + return !(lhs == rhs)
  198 + }
  199 +
174 200 override func mapping(mapper: HelpingMapper) {
175 201 mapper <<<
176 202 self.createTime <-- TransformOf(fromJSON: { [weak self] (raw) -> Int in
... ...