主页宽度调小 , 上下滑地址取反

张旭
1 parent a8fed67e
Showing 4 changed files with 12 additions and 9 deletions
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
@@ -12,6 +12,9 @@ import CNLiveRequestBastKit
  
 let Width: CGFloat  = UIScreen.main.bounds.size.width
 let Height: CGFloat = UIScreen.main.bounds.size.height
+///主窗口宽度
+let MainViewW: CGFloat = Width-100
+
  
 ///存储是否第一次显示首页上滑引导
 let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideKey"
@@ -71,7 +74,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
  
     ///无网.接口失败View
     lazy var notNetworkView: UIView = {
-        let W = Width-50
+        let W = MainViewW
         let H = W*1.5
         let notNetworkView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
         notNetworkView.backgroundColor = UIColor.white
@@ -368,7 +371,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         var bannerView:CNCustomIndexView? = flowView.dequeueReusableCell() as? CNCustomIndexView
  
         if (bannerView == nil) {
-            bannerView = CNCustomIndexView.init(frame: CGRectMake(0, 0, Width-50, Height))
+            bannerView = CNCustomIndexView.init(frame: CGRectMake(0, 0, MainViewW, Height))
             bannerView?.tag = index + 100
             bannerView?.layer.cornerRadius = 4
             bannerView?.layer.masksToBounds = false
@@ -384,7 +387,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
  
     func sizeForPage(in flowView: NewPagedFlowView!) -> CGSize {
-        return CGSize(width: Width-50, height: Height)
+        return CGSize(width: MainViewW, height: Height)
     }
  
     ///NewPagedFlowView 开始滑动
@@ -436,7 +439,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
  
         scrollView.isScrollEnabled = true
  
-        let toIndex:Int = Int(scrollView.contentOffset.x/(Width-50))
+        let toIndex:Int = Int(scrollView.contentOffset.x/(MainViewW))
  
         if toIndex == self.backgroupView.currentApearViewIndex{
             return
@@ -118,8 +118,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         set{
             self.mainView.idModel = newValue!
             _idModel = newValue
-            self.upSlideView.url = _idModel?.upPath
-            self.downSlideView.url = _idModel?.downPath
+            self.upSlideView.url = _idModel?.downPath
+            self.downSlideView.url = _idModel?.upPath
             self.topNavView.setTitleString(title:(_idModel?.name)!)
         }
  
@@ -334,7 +334,7 @@ class CNMainView : UIView{
  
     }
  
-    // MARK: - <##><##>设置前置视图容器
+    // MARK: -设置前置视图容器
     func isHiddenMainFrontContentView(isHidden:Bool){
         self.frontView.frontTotolContentView.isHidden = isHidden
     }
@@ -148,8 +148,8 @@ final class StandListModel: BaseModel, TableCodable {
     var descBackgroundImg: String = ""//首页文字背景图
     var cardImg: String = ""//卡片背景图
     var cardBackgroundImg: String = ""//首页卡片背景图
-    var upPath: String = ""//上滑h5
-    var downPath: String = ""//下滑h5
+    var upPath: String = ""//顶部h5
+    var downPath: String = ""//底部h5
     var auth: Bool = false//身份是否验证
  
     var createTimeString: String = ""