Skip to content

Commit 3cae805

Browse files
Elric-ppElric-pp
authored
Merge pull request #22 from Jimmy-Chung/feat/upgrade
Feat/upgrade
2 parents 75f6542 + 93b2bc6 commit 3cae805

15 files changed

+6157
-5654
lines changed

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ repositories {
9797
dependencies {
9898
//noinspection GradleDynamicVersion
9999
implementation 'com.facebook.react:react-native:+' // From node_modules
100-
implementation 'com.finogeeks.lib:finapplet:+'
100+
implementation 'com.finogeeks.lib:finapplet:2.37.11'
101101

102102
}
103103

‎android/src/main/java/com/finogeeks/mop/rnsdk/FINMopSDKModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ public void openApplet(ReadableMap map, Callback callback) {
249249
Log.d(TAG, "openApplet:" + appId + "," + param + "," + sequence + "," + apiServer);
250250

251251
if (apiServer != null) {
252-
FinAppClient.INSTANCE.getAppletApiManager().startApplet(reactContext, apiServer, appId, sequence, startParams);
252+
FinAppClient.INSTANCE.getAppletApiManager().startApplet(reactContext, apiServer, appId, sequence, startParams, null);
253253
} else {
254-
FinAppClient.INSTANCE.getAppletApiManager().startApplet(reactContext, appId, sequence, startParams);
254+
FinAppClient.INSTANCE.getAppletApiManager().startApplet(reactContext, appId, sequence, startParams, null);
255255
}
256256
callback.invoke(success(null));
257257
}

‎example/ios/Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PODS:
1010
- React-Core (= 0.67.4)
1111
- React-jsi (= 0.67.4)
1212
- ReactCommon/turbomodule/core (= 0.67.4)
13-
- FinApplet (2.35.17)
13+
- FinApplet (2.37.11)
1414
- Flipper (0.99.0):
1515
- Flipper-Folly (~> 2.6)
1616
- Flipper-RSocket (~> 1.4)
@@ -273,8 +273,8 @@ PODS:
273273
- React-jsinspector (0.67.4)
274274
- React-logger (0.67.4):
275275
- glog
276-
- react-native-mopsdk (1.0.2):
277-
- FinApplet (= 2.35.17)
276+
- react-native-mopsdk (1.0.3):
277+
- FinApplet (= 2.37.11)
278278
- React
279279
- React-perflogger (0.67.4)
280280
- React-RCTActionSheet (0.67.4):
@@ -387,7 +387,7 @@ DEPENDENCIES:
387387
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
388388
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
389389
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
390-
- react-native-mopsdk (from `../node_modules/react-native-mopsdk`)
390+
- react-native-mopsdk (from `../..`)
391391
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
392392
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
393393
- React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -456,7 +456,7 @@ EXTERNAL SOURCES:
456456
React-logger:
457457
:path: "../node_modules/react-native/ReactCommon/logger"
458458
react-native-mopsdk:
459-
:path: "../node_modules/react-native-mopsdk"
459+
:path: "../.."
460460
React-perflogger:
461461
:path: "../node_modules/react-native/ReactCommon/reactperflogger"
462462
React-RCTActionSheet:
@@ -490,7 +490,7 @@ SPEC CHECKSUMS:
490490
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
491491
FBLazyVector: f7b0632c6437e312acf6349288d9aa4cb6d59030
492492
FBReactNativeSpec: 0f4e1f4cfeace095694436e7c7fcc5bf4b03a0ff
493-
FinApplet: 19b2226c315ff8fcad782365fff4f269cfd2a5ff
493+
FinApplet: a79adb6841bd6090da812f5e5881d3d358aaf1b5
494494
Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733
495495
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
496496
Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
@@ -516,7 +516,7 @@ SPEC CHECKSUMS:
516516
React-jsiexecutor: cbdf37cebdc4f5d8b3d0bf5ccaa6147fd9de9f3d
517517
React-jsinspector: f4775ea9118cbe1f72b834f0f842baa7a99508d8
518518
React-logger: a1f028f6d8639a3f364ef80419e5e862e1115250
519-
react-native-mopsdk: 292ab22aca2105a93aabd6addbefa7312d97a0b5
519+
react-native-mopsdk: c31f8a61fbb33d204f472a73377523928251e8bd
520520
React-perflogger: 0afaf2f01a47fd0fc368a93bfbb5bd3b26db6e7f
521521
React-RCTActionSheet: 59f35c4029e0b532fc42114241a06e170b7431a2
522522
React-RCTAnimation: aae4f4bed122e78bdab72f7118d291d70a932ce2

‎example/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/yarn.lock

Lines changed: 6117 additions & 5627 deletions
Large diffs are not rendered by default.

‎index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class MopSDK {
5050
const handler = MopSDK._extensionApis[apiName]
5151
if (handler !== null) {
5252
const res = await handler(event.params)
53-
console.warn("CUSTOM AP 调用的结果", res)
53+
console.warn("CUSTOM API 调用的结果", res)
5454
MopSDK._finMopSDK.eventReminderCallback(apiName, res, event.callbackId)
5555
}
5656
} else if(event.apiName.startsWith(webExtensionApiPrefix)) {

‎ios/Api/MOP_addWebExtentionApi.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ @implementation MOP_addWebExtentionApi
1212

1313
- (void)setupApiWithSuccess:(void (^)(NSDictionary<NSString *,id> * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel {
1414
NSLog(@"MOP_addWebExtentionApi");
15-
[[FATClient sharedClient] fat_registerWebApi:self.name handle:^(id param, FATExtensionApiCallback callback) {
15+
[[FATClient sharedClient] fat_registerWebApi:self.name handler:^(FATAppletInfo *appletInfo, id param, FATExtensionApiCallback callback) {
1616
NSLog(@"invoke webExtentionApi:");
1717
NSLog(@"%@",self.name);
1818
NSLog(@"%@",param);

‎ios/Api/MOP_closeAllApplets.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ @implementation MOP_closeAllApplets
1212

1313
- (void)setupApiWithSuccess:(void (^)(NSDictionary<NSString *,id> * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel {
1414
NSLog(@"closeAllApplets");
15-
[[FATClient sharedClient] closeAllApplets];
16-
success(@{});
15+
[[FATClient sharedClient] closeAllAppletsWithCompletion:^{
16+
success(@{});
17+
}];
1718
}
1819

1920
@end

‎ios/Api/MOP_initialize.m

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,24 @@ - (void)setupApiWithSuccess:(void (^)(NSDictionary<NSString *,id> * _Nonnull))su
4343
}
4444
config = [FATConfig configWithStoreConfigs:storeArrayM];
4545
} else {
46-
config = [FATConfig configWithAppSecret:self.secret appKey:self.appkey];
47-
config.apiServer = [self.apiServer copy];
46+
FATStoreConfig *storeConfig = [[FATStoreConfig alloc] init];
47+
storeConfig.sdkKey = [self.appkey copy];
48+
storeConfig.sdkSecret = [self.secret copy];
49+
storeConfig.apiServer = [self.apiServer copy];
4850
if([self.cryptType isEqualToString: @"SM"])
4951
{
50-
config.cryptType = FATApiCryptTypeSM;
52+
storeConfig.cryptType = FATApiCryptTypeSM;
5153
}
5254
else
5355
{
54-
config.cryptType = FATApiCryptTypeMD5;
56+
storeConfig.cryptType = FATApiCryptTypeMD5;
5557
}
5658

5759
// encryptServerData
5860
NSLog(@"encryptServerData:%d",self.encryptServerData);
59-
config.encryptServerData = self.encryptServerData;
61+
storeConfig.encryptServerData = self.encryptServerData;
62+
63+
config = [FATConfig configWithStoreConfigs:@[storeConfig]];
6064
}
6165

6266
NSLog(@"disablePermission:%d",self.disablePermission);

‎ios/Api/MOP_openApplet.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
1212
@interface MOP_openApplet : MOPBaseApi
1313

1414
@property (nonatomic, copy) NSString *appId;
15+
@property (nonatomic, copy) NSString *apiServer;
1516
@property (nonatomic, copy) NSNumber *sequence;
1617
@property (nonatomic, copy) NSDictionary *params;
1718

0 commit comments

Comments
 (0)