iOS Team / CNLiveMateCode · Commits

Commit cf0506b250c279beb6c6e414cd21866009be4100

Authored by niudaojian
1 parent d84fd0ec

添加资源，解决首页偶发无法滑动

Inline Side-by-side
Showing 7 changed files with 36 additions and 8 deletions
metaCode.xcodeproj/project.pbxproj
  View file @cf0506b
... ... @@ -38,6 +38,9 @@
38 38 7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
39 39 7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */; };
40 40 7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */; };
  41 + 7C4931342A307B58000E44B4 /* slide_down.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931332A307B58000E44B4 /* slide_down.gif */; };
  42 + 7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
  43 + 7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */; };
41 44 7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
42 45 7CD6753C2A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift */; };
43 46 7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
... ... @@ -110,6 +113,9 @@
110 113 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
111 114 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBar+CNBadge.swift"; sourceTree = "<group>"; };
112 115 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageBackgroupView.swift; sourceTree = "<group>"; };
  116 + 7C4931332A307B58000E44B4 /* slide_down.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_down.gif; sourceTree = "<group>"; };
  117 + 7C4931352A307B60000E44B4 /* slide_up.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_up.gif; sourceTree = "<group>"; };
  118 + 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageGuideView.swift; sourceTree = "<group>"; };
113 119 7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
114 120 7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
115 121 7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
... ... @@ -284,6 +290,8 @@
284 290 isa = PBXGroup;
285 291 children = (
286 292 790D01A62A2DF84C00C5978D /* countries.plist */,
  293 + 7C4931332A307B58000E44B4 /* slide_down.gif */,
  294 + 7C4931352A307B60000E44B4 /* slide_up.gif */,
287 295 );
288 296 path = Resources;
289 297 sourceTree = "<group>";
... ... @@ -395,6 +403,7 @@
395 403 7CD6753A2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift */,
396 404 7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
397 405 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
  406 + 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
398 407 );
399 408 name = View;
400 409 path = HomePage/View;
... ... @@ -589,7 +598,9 @@
589 598 818163C82A25CFCF00579C86 /* LaunchScreen.storyboard in Resources */,
590 599 790D01A72A2DF84C00C5978D /* countries.plist in Resources */,
591 600 818163C52A25CFCF00579C86 /* Assets.xcassets in Resources */,
  601 + 7C4931342A307B58000E44B4 /* slide_down.gif in Resources */,
592 602 818163C32A25CFCC00579C86 /* Main.storyboard in Resources */,
  603 + 7C4931362A307B60000E44B4 /* slide_up.gif in Resources */,
593 604 );
594 605 runOnlyForDeploymentPostprocessing = 0;
595 606 };
... ... @@ -729,6 +740,7 @@
729 740 7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
730 741 7CD675522A29C04B008354C1 /* CNLiveConstant.swift in Sources */,
731 742 79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
  743 + 7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
732 744 7CD6753E2A2740B0008354C1 /* CNPayMoneyCodeView.swift in Sources */,
733 745 790D01A12A2DD69200C5978D /* CNLiveTips.swift in Sources */,
734 746 7CD675402A2740B0008354C1 /* CNCollectMoneyCodeView.swift in Sources */,
... ...
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
  View file @cf0506b
... ... @@ -74,6 +74,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
74 74 super.viewDidAppear(animated)
75 75 self.view.height = KSreenHeight
76 76  
  77 + self.topNavView.isHidden = true
77 78  
78 79 }
79 80 // MARK: - 添加UI
... ... @@ -147,16 +148,19 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
147 148 }
148 149 }
149 150 }
150   -
151 151 ///NewPagedFlowView 滑动将要结束
152   - func willEndScroll(_ scrollView: UIScrollView!) {
  152 + func willEndScroll(_ scrollView: UIScrollView!, willDecelerate decelerate: Bool) {
153 153  
154 154 //暂时禁止再次滑动,后期优化通过自定义UIScrollView 结束动画来实现
155   - scrollView.isScrollEnabled = false
  155 + if(decelerate == true){
  156 + scrollView.isScrollEnabled = false
  157 + }
156 158 }
157 159 ///NewPagedFlowView 滑动结束
158 160 func didEndScroll(_ scrollView: UIScrollView!) {
159   - print("scrollView.contentOffset.x = ",scrollView.contentOffset.x)
  161 +
  162 + scrollView.isScrollEnabled = true
  163 +
160 164 let toIndex:Int = Int(scrollView.contentOffset.x/(Width-50))
161 165  
162 166 if toIndex == self.backgroupView.currentApearViewIndex{
... ... @@ -165,7 +169,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
165 169  
166 170 self.backgroupView.replaceCurerrentApearView(fromIndex: self.backgroupView.currentApearViewIndex, toIndex: toIndex)
167 171  
168   - scrollView.isScrollEnabled = true
169 172  
170 173 }
171 174  
... ...
metaCode/Classes/Main/HomePage/View/CNHomePageGuideView.swift 0 → 100644
  View file @cf0506b
  1 +//
  2 +// CNHomePageGuideView.swift
  3 +// metaCode
  4 +//
  5 +// Created by daojian on 2023/6/7.
  6 +// 首页引导
  7 +
  8 +import Foundation
  9 +
  10 +class CNHomePageGuideView: UIView{
  11 +
  12 +}
... ...
metaCode/Classes/Resources/slide_down.gif 0 → 100644
View file @cf0506b

46.4 KB
metaCode/Classes/Resources/slide_up.gif 0 → 100644
View file @cf0506b

46.8 KB
metaCode/Classes/Vendors/NewPagedFlowView.h
  View file @cf0506b
... ... @@ -185,7 +185,7 @@ typedef NS_ENUM (NSUInteger, NewPagedFlowViewOrientation) {
185 185  
186 186 /// 将要结束滚动
187 187 /// @param scrollView 滚动的scrollView
188   -- (void)willEndScroll:(UIScrollView *)scrollView;
  188 +- (void)willEndScroll:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate;
189 189  
190 190 /// 已经结束滚动
191 191 /// @param scrollView 滚动的scrollView
... ...
metaCode/Classes/Vendors/NewPagedFlowView.m
  View file @cf0506b
... ... @@ -672,8 +672,9 @@ static NSString *subviewClassName;
672 672 #pragma mark --结束拖拽
673 673 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
674 674 [self startTimer];
675   - if(self.delegate && [self.delegate respondsToSelector:@selector(willEndScroll:)]){
676   - [self.delegate willEndScroll:scrollView];
  675 +
  676 + if(self.delegate && [self.delegate respondsToSelector:@selector(willEndScroll: willDecelerate:)]){
  677 + [self.delegate willEndScroll:scrollView willDecelerate:decelerate];
677 678 }
678 679 }
679 680 //结束滑动
... ...