Skip to content

Commit 19d634b

Browse files
authored
Merge pull request #1614 from AAChartModel/dev
Dev
2 parents c8f1fbc + 2c92141 commit 19d634b

10 files changed

Lines changed: 680 additions & 330 deletions

File tree

AAChartKitDemo.xcodeproj/project.pbxproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@
117117
84526E202CEED3F100EB2563 /* JSFunctionBeforeAndAfterRenderingComposer6.m in Sources */ = {isa = PBXBuildFile; fileRef = 84526E1F2CEED3F100EB2563 /* JSFunctionBeforeAndAfterRenderingComposer6.m */; };
118118
84526E232CEF256C00EB2563 /* TripleChartsLinkedWorkVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 84526E212CEF256C00EB2563 /* TripleChartsLinkedWorkVC.m */; };
119119
845589C928C3B27C009D1BC3 /* AAScatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 845589C828C3B27C009D1BC3 /* AAScatter.m */; };
120+
84565CCB2F6920CB00E47891 /* AAOptionsListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 84565CCA2F6920CB00E47891 /* AAOptionsListVC.m */; };
121+
84565CCE2F69249200E47891 /* AAOptionsWithJSListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 84565CCD2F69249200E47891 /* AAOptionsWithJSListVC.m */; };
122+
84565CD12F692AC500E47891 /* OfficialSamplesListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 84565CD02F692AC500E47891 /* OfficialSamplesListVC.m */; };
120123
845F42912E8BE1BA00CE65AB /* AAJsonConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 845F42902E8BE1BA00CE65AB /* AAJsonConverter.m */; };
121124
845FC2392EA0CF67002FC670 /* JSFunctionBeforeAndAfterRenderingComposer7.m in Sources */ = {isa = PBXBuildFile; fileRef = 845FC2382EA0CF67002FC670 /* JSFunctionBeforeAndAfterRenderingComposer7.m */; };
122125
846141F72C86FC0F0032FBD3 /* JSFunctionForAAChartEventsVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 846141F62C86FC0F0032FBD3 /* JSFunctionForAAChartEventsVC.m */; };
@@ -423,6 +426,12 @@
423426
84526E222CEF256C00EB2563 /* TripleChartsLinkedWorkVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TripleChartsLinkedWorkVC.h; sourceTree = "<group>"; };
424427
845589C728C3B27C009D1BC3 /* AAScatter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AAScatter.h; sourceTree = "<group>"; };
425428
845589C828C3B27C009D1BC3 /* AAScatter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AAScatter.m; sourceTree = "<group>"; };
429+
84565CC92F6920CB00E47891 /* AAOptionsListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AAOptionsListVC.h; sourceTree = "<group>"; };
430+
84565CCA2F6920CB00E47891 /* AAOptionsListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AAOptionsListVC.m; sourceTree = "<group>"; };
431+
84565CCC2F69249200E47891 /* AAOptionsWithJSListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AAOptionsWithJSListVC.h; sourceTree = "<group>"; };
432+
84565CCD2F69249200E47891 /* AAOptionsWithJSListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AAOptionsWithJSListVC.m; sourceTree = "<group>"; };
433+
84565CCF2F692AC500E47891 /* OfficialSamplesListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OfficialSamplesListVC.h; sourceTree = "<group>"; };
434+
84565CD02F692AC500E47891 /* OfficialSamplesListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OfficialSamplesListVC.m; sourceTree = "<group>"; };
426435
845F428F2E8BE1BA00CE65AB /* AAJsonConverter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AAJsonConverter.h; sourceTree = "<group>"; };
427436
845F42902E8BE1BA00CE65AB /* AAJsonConverter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AAJsonConverter.m; sourceTree = "<group>"; };
428437
845FC2372EA0CF67002FC670 /* JSFunctionBeforeAndAfterRenderingComposer7.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSFunctionBeforeAndAfterRenderingComposer7.h; sourceTree = "<group>"; };
@@ -900,6 +909,12 @@
900909
713F54381E7B71C000D506C7 /* MainVC.m */,
901910
8461422E2C8AF5320032FBD3 /* AAChartModelListVC.h */,
902911
8461422F2C8AF5320032FBD3 /* AAChartModelListVC.m */,
912+
84565CC92F6920CB00E47891 /* AAOptionsListVC.h */,
913+
84565CCA2F6920CB00E47891 /* AAOptionsListVC.m */,
914+
84565CCC2F69249200E47891 /* AAOptionsWithJSListVC.h */,
915+
84565CCD2F69249200E47891 /* AAOptionsWithJSListVC.m */,
916+
84565CCF2F692AC500E47891 /* OfficialSamplesListVC.h */,
917+
84565CD02F692AC500E47891 /* OfficialSamplesListVC.m */,
903918
846142072C88330C0032FBD3 /* AAOptionsWithJSForChartEventsListVC.h */,
904919
846142082C88330C0032FBD3 /* AAOptionsWithJSForChartEventsListVC.m */,
905920
85A0C0322F5A300100AA0001 /* AAOptionsComposerChartListVC.h */,
@@ -1448,6 +1463,7 @@
14481463
846142242C8AEB340032FBD3 /* CustomStyleForScatterChartComposer.m in Sources */,
14491464
846141FA2C8700720032FBD3 /* JSFunctionForAAChartEventsVC2.m in Sources */,
14501465
84790F422CBFA63E0047C133 /* CustomTooltipClickEventCallbackVC.m in Sources */,
1466+
84565CD12F692AC500E47891 /* OfficialSamplesListVC.m in Sources */,
14511467
846142062C8831FA0032FBD3 /* AABaseListVC.m in Sources */,
14521468
84526E142CEDBDCB00EB2563 /* JSFunctionBeforeAndAfterRenderingComposer3.m in Sources */,
14531469
84E0D36628F2D690004031BE /* JSFunctionForAAOptionsVC.m in Sources */,
@@ -1486,6 +1502,7 @@
14861502
841F49A02F39F04B007B01F0 /* MultiYAxesChartOptionsVC.m in Sources */,
14871503
841F49A12F39F04B007B01F0 /* PieChartOptionsVC.m in Sources */,
14881504
841F49A22F39F04B007B01F0 /* DrawChartWithAAOptionsVC.m in Sources */,
1505+
84565CCE2F69249200E47891 /* AAOptionsWithJSListVC.m in Sources */,
14891506
841F49A32F39F04B007B01F0 /* PlotLinesBandsZonesOptionsVC.m in Sources */,
14901507
841F49A42F39F04B007B01F0 /* XAxisYAxisLabelsOptionsVC.m in Sources */,
14911508
841F49A52F39F04B007B01F0 /* XAxisYAxisTypeOptionsVC.m in Sources */,
@@ -1522,6 +1539,7 @@
15221539
1E66D208210AF4ED007EAB8C /* AAPlotLinesElement.m in Sources */,
15231540
64AF87601F0A981400A801C4 /* OnlyRefreshChartDataVC.m in Sources */,
15241541
7172A3DB1E763EA6000D5B99 /* AppDelegate.m in Sources */,
1542+
84565CCB2F6920CB00E47891 /* AAOptionsListVC.m in Sources */,
15251543
8492D9B52C81A321007EB8D0 /* AAChartViewManager.m in Sources */,
15261544
440B098024C189950056CE08 /* AACredits.m in Sources */,
15271545
27E38C651F0E47BA00FB52E1 /* ChartAnimationTypeVC.m in Sources */,

