Commit a07e14ef303d7adf3174258da542f83f586f9fd8
1 parent
c47bc952
删除无用注释
Showing
8 changed files
with
9 additions
and
30 deletions
metaCode.xcodeproj/project.pbxproj
| @@ -695,7 +695,7 @@ | @@ -695,7 +695,7 @@ | ||
| 695 | 1938BD152B3D6C6000390A34 /* Controller */ = { | 695 | 1938BD152B3D6C6000390A34 /* Controller */ = { |
| 696 | isa = PBXGroup; | 696 | isa = PBXGroup; |
| 697 | children = ( | 697 | children = ( |
| 698 | - 1938BD272B48009600390A34 /* AuthController */, | 698 | + 1938BD272B48009600390A34 /* HomeController */, |
| 699 | 1938BD1D2B46791400390A34 /* PlayletHomePage */, | 699 | 1938BD1D2B46791400390A34 /* PlayletHomePage */, |
| 700 | ); | 700 | ); |
| 701 | path = Controller; | 701 | path = Controller; |
| @@ -753,13 +753,13 @@ | @@ -753,13 +753,13 @@ | ||
| 753 | path = PlayletHomePage; | 753 | path = PlayletHomePage; |
| 754 | sourceTree = "<group>"; | 754 | sourceTree = "<group>"; |
| 755 | }; | 755 | }; |
| 756 | - 1938BD272B48009600390A34 /* AuthController */ = { | 756 | + 1938BD272B48009600390A34 /* HomeController */ = { |
| 757 | isa = PBXGroup; | 757 | isa = PBXGroup; |
| 758 | children = ( | 758 | children = ( |
| 759 | 1938BD282B4800E500390A34 /* push相关 */, | 759 | 1938BD282B4800E500390A34 /* push相关 */, |
| 760 | 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */, | 760 | 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */, |
| 761 | ); | 761 | ); |
| 762 | - path = AuthController; | 762 | + path = HomeController; |
| 763 | sourceTree = "<group>"; | 763 | sourceTree = "<group>"; |
| 764 | }; | 764 | }; |
| 765 | 1938BD282B4800E500390A34 /* push相关 */ = { | 765 | 1938BD282B4800E500390A34 /* push相关 */ = { |
| @@ -2078,7 +2078,7 @@ | @@ -2078,7 +2078,7 @@ | ||
| 2078 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; | 2078 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; |
| 2079 | CODE_SIGN_IDENTITY = "Apple Development"; | 2079 | CODE_SIGN_IDENTITY = "Apple Development"; |
| 2080 | CODE_SIGN_STYLE = Automatic; | 2080 | CODE_SIGN_STYLE = Automatic; |
| 2081 | - CURRENT_PROJECT_VERSION = 1.0.6.24.02.04.18; | 2081 | + CURRENT_PROJECT_VERSION = 1.0.7.24.02.26.14; |
| 2082 | DEVELOPMENT_TEAM = 94X49GG3ZW; | 2082 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 2083 | ENABLE_BITCODE = NO; | 2083 | ENABLE_BITCODE = NO; |
| 2084 | ENABLE_MODULE_VERIFIER = NO; | 2084 | ENABLE_MODULE_VERIFIER = NO; |
| @@ -2150,7 +2150,7 @@ | @@ -2150,7 +2150,7 @@ | ||
| 2150 | "$(inherited)", | 2150 | "$(inherited)", |
| 2151 | "@executable_path/Frameworks", | 2151 | "@executable_path/Frameworks", |
| 2152 | ); | 2152 | ); |
| 2153 | - MARKETING_VERSION = 1.0.6; | 2153 | + MARKETING_VERSION = 1.0.7; |
| 2154 | OTHER_LDFLAGS = ( | 2154 | OTHER_LDFLAGS = ( |
| 2155 | "$(inherited)", | 2155 | "$(inherited)", |
| 2156 | "-all_load", | 2156 | "-all_load", |
| @@ -2332,7 +2332,7 @@ | @@ -2332,7 +2332,7 @@ | ||
| 2332 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; | 2332 | CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; |
| 2333 | CODE_SIGN_IDENTITY = "Apple Development"; | 2333 | CODE_SIGN_IDENTITY = "Apple Development"; |
| 2334 | CODE_SIGN_STYLE = Automatic; | 2334 | CODE_SIGN_STYLE = Automatic; |
| 2335 | - CURRENT_PROJECT_VERSION = 1.0.6.24.02.04.18; | 2335 | + CURRENT_PROJECT_VERSION = 1.0.7.24.02.26.14; |
| 2336 | DEVELOPMENT_TEAM = 94X49GG3ZW; | 2336 | DEVELOPMENT_TEAM = 94X49GG3ZW; |
| 2337 | ENABLE_BITCODE = NO; | 2337 | ENABLE_BITCODE = NO; |
| 2338 | ENABLE_MODULE_VERIFIER = NO; | 2338 | ENABLE_MODULE_VERIFIER = NO; |
| @@ -2404,7 +2404,7 @@ | @@ -2404,7 +2404,7 @@ | ||
| 2404 | "$(inherited)", | 2404 | "$(inherited)", |
| 2405 | "@executable_path/Frameworks", | 2405 | "@executable_path/Frameworks", |
| 2406 | ); | 2406 | ); |
| 2407 | - MARKETING_VERSION = 1.0.6; | 2407 | + MARKETING_VERSION = 1.0.7; |
| 2408 | OTHER_LDFLAGS = ( | 2408 | OTHER_LDFLAGS = ( |
| 2409 | "$(inherited)", | 2409 | "$(inherited)", |
| 2410 | "-all_load", | 2410 | "-all_load", |
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
| @@ -17,7 +17,7 @@ let Height: CGFloat = UIScreen.main.bounds.size.height | @@ -17,7 +17,7 @@ let Height: CGFloat = UIScreen.main.bounds.size.height | ||
| 17 | let LeftGap: CGFloat = UIScreen.main.bounds.size.width <= 375 ? 23 : 40 | 17 | let LeftGap: CGFloat = UIScreen.main.bounds.size.width <= 375 ? 23 : 40 |
| 18 | 18 | ||
| 19 | ///主窗口宽度 | 19 | ///主窗口宽度 |
| 20 | -let MainViewW: CGFloat = Width-LeftGap*2//Width-50 | 20 | +let MainViewW: CGFloat = Width-LeftGap*2 |
| 21 | ///下滑页底部工具条高度 | 21 | ///下滑页底部工具条高度 |
| 22 | let DownSlideBottomViewHeight: CGFloat = 74 | 22 | let DownSlideBottomViewHeight: CGFloat = 74 |
| 23 | 23 | ||
| @@ -26,14 +26,6 @@ let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideK | @@ -26,14 +26,6 @@ let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideK | ||
| 26 | ///存储是否第一次显示首页下滑引导 | 26 | ///存储是否第一次显示首页下滑引导 |
| 27 | let CNKeyIsFirstAppearDownSlideHomeGuide: String = "isFirstAppearDownSlideHomeGuideKey" | 27 | let CNKeyIsFirstAppearDownSlideHomeGuide: String = "isFirstAppearDownSlideHomeGuideKey" |
| 28 | 28 | ||
| 29 | -/////用户身份认证状态 | ||
| 30 | -//enum UserIdentityStatus { | ||
| 31 | -// ///未认证 | ||
| 32 | -// case notCertified | ||
| 33 | -// ///已经认证 | ||
| 34 | -// case haveBeenCertified | ||
| 35 | -//} | ||
| 36 | - | ||
| 37 | ///数据状态 | 29 | ///数据状态 |
| 38 | enum NetAPIStatus { | 30 | enum NetAPIStatus { |
| 39 | ///接口成功 | 31 | ///接口成功 |
| @@ -65,8 +57,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -65,8 +57,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 65 | ///tabBar 的Y坐标位置 | 57 | ///tabBar 的Y坐标位置 |
| 66 | private var tabBarY:CGFloat = 0.0 | 58 | private var tabBarY:CGFloat = 0.0 |
| 67 | 59 | ||
| 68 | - ///用户身份认证状态 | ||
| 69 | -// private var identityStatus: UserIdentityStatus = .notCertified | ||
| 70 | ///接口状态 | 60 | ///接口状态 |
| 71 | private var NetApiStatus: NetAPIStatus = .apiError | 61 | private var NetApiStatus: NetAPIStatus = .apiError |
| 72 | ///接口状态 | 62 | ///接口状态 |
| @@ -266,14 +256,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -266,14 +256,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 266 | 256 | ||
| 267 | self.makeConstraints() | 257 | self.makeConstraints() |
| 268 | 258 | ||
| 269 | -// switch self.identityStatus{ | ||
| 270 | -// | ||
| 271 | -// case .notCertified: | ||
| 272 | -// self.view.addSubview(self.addCertificationView) | ||
| 273 | -// case .haveBeenCertified: | ||
| 274 | -// self.addPageView() | ||
| 275 | -// } | ||
| 276 | - | ||
| 277 | } | 259 | } |
| 278 | 260 | ||
| 279 | // MARK: -事件 | 261 | // MARK: -事件 |
| @@ -370,7 +352,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -370,7 +352,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 370 | self.pageFlowView.scrollView.isScrollEnabled = false | 352 | self.pageFlowView.scrollView.isScrollEnabled = false |
| 371 | UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView) | 353 | UIApplication.shared.keyWindow!.addSubview(self.downSlideGuideView) |
| 372 | UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView) | 354 | UIApplication.shared.keyWindow!.addSubview(self.downSlideGifView) |
| 373 | -// self.tabBarController?.tabBar.isHidden = true | ||
| 374 | } | 355 | } |
| 375 | 356 | ||
| 376 | }else{ | 357 | }else{ |
| @@ -379,7 +360,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | @@ -379,7 +360,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel | ||
| 379 | 360 | ||
| 380 | UIApplication.shared.keyWindow!.addSubview(self.upSlideGuideView) | 361 | UIApplication.shared.keyWindow!.addSubview(self.upSlideGuideView) |
| 381 | UIApplication.shared.keyWindow!.addSubview(self.upSlideGifView) | 362 | UIApplication.shared.keyWindow!.addSubview(self.upSlideGifView) |
| 382 | -// self.tabBarController?.tabBar.isHidden = true | ||
| 383 | } | 363 | } |
| 384 | } | 364 | } |
| 385 | 365 |
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
| @@ -75,7 +75,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa | @@ -75,7 +75,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa | ||
| 75 | tableView.delegate = self | 75 | tableView.delegate = self |
| 76 | tableView.separatorStyle = .none | 76 | tableView.separatorStyle = .none |
| 77 | tableView.bounces = false | 77 | tableView.bounces = false |
| 78 | -// tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier) | ||
| 79 | tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier) | 78 | tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier) |
| 80 | tableView.register(CNLiveDownSlideTodayRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier) | 79 | tableView.register(CNLiveDownSlideTodayRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier) |
| 81 | tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideAllCourseCellIdentifier) | 80 | tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideAllCourseCellIdentifier) |
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift renamed to metaCode/Classes/Main/HomePages/Controller/HomeController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomePageAnimationTransition.swift renamed to metaCode/Classes/Main/HomePages/Controller/HomeController/push相关/CNHomePageAnimationTransition.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomePageBaseNavigationController.swift renamed to metaCode/Classes/Main/HomePages/Controller/HomeController/push相关/CNHomePageBaseNavigationController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDetailViewController.swift renamed to metaCode/Classes/Main/HomePages/Controller/HomeController/push相关/CNHomepageDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/push相关/CNHomepageDuanJuDetailViewController.swift renamed to metaCode/Classes/Main/HomePages/Controller/HomeController/push相关/CNHomepageDuanJuDetailViewController.swift