iOS Team / CNLiveMateCode · Commits

Commit 48fb7a350ff2431dbae3f5159577f612d68b8501

Authored by 张旭
1 parent eb7dfd09

认证Tab , 首页Tab

Inline Side-by-side
Showing 12 changed files with 123 additions and 25 deletions
metaCode.xcodeproj/project.pbxproj
  View file @48fb7a3
... ... @@ -74,6 +74,7 @@
74 74 192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */; };
75 75 1926C28F2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */; };
76 76 1926C2912AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */; };
  77 + 1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */; };
77 78 19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */; };
78 79 19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
79 80 19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
... ... @@ -310,6 +311,7 @@
310 311 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideViewController.swift; sourceTree = "<group>"; };
311 312 1926C28E2AE0D76C00C71DC3 /* CNLiveDownSlideViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideViewModel.swift; sourceTree = "<group>"; };
312 313 1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideModel.swift; sourceTree = "<group>"; };
  314 + 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAuthViewController.swift; sourceTree = "<group>"; };
313 315 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailBtnsCell.swift; sourceTree = "<group>"; };
314 316 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
315 317 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
... ... @@ -594,6 +596,89 @@
594 596 path = ShopCoupon;
595 597 sourceTree = "<group>";
596 598 };
  599 + 1938BD112B3D6C0C00390A34 /* HomePages */ = {
  600 + isa = PBXGroup;
  601 + children = (
  602 + 1938BD152B3D6C6000390A34 /* Controller */,
  603 + 1938BD142B3D6C5C00390A34 /* View */,
  604 + 1938BD132B3D6C5700390A34 /* Model */,
  605 + 1938BD122B3D6C4700390A34 /* ViewModel */,
  606 + );
  607 + path = HomePages;
  608 + sourceTree = "<group>";
  609 + };
  610 + 1938BD122B3D6C4700390A34 /* ViewModel */ = {
  611 + isa = PBXGroup;
  612 + children = (
  613 + );
  614 + path = ViewModel;
  615 + sourceTree = "<group>";
  616 + };
  617 + 1938BD132B3D6C5700390A34 /* Model */ = {
  618 + isa = PBXGroup;
  619 + children = (
  620 + );
  621 + path = Model;
  622 + sourceTree = "<group>";
  623 + };
  624 + 1938BD142B3D6C5C00390A34 /* View */ = {
  625 + isa = PBXGroup;
  626 + children = (
  627 + );
  628 + path = View;
  629 + sourceTree = "<group>";
  630 + };
  631 + 1938BD152B3D6C6000390A34 /* Controller */ = {
  632 + isa = PBXGroup;
  633 + children = (
  634 + 1938BD162B3D6C7F00390A34 /* CNLiveAuthViewController.swift */,
  635 + );
  636 + path = Controller;
  637 + sourceTree = "<group>";
  638 + };
  639 + 1938BD182B454DB100390A34 /* ShopUpConsole */ = {
  640 + isa = PBXGroup;
  641 + children = (
  642 + 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */,
  643 + );
  644 + path = ShopUpConsole;
  645 + sourceTree = "<group>";
  646 + };
  647 + 1938BD192B454E1500390A34 /* ShopDownDetail */ = {
  648 + isa = PBXGroup;
  649 + children = (
  650 + 19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */,
  651 + );
  652 + path = ShopDownDetail;
  653 + sourceTree = "<group>";
  654 + };
  655 + 1938BD1A2B4554A800390A34 /* AuthMainController */ = {
  656 + isa = PBXGroup;
  657 + children = (
  658 + 7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
  659 + );
  660 + path = AuthMainController;
  661 + sourceTree = "<group>";
  662 + };
  663 + 1938BD1B2B45557700390A34 /* DownSlideController */ = {
  664 + isa = PBXGroup;
  665 + children = (
  666 + 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
  667 + 19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */,
  668 + 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */,
  669 + 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */,
  670 + );
  671 + path = DownSlideController;
  672 + sourceTree = "<group>";
  673 + };
  674 + 1938BD1C2B4555A000390A34 /* WebController */ = {
  675 + isa = PBXGroup;
  676 + children = (
  677 + 19123FC02ABC11170075C883 /* CNWebViewController.swift */,
  678 + );
  679 + path = WebController;
  680 + sourceTree = "<group>";
  681 + };