AAChartKitDemo/AppDelegate.m

Lines changed: 56 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@
5353

5454
#import "AppDelegate.h"
5555
//#import "AAChartModelListVC.h"
56-
//#import "AAOptionsListVC.h"
57-
//#import "AAOptionsWithJSListVC.h"
58-
//#import "OfficialSamplesListVC.h"
56+
#import "AAOptionsListVC.h"
57+
#import "AAOptionsWithJSListVC.h"
58+
#import "OfficialSamplesListVC.h"
5959
//#import "AdvancedFeaturesListVC.h"
6060
#import "MainVC.h"
61-
#import "AAOptionsWithJSForChartEventsListVC.h"
6261
#import "AAChartModelListVC.h"
6362

6463
static const CGFloat kAASidebarOuterPadding = 12.0;
@@ -611,11 +610,17 @@ - (UITabBarController *)createTabBarController {
611610
UINavigationController *firstVC = [self createFirstNavigationController];
612611
[viewControllers addObject:firstVC];
613612

613+
UINavigationController *secondVC = [self createSecondNavigationController];
614+
[viewControllers addObject:secondVC];
615+
614616
UINavigationController *thirdVC = [self createThirdNavigationController];
615617
[viewControllers addObject:thirdVC];
616618

617-
UINavigationController *secondVC = [self createSecondNavigationController];
618-
[viewControllers addObject:secondVC];
619+
UINavigationController *fourthVC = [self createFourthNavigationController];
620+
[viewControllers addObject:fourthVC];
621+
622+
UINavigationController *fifthVC = [self createFifthNavigationController];
623+
[viewControllers addObject:fifthVC];
619624

620625
// UINavigationController *fourthVC = [self createFourthNavigationController];
621626
// [viewControllers addObject:fourthVC];
@@ -636,6 +641,8 @@ - (UIViewController *)createSidebarContainerController {
636641
[navigationControllers addObject:[self createFirstNavigationController]];
637642
[navigationControllers addObject:[self createSecondNavigationController]];
638643
[navigationControllers addObject:[self createThirdNavigationController]];
644+
[navigationControllers addObject:[self createFourthNavigationController]];
645+
[navigationControllers addObject:[self createFifthNavigationController]];
639646

640647
AASidebarListController *sidebarController = [[AASidebarListController alloc] initWithViewControllers:navigationControllers];
641648
AASidebarContainerController *containerController = [[AASidebarContainerController alloc] initWithSidebarController:sidebarController];
@@ -657,8 +664,11 @@ - (UIViewController *)createFirstViewController {
657664

658665
- (UIViewController *)createSecondViewController {
659666
// 创建第二个视图控制器
660-
AAOptionsWithJSForChartEventsListVC *secondVC = [[AAOptionsWithJSForChartEventsListVC alloc] init];
661-
secondVC.tabBarItem = [[UITabBarItem alloc] initWithTabBarSystemItem:UITabBarSystemItemHistory tag:1];
667+
AAOptionsListVC *secondVC = [[AAOptionsListVC alloc] init];
668+
secondVC.title = @"AAOptions";
669+
secondVC.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"AAOptions"
670+
image:[UIImage systemImageNamed:@"chart.bar.doc.horizontal"]
671+
selectedImage:[UIImage systemImageNamed:@"chart.bar.doc.horizontal"]];
662672

663673
// 在这里添加第二个视图控制器的其他配置
664674

@@ -668,14 +678,36 @@ - (UIViewController *)createSecondViewController {
668678

669679
- (UIViewController *)createThirdViewController {
670680
// 创建第三个视图控制器
671-
MainVC *thirdVC = [[MainVC alloc] init];
672-
thirdVC.tabBarItem = [[UITabBarItem alloc] initWithTabBarSystemItem:UITabBarSystemItemFavorites tag:2];
681+
AAOptionsWithJSListVC *thirdVC = [[AAOptionsWithJSListVC alloc] init];
682+
thirdVC.title = @"AAOptionsWithJS";
683+
thirdVC.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"AAOptionsWithJS"
684+
image:[UIImage systemImageNamed:@"function"]
685+
selectedImage:[UIImage systemImageNamed:@"function"]];
673686

674687
// 在这里添加第三个视图控制器的其他配置
675688

676689
return thirdVC;
677690
}
678691

692+
- (UIViewController *)createFourthViewController {
693+
// 创建第四个视图控制器
694+
OfficialSamplesListVC *fourthVC = [[OfficialSamplesListVC alloc] init];
695+
fourthVC.title = @"Offical Samples";
696+
fourthVC.tabBarItem = [[UITabBarItem alloc] initWithTitle:@"OfficialSamples"
697+
image:[UIImage systemImageNamed:@"doc.text.image"]
698+
selectedImage:[UIImage systemImageNamed:@"doc.text.image"]];
699+
700+
return fourthVC;
701+
}
702+
703+
- (UIViewController *)createFifthViewController {
704+
// 创建第五个视图控制器
705+
MainVC *fifthVC = [[MainVC alloc] init];
706+
fifthVC.tabBarItem = [[UITabBarItem alloc] initWithTabBarSystemItem:UITabBarSystemItemFavorites tag:4];
707+
708+
return fifthVC;
709+
}
710+
679711
/*
680712
- (UIViewController *)createFourthViewController {
681713
// 创建第四个视图控制器
@@ -723,6 +755,20 @@ - (UINavigationController *)createThirdNavigationController {
723755
return navigationController;
724756
}
725757

758+
- (UINavigationController *)createFourthNavigationController {
759+
UIViewController *fourthViewController = [self createFourthViewController];
760+
UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:fourthViewController];
761+
navigationController.tabBarItem = fourthViewController.tabBarItem;
762+
return navigationController;
763+
}
764+
765+
- (UINavigationController *)createFifthNavigationController {
766+
UIViewController *fifthViewController = [self createFifthViewController];
767+
UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:fifthViewController];
768+
navigationController.tabBarItem = fifthViewController.tabBarItem;
769+
return navigationController;
770+
}
771+
726772
/*
727773
// 创建导航控制器,并将第四个视图控制器设置为根视图控制器
728774
- (UINavigationController *)createFourthNavigationController {
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// AAOptionsListVC.h
3+
// AAChartKitDemo
4+
//
5+
// Created by AnAn on 2026/3/17.
6+
// Copyright © 2026 An An. All rights reserved.
7+
//
8+
9+
#import "AABaseListVC.h"
10+
11+
NS_ASSUME_NONNULL_BEGIN
12+
13+
@interface AAOptionsListVC : AABaseListVC
14+
15+
@end
16+
17+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)