diff --git a/HiBit.xcodeproj/project.pbxproj b/HiBit.xcodeproj/project.pbxproj index 8475633..a2c2651 100644 --- a/HiBit.xcodeproj/project.pbxproj +++ b/HiBit.xcodeproj/project.pbxproj @@ -108,6 +108,9 @@ 91C871212C12EF810093790D /* HBWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C871202C12EF810093790D /* HBWebViewController.m */; }; 91C871232C12F0020093790D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 91C871222C12F0020093790D /* Images.xcassets */; }; 91C8712D2C12FCE80093790D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 91C8712B2C12FCE80093790D /* LaunchScreen.storyboard */; }; + 91C871412C13111B0093790D /* HBHomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C871402C13111B0093790D /* HBHomeViewController.m */; }; + 91C871442C13112F0093790D /* HBDiscoverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C871432C13112F0093790D /* HBDiscoverViewController.m */; }; + 91C871472C1311450093790D /* HBMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91C871462C1311450093790D /* HBMineViewController.m */; }; C8AC2283D47E2B99FF559E75 /* libPods-HiBit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 141F02EF5C0783797594009A /* libPods-HiBit.a */; }; /* End PBXBuildFile section */ @@ -318,6 +321,12 @@ 91C871202C12EF810093790D /* HBWebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBWebViewController.m; sourceTree = ""; }; 91C871222C12F0020093790D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 91C8712C2C12FCE80093790D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 91C8713F2C13111B0093790D /* HBHomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBHomeViewController.h; sourceTree = ""; }; + 91C871402C13111B0093790D /* HBHomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBHomeViewController.m; sourceTree = ""; }; + 91C871422C13112F0093790D /* HBDiscoverViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBDiscoverViewController.h; sourceTree = ""; }; + 91C871432C13112F0093790D /* HBDiscoverViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBDiscoverViewController.m; sourceTree = ""; }; + 91C871452C1311450093790D /* HBMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBMineViewController.h; sourceTree = ""; }; + 91C871462C1311450093790D /* HBMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBMineViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -775,6 +784,10 @@ children = ( 916353852C12C20B00593047 /* Publics */, 9163533F2C12C01E00593047 /* Services */, + 91C871362C13108E0093790D /* Login */, + 91C871352C1310840093790D /* Mine */, + 91C871342C13107D0093790D /* Discover */, + 91C871332C1310750093790D /* Home */, ); path = Project; sourceTree = ""; @@ -928,6 +941,104 @@ path = NSNotificationCenter; sourceTree = ""; }; + 91C871332C1310750093790D /* Home */ = { + isa = PBXGroup; + children = ( + 91C8713B2C1310E10093790D /* Views */, + 91C871372C1310C40093790D /* Controllers */, + ); + path = Home; + sourceTree = ""; + }; + 91C871342C13107D0093790D /* Discover */ = { + isa = PBXGroup; + children = ( + 91C8713C2C1310E90093790D /* Views */, + 91C871382C1310D00093790D /* Controllers */, + ); + path = Discover; + sourceTree = ""; + }; + 91C871352C1310840093790D /* Mine */ = { + isa = PBXGroup; + children = ( + 91C8713D2C1310F00093790D /* Views */, + 91C871392C1310D50093790D /* Controllers */, + ); + path = Mine; + sourceTree = ""; + }; + 91C871362C13108E0093790D /* Login */ = { + isa = PBXGroup; + children = ( + 91C8713E2C1310F50093790D /* Views */, + 91C8713A2C1310DA0093790D /* Controllers */, + ); + path = Login; + sourceTree = ""; + }; + 91C871372C1310C40093790D /* Controllers */ = { + isa = PBXGroup; + children = ( + 91C8713F2C13111B0093790D /* HBHomeViewController.h */, + 91C871402C13111B0093790D /* HBHomeViewController.m */, + ); + path = Controllers; + sourceTree = ""; + }; + 91C871382C1310D00093790D /* Controllers */ = { + isa = PBXGroup; + children = ( + 91C871422C13112F0093790D /* HBDiscoverViewController.h */, + 91C871432C13112F0093790D /* HBDiscoverViewController.m */, + ); + path = Controllers; + sourceTree = ""; + }; + 91C871392C1310D50093790D /* Controllers */ = { + isa = PBXGroup; + children = ( + 91C871452C1311450093790D /* HBMineViewController.h */, + 91C871462C1311450093790D /* HBMineViewController.m */, + ); + path = Controllers; + sourceTree = ""; + }; + 91C8713A2C1310DA0093790D /* Controllers */ = { + isa = PBXGroup; + children = ( + ); + path = Controllers; + sourceTree = ""; + }; + 91C8713B2C1310E10093790D /* Views */ = { + isa = PBXGroup; + children = ( + ); + path = Views; + sourceTree = ""; + }; + 91C8713C2C1310E90093790D /* Views */ = { + isa = PBXGroup; + children = ( + ); + path = Views; + sourceTree = ""; + }; + 91C8713D2C1310F00093790D /* Views */ = { + isa = PBXGroup; + children = ( + ); + path = Views; + sourceTree = ""; + }; + 91C8713E2C1310F50093790D /* Views */ = { + isa = PBXGroup; + children = ( + ); + path = Views; + sourceTree = ""; + }; B36329ED094310C499FEBA2F /* Frameworks */ = { isa = PBXGroup; children = ( @@ -1080,6 +1191,7 @@ 916353292C12B6D400593047 /* DGActivityIndicatorLineScalePulseOutRapidAnimation.m in Sources */, 916353A22C12C3DC00593047 /* HtyoNetWorking.m in Sources */, 916353232C12B6D400593047 /* DGActivityIndicatorCookieTerminatorAnimation.m in Sources */, + 91C871412C13111B0093790D /* HBHomeViewController.m in Sources */, 9163530A2C12B6D400593047 /* NSLayoutConstraint+BSIBDesignable.m in Sources */, 9163534C2C12C15300593047 /* HBNetWorkingUtility.m in Sources */, 916353352C12B6D400593047 /* SVIndefiniteAnimatedView.m in Sources */, @@ -1156,6 +1268,7 @@ 916352F92C12B6D400593047 /* NSDictionary+Extension.m in Sources */, 916353952C12C20B00593047 /* HBRefreshAutoNormalFooter.m in Sources */, 916353942C12C20B00593047 /* HBCollectionViewCell.m in Sources */, + 91C871472C1311450093790D /* HBMineViewController.m in Sources */, 9163530B2C12B6D400593047 /* UIView+Extension.m in Sources */, 916352F62C12B6D400593047 /* FoundationContainer+Log.m in Sources */, 91C8711B2C12EA610093790D /* AppDelegate+Extesion.m in Sources */, @@ -1167,6 +1280,7 @@ 9163532F2C12B6D400593047 /* DGActivityIndicatorTriangleSkewSpinAnimation.m in Sources */, 916353012C12B6D400593047 /* UIColor+Category.m in Sources */, 9163532C2C12B6D400593047 /* DGActivityIndicatorRotatingSquaresAnimation.m in Sources */, + 91C871442C13112F0093790D /* HBDiscoverViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/HiBit/Project/Discover/Controllers/HBDiscoverViewController.h b/HiBit/Project/Discover/Controllers/HBDiscoverViewController.h new file mode 100644 index 0000000..f863284 --- /dev/null +++ b/HiBit/Project/Discover/Controllers/HBDiscoverViewController.h @@ -0,0 +1,16 @@ +// +// HBDiscoverViewController.h +// HiBit +// +// Created by HI_LOSER on 2024/6/7. +// + +#import "HBViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface HBDiscoverViewController : HBViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/HiBit/Project/Discover/Controllers/HBDiscoverViewController.m b/HiBit/Project/Discover/Controllers/HBDiscoverViewController.m new file mode 100644 index 0000000..b1c6f99 --- /dev/null +++ b/HiBit/Project/Discover/Controllers/HBDiscoverViewController.m @@ -0,0 +1,31 @@ +// +// HBDiscoverViewController.m +// HiBit +// +// Created by HI_LOSER on 2024/6/7. +// + +#import "HBDiscoverViewController.h" + +@interface HBDiscoverViewController () + +@end + +@implementation HBDiscoverViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/HiBit/Project/Home/Controllers/HBHomeViewController.h b/HiBit/Project/Home/Controllers/HBHomeViewController.h new file mode 100644 index 0000000..69576af --- /dev/null +++ b/HiBit/Project/Home/Controllers/HBHomeViewController.h @@ -0,0 +1,16 @@ +// +// HBHomeViewController.h +// HiBit +// +// Created by HI_LOSER on 2024/6/7. +// + +#import "HBViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface HBHomeViewController : HBViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/HiBit/Project/Home/Controllers/HBHomeViewController.m b/HiBit/Project/Home/Controllers/HBHomeViewController.m new file mode 100644 index 0000000..fedcf6b --- /dev/null +++ b/HiBit/Project/Home/Controllers/HBHomeViewController.m @@ -0,0 +1,31 @@ +// +// HBHomeViewController.m +// HiBit +// +// Created by HI_LOSER on 2024/6/7. +// + +#import "HBHomeViewController.h" + +@interface HBHomeViewController () + +@end + +@implementation HBHomeViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/HiBit/Project/Mine/Controllers/HBMineViewController.h b/HiBit/Project/Mine/Controllers/HBMineViewController.h new file mode 100644 index 0000000..c3ef671 --- /dev/null +++ b/HiBit/Project/Mine/Controllers/HBMineViewController.h @@ -0,0 +1,16 @@ +// +// HBMineViewController.h +// HiBit +// +// Created by HI_LOSER on 2024/6/7. +// + +#import "HBViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface HBMineViewController : HBViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/HiBit/Project/Mine/Controllers/HBMineViewController.m b/HiBit/Project/Mine/Controllers/HBMineViewController.m new file mode 100644 index 0000000..d2db3ac --- /dev/null +++ b/HiBit/Project/Mine/Controllers/HBMineViewController.m @@ -0,0 +1,31 @@ +// +// HBMineViewController.m +// HiBit +// +// Created by HI_LOSER on 2024/6/7. +// + +#import "HBMineViewController.h" + +@interface HBMineViewController () + +@end + +@implementation HBMineViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/HiBit/Project/Publics/Controllers/HBTabBarController.m b/HiBit/Project/Publics/Controllers/HBTabBarController.m index f292601..6ba83e1 100644 --- a/HiBit/Project/Publics/Controllers/HBTabBarController.m +++ b/HiBit/Project/Publics/Controllers/HBTabBarController.m @@ -7,12 +7,9 @@ #import "HBTabBarController.h" #import "HBNavigationController.h" -//#import "HBHomeViewController.h" -//#import "HBDiscoverController.h" -//#import "HBVideosController.h" -//#import "HBMineController.h" - -//#import "GKDYPlayerViewController.h" +#import "HBMineViewController.h" +#import "HBDiscoverViewController.h" +#import "HBHomeViewController.h" @interface HBTabBarController () @@ -20,6 +17,9 @@ @implementation HBTabBarController +///Users/loser/Documents/COMPANY/秦九科技/Project/HiBit/Pods/IGListKit/Source/IGListKit/Internal/IGListBatchUpdates.m Build input file cannot be found: '/Users/loser/Documents/COMPANY/秦九科技/Project/HiBit/Pods/IGListKit/Source/IGListKit/Internal/IGListBatchUpdates.m'. Did you forget to declare this file as an output of a script phase or custom build rule which produces it? + + - (void)viewDidLoad { [super viewDidLoad]; [self loadTabbar]; @@ -46,40 +46,29 @@ } - (void)loadSubControllers { -// HBHomeViewController * homeController = [[HBHomeViewController alloc]init]; -// -// [self addChildViewController:homeController -// title:[@"tabbar_home" language] -// image:[UIImage imageNamed:@"tabbar_home_normal" renderingMode:UIImageRenderingModeAlwaysOriginal] -// selectedImage:[UIImage imageNamed:@"tabbar_home_selected" renderingMode:UIImageRenderingModeAlwaysOriginal]]; -// -//// HBDiscoverController * discoverController = [[HBDiscoverController alloc]init]; -//// GKZFPlayerViewController * discoverController = [[GKZFPlayerViewController alloc]init]; -//// discoverController.details = NO; -// -// GKDYPlayerViewController * discoverController = [[GKDYPlayerViewController alloc]init]; -// -// [self addChildViewController:discoverController -// title:[@"tabbar_discover" language] -// image:[UIImage imageNamed:@"tabbar_discover_normal" renderingMode:UIImageRenderingModeAlwaysOriginal] -// selectedImage:[UIImage imageNamed:@"tabbar_discover_selected" renderingMode:UIImageRenderingModeAlwaysOriginal]]; -// -// HBVideosController * videosController = [[HBVideosController alloc]init]; -// -// [self addChildViewController:videosController -// title:[@"tabbar_videos" language] -// image:[UIImage imageNamed:@"tabbar_discover_normal" renderingMode:UIImageRenderingModeAlwaysOriginal] -// selectedImage:[UIImage imageNamed:@"tabbar_discover_selected" renderingMode:UIImageRenderingModeAlwaysOriginal]]; -// -// HBMineController * mineController = [[HBMineController alloc]init]; -// -// -// [self addChildViewController:mineController -// title:[@"tabbar_mine" language] -// image:[UIImage imageNamed:@"tabbar_mine_normal" renderingMode:UIImageRenderingModeAlwaysOriginal] -// selectedImage:[UIImage imageNamed:@"tabbar_mine_selected" renderingMode:UIImageRenderingModeAlwaysOriginal]]; -// -// + HBHomeViewController * homeController = [[HBHomeViewController alloc]init]; + + [self addChildViewController:homeController + title:[@"tabbar_home" language] + image:[UIImage imageNamed:@"tabbar_home_normal" renderingMode:UIImageRenderingModeAlwaysOriginal] + selectedImage:[UIImage imageNamed:@"tabbar_home_selected" renderingMode:UIImageRenderingModeAlwaysOriginal]]; + + HBDiscoverViewController * discoverController = [[HBDiscoverViewController alloc]init]; + + [self addChildViewController:discoverController + title:[@"tabbar_discover" language] + image:[UIImage imageNamed:@"tabbar_discover_normal" renderingMode:UIImageRenderingModeAlwaysOriginal] + selectedImage:[UIImage imageNamed:@"tabbar_discover_selected" renderingMode:UIImageRenderingModeAlwaysOriginal]]; + + + HBMineViewController * mineController = [[HBMineViewController alloc]init]; + + [self addChildViewController:mineController + title:[@"tabbar_mine" language] + image:[UIImage imageNamed:@"tabbar_mine_normal" renderingMode:UIImageRenderingModeAlwaysOriginal] + selectedImage:[UIImage imageNamed:@"tabbar_mine_selected" renderingMode:UIImageRenderingModeAlwaysOriginal]]; + + }