Merge branch 'master' of ssh://gitlab.finogeeks.club:2233/finclipsdk/finclip-flutter-sdk

master
jizelin 2021-03-04 21:27:23 +08:00
commit d9dd08d8c0
3 changed files with 24 additions and 8 deletions

View File

@ -133,7 +133,7 @@ public class AppletHandlerModule extends BaseApi {
@Override
public void success(Object result) {
List<Map<String, Object>> ret = (List<Map<String, Object>>) result;
FinAppTrace.d(TAG, "getRegisteredMoreMenuItems success : " + ret + " size : " + ret.size());
FinAppTrace.d(TAG, "getCustomMenus success : " + ret + " size : " + ret.size());
if (ret != null) {
for (Map<String, Object> map : ret) {
String type = (String) map.get("type");
@ -151,13 +151,13 @@ public class AppletHandlerModule extends BaseApi {
@Override
public void error(String errorCode, String errorMessage, Object errorDetails) {
FinAppTrace.e(TAG, "getRegisteredMoreMenuItems errorCode : " + errorCode + " errorMessage : " + errorMessage);
FinAppTrace.e(TAG, "getCustomMenus errorCode : " + errorCode + " errorMessage : " + errorMessage);
latch.countDown();
}
@Override
public void notImplemented() {
FinAppTrace.d(TAG, "getRegisteredMoreMenuItems notImplemented");
FinAppTrace.d(TAG, "getCustomMenus notImplemented");
latch.countDown();
}
});
@ -173,16 +173,32 @@ public class AppletHandlerModule extends BaseApi {
@Override
public void onRegisteredMoreMenuItemClicked(@NotNull String appId, @NotNull String path, @NotNull String menuItemId, @Nullable String appInfo, @Nullable Bitmap bitmap, @NotNull IAppletCallback iAppletCallback) {
Map<String, Object> params = new HashMap<>();
params.put("appId", appId);
params.put("path", path);
params.put("menuId", menuItemId);
params.put("appInfo", appInfo);
handler.post(() -> {
channel.invokeMethod("extensionApi:onCustomMenuClick", params);
channel.invokeMethod("extensionApi:onCustomMenuClick", params, new MethodChannel.Result() {
@Override
public void success(Object result) {
FinAppTrace.d(TAG, "onCustomMenuClick success");
iAppletCallback.onSuccess(null);
}
@Override
public void error(String errorCode, String errorMessage, Object errorDetails) {
FinAppTrace.e(TAG, "onCustomMenuClick errorCode : " + errorCode + " errorMessage : " + errorMessage);
iAppletCallback.onFailure();
}
@Override
public void notImplemented() {
FinAppTrace.d(TAG, "onCustomMenuClick notImplemented");
iAppletCallback.onFailure();
}
});
});
callback.onSuccess(null);
}
@Override

View File

@ -34,6 +34,6 @@ abstract class AppletHandler {
Future<List<CustomMenu>> getCustomMenus(String appId);
///
Future onCustomMenuClick(
Future<void> onCustomMenuClick(
String appId, String path, String menuId, String appInfo);
}

View File

@ -180,7 +180,7 @@ class Mop {
print("registerAppletHandler getCustomMenus list $list");
return list;
};
_extensionApis["onCustomMenuClick"] = (params) {
_extensionApis["onCustomMenuClick"] = (params) async {
return handler.onCustomMenuClick(
params["appId"], params["path"], params["menuId"], params["appInfo"]);
};