Merge branch 'master' into major

# Conflicts:
#	android/build.gradle
master
gaoyunfei 2023-06-02 19:49:46 +08:00
commit 71808670b6
2 changed files with 3 additions and 1 deletions

View File

@ -68,7 +68,7 @@ public class AppletModule extends BaseApi {
// Android 6.07.0contextmContext // Android 6.07.0contextmContext
// 使Application Context // 使Application Context
Context context = mContext.getApplicationContext(); Context context = mContext.getApplicationContext();
FinAppInfo.StartParams startParams = params == null ? null : new FinAppInfo.StartParams(params.get("path"), params.get("query"), params.get("scene")); FinAppInfo.StartParams startParams = params == null ? null : new FinAppInfo.StartParams(params);
Log.d(TAG, "openApplet:" + appId + "," + param + "," + sequence + "," + apiServer + ", isSingleProcess:" + isSingleProcess); Log.d(TAG, "openApplet:" + appId + "," + param + "," + sequence + "," + apiServer + ", isSingleProcess:" + isSingleProcess);
if (apiServer != null) { if (apiServer != null) {

View File

@ -1048,6 +1048,7 @@ class Mop {
final int? sequence, final int? sequence,
final String? apiServer, final String? apiServer,
final String? scene, final String? scene,
final String? shareDepth,
final bool isSingleProcess = false, final bool isSingleProcess = false,
}) async { }) async {
Map<String, Object> params = {'appId': appId}; Map<String, Object> params = {'appId': appId};
@ -1058,6 +1059,7 @@ class Mop {
if (sequence != null) params["sequence"] = sequence; if (sequence != null) params["sequence"] = sequence;
if (apiServer != null) params["apiServer"] = apiServer; if (apiServer != null) params["apiServer"] = apiServer;
if (scene != null) param["scene"] = scene; if (scene != null) param["scene"] = scene;
if (shareDepth != null) param["shareDepth"] = shareDepth;
params["isSingleProcess"] = isSingleProcess; params["isSingleProcess"] = isSingleProcess;
final Map ret = await _channel.invokeMethod('openApplet', params); final Map ret = await _channel.invokeMethod('openApplet', params);
return ret; return ret;