diff --git a/FinDemo.xcodeproj/project.pbxproj b/FinDemo.xcodeproj/project.pbxproj index b1635bf..a0f6bb2 100644 --- a/FinDemo.xcodeproj/project.pbxproj +++ b/FinDemo.xcodeproj/project.pbxproj @@ -213,6 +213,7 @@ D6471BF82A2485AC0054EF34 /* Sources */, D6471BF92A2485AC0054EF34 /* Frameworks */, D6471BFA2A2485AC0054EF34 /* Resources */, + 2C2B78170F943E98E53F29C2 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -269,6 +270,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 2C2B78170F943E98E53F29C2 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FinDemo/Pods-FinDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FinDemo/Pods-FinDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FinDemo/Pods-FinDemo-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; F52F36A7EFE87448174DEB10 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/FinDemo/AppDelegate.m b/FinDemo/AppDelegate.m index e2b63f6..033f46e 100644 --- a/FinDemo/AppDelegate.m +++ b/FinDemo/AppDelegate.m @@ -8,14 +8,17 @@ #import "AppDelegate.h" #import - +/* + 初始化SDK配置。 + 注意:bundleid与sdkKey、sdkSecret强相关,所以如果只修改bundleid不改其他配置会导致初始化SDK失败 + */ static NSString *sdkKey1 = @"22LyZEib0gLTQdU3MUauATBwgfnTCJjdr7FCnywmAEM="; static NSString *sdkSecret1 = @"bdfd76cae24d4313"; static NSString *apiServer1 = @"https://api.finclip.com"; -//static NSString *sdkKey1 = @""; -//static NSString *sdkKey1 = @""; - +static NSString *sdkKey2 = @""; +static NSString *sdkSecret2 = @""; +static NSString *apiServer2 = @""; @interface AppDelegate () @@ -32,12 +35,22 @@ static NSString *apiServer1 = @"https://api.finclip.com"; [self.window makeKeyAndVisible]; NSMutableArray *storeArrayM = [NSMutableArray array]; - FATStoreConfig *storeConfig = [[FATStoreConfig alloc] init]; - storeConfig.sdkKey = sdkKey1; - storeConfig.sdkSecret = sdkSecret1; - storeConfig.apiServer = apiServer1; - storeConfig.cryptType = FATApiCryptTypeSM; - [storeArrayM addObject:storeConfig]; + FATStoreConfig *storeConfig1 = [[FATStoreConfig alloc] init]; + storeConfig1.sdkKey = sdkKey1; + storeConfig1.sdkSecret = sdkSecret1; + storeConfig1.apiServer = apiServer1; + storeConfig1.cryptType = FATApiCryptTypeSM; + [storeArrayM addObject:storeConfig1]; + + /* + 如果有多个服务器,也可以多注册一组配置,但是要注意多个配置都成功时,初始化SDK才会成功 + */ +// FATStoreConfig *storeConfig2 = [[FATStoreConfig alloc] init]; +// storeConfig2.sdkKey = sdkKey2; +// storeConfig2.sdkSecret = sdkSecret2; +// storeConfig2.apiServer = apiServer2; +// storeConfig2.cryptType = FATApiCryptTypeSM; +// [storeArrayM addObject:storeConfig2]; FATConfig *config = [FATConfig configWithStoreConfigs:storeArrayM]; /* diff --git a/FinDemo/ViewController.m b/FinDemo/ViewController.m index 7ad123b..e186e50 100644 --- a/FinDemo/ViewController.m +++ b/FinDemo/ViewController.m @@ -24,7 +24,7 @@ static NSString *cellID = @"cellid"; @{@"title" : @"日志管理", @"class" : @"FinManageViewController"}, @{@"title" : @"UI样式自定义", @"class" : @"FinCustomUIViewController"}, @{@"title" : @"api自定义", @"class" : @"FinCustomApiViewController"}, -// @{@"title" : @"", @"class" : @""}, + @{@"title" : @"代理方法", @"class" : @"FinDelegateViewController"}, ].mutableCopy; [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:cellID]; } diff --git a/FinDemo/功能演示/2.日志管理/FinManageViewController.m b/FinDemo/功能演示/2.日志管理/FinManageViewController.m index 720ecde..4357aed 100644 --- a/FinDemo/功能演示/2.日志管理/FinManageViewController.m +++ b/FinDemo/功能演示/2.日志管理/FinManageViewController.m @@ -8,7 +8,7 @@ #import "FinManageViewController.h" #import -@interface FinManageViewController () +@interface FinManageViewController () @end @@ -19,6 +19,7 @@ NSArray *patchs = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSString *documentsDirectory = [patchs objectAtIndex:0]; NSString *logDir = [documentsDirectory stringByAppendingPathComponent:@"ABC_FinClip_LogFiles"]; + NSLog(@"记录日志的路径是:%@", logDir); //开启不同level的日志可以看到不同的log [[FATClient sharedClient].logManager initLogWithLogDir:logDir logLevel:FATLogLevelDebug consoleLog:YES]; diff --git a/FinDemo/功能演示/3.UI样式自定义/FinCustomUIViewController.m b/FinDemo/功能演示/3.UI样式自定义/FinCustomUIViewController.m index 5787153..a75baf4 100644 --- a/FinDemo/功能演示/3.UI样式自定义/FinCustomUIViewController.m +++ b/FinDemo/功能演示/3.UI样式自定义/FinCustomUIViewController.m @@ -33,6 +33,10 @@ */ - (instancetype)init { if (self = [super init]) { + //在有缓存的情况下,loading页面可能会一闪而逝,所以这里先清除缓存方便观察 + [[FATClient sharedClient] clearMemoryCache]; + [[FATClient sharedClient] clearLocalApplets]; + //自定义loading页面的样式 [FATClient sharedClient].config.baseLoadingViewClass = @"LoadingView"; } diff --git a/FinDemo/功能演示/5.代理方法/FinDelegateViewController.m b/FinDemo/功能演示/5.代理方法/FinDelegateViewController.m index a827dc6..79444ad 100644 --- a/FinDemo/功能演示/5.代理方法/FinDelegateViewController.m +++ b/FinDemo/功能演示/5.代理方法/FinDelegateViewController.m @@ -113,4 +113,7 @@ NSLog(@"%@", NSStringFromSelector(_cmd)); } +- (void)dealloc { + [FATClient sharedClient].lifeCycleDelegate = nil; +} @end