Merge branch 'master' into major

master
zhongweiguang 2023-05-25 11:17:49 +08:00
commit 10e35ef35d
5 changed files with 10 additions and 3 deletions

View File

@ -131,7 +131,7 @@ class _MyAppState extends State<MyApp> {
_buildAppletItem(appletId, "打开小程序", () { _buildAppletItem(appletId, "打开小程序", () {
// Mop.instance.openApplet(appletId, // Mop.instance.openApplet(appletId,
// path: 'pages/index/index', query: ''); // path: 'pages/index/index', query: '');
RemoteAppletRequest request = RemoteAppletRequest(apiServer: 'https://api.finclip.com', appletId: appletId); RemoteAppletRequest request = RemoteAppletRequest(apiServer: 'https://api.finclip.com', appletId: appletId, transitionStyle: TranstionStyle.TranstionStyleUp);
Mop.instance.startApplet(request); Mop.instance.startApplet(request);
}), }),
_buildAppletItem(appletId, "finishRunningApplet", () { _buildAppletItem(appletId, "finishRunningApplet", () {

View File

@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NSString *offlineMiniprogramZipPath; @property (nonatomic, copy) NSString *offlineMiniprogramZipPath;
@property (nonatomic, copy) NSString *offlineFrameworkZipPath; @property (nonatomic, copy) NSString *offlineFrameworkZipPath;
@property (nonatomic, strong) NSString *animated; @property (nonatomic, strong) NSString *animated;
@property (nonatomic, strong) NSString *transitionStyle;
@end @end

View File

@ -25,6 +25,7 @@
request.offlineMiniprogramZipPath = self.offlineMiniprogramZipPath; request.offlineMiniprogramZipPath = self.offlineMiniprogramZipPath;
request.offlineFrameworkZipPath = self.offlineFrameworkZipPath; request.offlineFrameworkZipPath = self.offlineFrameworkZipPath;
request.animated = [self.animated boolValue]; request.animated = [self.animated boolValue];
request.transitionStyle = [self.transitionStyle intValue];
// //
[[FATClient sharedClient] startAppletWithRequest:request InParentViewController:currentVC completion:^(BOOL result, NSError *error) { [[FATClient sharedClient] startAppletWithRequest:request InParentViewController:currentVC completion:^(BOOL result, NSError *error) {

View File

@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk.
s.dependency 'Flutter' s.dependency 'Flutter'
s.ios.deployment_target = '9.0' s.ios.deployment_target = '9.0'
s.dependency 'FinApplet' , '2.40.7' s.dependency 'FinApplet' , '2.40.9'
s.dependency 'FinAppletExt' , '2.40.7' s.dependency 'FinAppletExt' , '2.40.9'
end end

View File

@ -799,6 +799,9 @@ class RemoteAppletRequest {
// iOStrue // iOStrue
bool animated; bool animated;
// iOS
TranstionStyle transitionStyle;
// androidfalse // androidfalse
bool isSingleProcess; bool isSingleProcess;
@ -810,6 +813,7 @@ class RemoteAppletRequest {
this.offlineMiniprogramZipPath, this.offlineMiniprogramZipPath,
this.offlineFrameworkZipPath, this.offlineFrameworkZipPath,
this.animated = true, this.animated = true,
this.transitionStyle = TranstionStyle.TranstionStyleUp,
this.isSingleProcess = false, this.isSingleProcess = false,
}); });
@ -820,6 +824,7 @@ class RemoteAppletRequest {
"appletId": appletId, "appletId": appletId,
"animated": animated, "animated": animated,
"isSingleProcess": isSingleProcess, "isSingleProcess": isSingleProcess,
"transitionStyle":transitionStyle.index,
}; };
if (startParams != null) result["startParams"] = startParams; if (startParams != null) result["startParams"] = startParams;
if (offlineMiniprogramZipPath != null) if (offlineMiniprogramZipPath != null)