597 682 19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
598 683 isa = PBXGroup;
599 684 children = (
... ... @@ -867,10 +952,11 @@
867 952 796398902A260C0100D045EB /* Main */ = {
868 953 isa = PBXGroup;
869 954 children = (
  955 + 1938BD112B3D6C0C00390A34 /* HomePages */,
870 956 7991722C2AF08CF100DC01A8 /* ShopPage */,
871 957 790D01972A2DCAE400C5978D /* MinePage */,
872 958 790D018C2A2D8C9A00C5978D /* LoginPage */,
873   - 7CD675212A26F844008354C1 /* HomePage */,
  959 + 7CD675212A26F844008354C1 /* AuthPage */,
874 960 );
875 961 path = Main;
876 962 sourceTree = "<group>";
... ... @@ -1049,7 +1135,7 @@
1049 1135 path = HomePage/ViewModel;
1050 1136 sourceTree = "<group>";
1051 1137 };
1052   - 7CD675212A26F844008354C1 /* HomePage */ = {
  1138 + 7CD675212A26F844008354C1 /* AuthPage */ = {
1053 1139 isa = PBXGroup;
1054 1140 children = (
1055 1141 19CC4D502ADD126D00308E2A /* Util */,
... ... @@ -1058,7 +1144,7 @@
1058 1144 7CD6754D2A2840B9008354C1 /* Controller */,
1059 1145 7CD675232A26F8F8008354C1 /* View */,
1060 1146 );
1061   - name = HomePage;
  1147 + name = AuthPage;
1062 1148 sourceTree = "<group>";
1063 1149 };
1064 1150 7CD675232A26F8F8008354C1 /* View */ = {
... ... @@ -1092,17 +1178,14 @@
1092 1178 7CD6754D2A2840B9008354C1 /* Controller */ = {
1093 1179 isa = PBXGroup;
1094 1180 children = (
  1181 + 1938BD1A2B4554A800390A34 /* AuthMainController */,
  1182 + 1938BD1C2B4555A000390A34 /* WebController */,
  1183 + 1938BD1B2B45557700390A34 /* DownSlideController */,
  1184 + 1938BD192B454E1500390A34 /* ShopDownDetail */,
  1185 + 1938BD182B454DB100390A34 /* ShopUpConsole */,
1095 1186 1917333D2B284C6B007BCC04 /* ShopCoupon */,
1096 1187 191732FC2B0B3EB4007BCC04 /* GoodsDetail */,
1097 1188 19565EC32AF8ACC2007D6727 /* GoodsManager */,
1098   - 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
1099   - 7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
1100   - 19123FC02ABC11170075C883 /* CNWebViewController.swift */,
1101   - 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */,
1102   - 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */,
1103   - 19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */,
1104   - 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */,
1105   - 19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */,
1106 1189 );
1107 1190 name = Controller;
1108 1191 path = HomePage/Controller;
... ... @@ -1421,6 +1504,7 @@
1421 1504 1917328E2B032583007BCC04 /* CNLiveRoundedRectView.swift in Sources */,
1422 1505 1917332F2B16C7C9007BCC04 /* CNLiveTimer.swift in Sources */,
1423 1506 7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
  1507 + 1938BD172B3D6C7F00390A34 /* CNLiveAuthViewController.swift in Sources */,
1424 1508 79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
1425 1509 79BB96A82AF223FB00AEA4AC /* CNLiveConfigAlertManager.swift in Sources */,
1426 1510 19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */,
... ... @@ -1799,7 +1883,7 @@
1799 1883 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1800 1884 CLANG_ENABLE_MODULES = YES;
1801 1885 CODE_SIGN_STYLE = Automatic;
1802   - CURRENT_PROJECT_VERSION = 1.0.3.23.12.28.11;
  1886 + CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
1803 1887 DEVELOPMENT_TEAM = 94X49GG3ZW;
1804 1888 EXCLUDED_ARCHS = "";
1805 1889 GENERATE_INFOPLIST_FILE = YES;
... ... @@ -1844,7 +1928,7 @@
1844 1928 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1845 1929 CLANG_ENABLE_MODULES = YES;
1846 1930 CODE_SIGN_STYLE = Automatic;
1847   - CURRENT_PROJECT_VERSION = 1.0.3.23.12.28.11;
  1931 + CURRENT_PROJECT_VERSION = 1.0.3.24.01.03.11;
1848 1932 DEVELOPMENT_TEAM = 94X49GG3ZW;
1849 1933 EXCLUDED_ARCHS = "";
1850 1934 GENERATE_INFOPLIST_FILE = YES;
... ...
metaCode/Classes/Common/Base/CNLiveBaseNavigationController.swift
  View file @48fb7a3
... ... @@ -27,11 +27,7 @@ class CNLiveBaseNavigationController : UINavigationController,UINavigationContro
27 27 // 什么时候调用：每次触发手势之前都会询问下代理，是否触发。
28 28 // 作用：拦截手势触发,手势识别器对象会调用这个代理方法来决定手势是否有效
29 29 override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
30   - super.gestureRecognizerShouldBegin(gestureRecognizer)
31   -// if (gestureRecognizer == self.navigationController?.interactivePopGestureRecognizer) && (self.navigationController?.visibleViewController == self.navigationController?.viewControllers.first) {
32   -// return false
33   -// }
34   -// return true
  30 +
35 31 return viewControllers.count > 1
36 32 }
37 33  
... ...
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
  View file @48fb7a3
... ... @@ -58,22 +58,23 @@ class CNLiveBaseTabBarViewController: UITabBarController
58 58 // MARK: - 控制器的信息
59 59 func setUpTabBar() {
60 60  
61   - let homeVC = CNMetaCodeHomePageController()
  61 + let homeVC = CNLiveAuthViewController()
  62 + let authVC = CNMetaCodeHomePageController()
62 63 let mineVC = CNLiveMineViewController()
63 64  
64 65 creatTabbarView(viewController: homeVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "首页")
65 66  
  67 + creatTabbarView(viewController: authVC, image: "tabbar_hoem_icon_default", selectImage: "tabbar_hoem_icon_selected", title: "认证")
  68 +
66 69 creatTabbarView(viewController: mineVC, image: "tabbar_mine_icon_default", selectImage: "tabbar_mine_icon_selected", title: "我的")
67 70  
68 71 self.tabBar.tintColor = UIColor("#0066FE")
69 72 self.tabBar.isTranslucent = false
70 73  
71 74 self.viewControllers = [
72   - CNLiveBaseNavigationController(rootViewController: homeVC),
  75 + CNLiveBaseNavigationController(rootViewController: homeVC),CNLiveBaseNavigationController(rootViewController: authVC),
73 76 CNLiveBaseNavigationController(rootViewController: mineVC),
74 77 ];
75   -
76   -
77 78 }
78 79  
79 80 // MARK: - Tabar 背景图
... ...
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift renamed to metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
  View file @48fb7a3
metaCode/Classes/Main/HomePage/Controller/CNSlideBaseNavigationController.swift renamed to metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNSlideBaseNavigationController.swift
  View file @48fb7a3
metaCode/Classes/Main/HomePage/Controller/CNUpSlideCardPresentationController.swift renamed to metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideCardPresentationController.swift
  View file @48fb7a3
... ... @@ -3,7 +3,7 @@
3 3 // metaCode
4 4 //
5 5 // Created by zx on 2023/10/16.
6   -//
  6 +// 下滑页原生页-push毛玻璃中间页
7 7  
8 8 import UIKit
9 9  
... ...
metaCode/Classes/Main/HomePage/Controller/CNUpSlideDetailViewController.swift renamed to metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
  View file @48fb7a3
... ... @@ -3,7 +3,7 @@
3 3 // metaCode
4 4 //
5 5 // Created by zx on 2023/10/16.
6   -//
  6 +// 下滑页原生页--大图点击详情页
7 7  
8 8 import Foundation
9 9  
... ...
metaCode/Classes/Main/HomePage/Controller/CNUpSlideViewController.swift renamed to metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
  View file @48fb7a3
... ... @@ -3,7 +3,7 @@
3 3 // metaCode
4 4 //
5 5 // Created by zx on 2023/10/13.
6   -//
  6 +// 下滑页原生页-首页
7 7  
8 8 import Foundation
9 9 import UIKit
... ...
metaCode/Classes/Main/HomePage/Controller/CNLiveDownShopDetailController.swift renamed to metaCode/Classes/Main/HomePage/Controller/ShopDownDetail/CNLiveDownShopDetailController.swift
  View file @48fb7a3
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift renamed to metaCode/Classes/Main/HomePage/Controller/ShopUpConsole/CNLiveShopConsoleController.swift
  View file @48fb7a3
metaCode/Classes/Main/HomePage/Controller/CNWebViewController.swift renamed to metaCode/Classes/Main/HomePage/Controller/WebController/CNWebViewController.swift
  View file @48fb7a3
metaCode/Classes/Main/HomePages/Controller/CNLiveAuthViewController.swift 0 → 100644
  View file @48fb7a3
  1 +//
  2 +// CNLiveAuthViewController.swift
  3 +// metaCode
  4 +//
  5 +// Created by zx on 2023/12/28.
  6 +//
  7 +
  8 +import Foundation
  9 +
  10 +class CNLiveAuthViewController:CNLiveBaseViewController{
  11 + override func viewDidLoad() {
  12 + super.viewDidLoad()
  13 + self.view.backgroundColor = .white
  14 + }
  15 +
  16 +
  17 +}
... ...