phiz-bak
/
mop-flutter-sdk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复更多菜单未读取image问题；

master
yangbinqiao 2022-12-30 16:53:50 +08:00
parent 9f2253c930
commit b80913cc28
3 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java
View File

@ -153,6 +153,7 @@ public class AppletHandlerModule extends BaseApi {
@Nullable @Nullable
@Override @Override
@SuppressWarnings("unchecked")
public List<MoreMenuItem> getRegisteredMoreMenuItems(@NotNull String s) { public List<MoreMenuItem> getRegisteredMoreMenuItems(@NotNull String s) {
CountDownLatch latch = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1);
List<MoreMenuItem> moreMenuItems = new ArrayList<>(); List<MoreMenuItem> moreMenuItems = new ArrayList<>();
@ -162,9 +163,8 @@ public class AppletHandlerModule extends BaseApi {
channel.invokeMethod("extensionApi:getCustomMenus", params, new MethodChannel.Result() { channel.invokeMethod("extensionApi:getCustomMenus", params, new MethodChannel.Result() {
@Override @Override
public void success(Object result) { public void success(Object result) {
List<Map<String, Object>> ret = (List<Map<String, Object>>) result; if (result instanceof List) {
FinAppTrace.d(TAG, "getCustomMenus success : " + ret + " size : " + ret.size()); List<Map<String, Object>> ret = (List<Map<String, Object>>) result;
if (ret != null) {
for (Map<String, Object> map : ret) { for (Map<String, Object> map : ret) {
String type = (String) map.get("type"); String type = (String) map.get("type");
MoreMenuType moreMenuType; MoreMenuType moreMenuType;
@ -173,7 +173,28 @@ public class AppletHandlerModule extends BaseApi {
} else { } else {
moreMenuType = MoreMenuType.ON_MINI_PROGRAM; moreMenuType = MoreMenuType.ON_MINI_PROGRAM;
} }
moreMenuItems.add(new MoreMenuItem((String) map.get("menuId"), (String) map.get("title"), moreMenuType)); String menuId = (String) map.get("menuId");
if (menuId == null) {
menuId = "";
}
String title = (String) map.get("title");
if (title == null) {
title = "";
}
String image = (String) map.get("image");
if (image == null) {
image = "";
}
moreMenuItems.add(
new MoreMenuItem(
menuId,
title,
image,
-1,
moreMenuType,
true
)
);
} }
} }
latch.countDown(); latch.countDown();

30
example/pubspec.lock
View File

@ -42,7 +42,7 @@ packages:
name: collection name: collection
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.16.0" version: "1.15.0"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
@ -56,7 +56,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0" version: "1.2.0"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -95,13 +95,6 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.12.11" version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -115,14 +108,14 @@ packages:
path: ".." path: ".."
relative: true relative: true
source: path source: path
version: "2.37.3" version: "2.39.1"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.1" version: "1.8.0"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -134,7 +127,7 @@ packages:
name: source_span name: source_span
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.2" version: "1.8.1"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@ -169,14 +162,21 @@ packages:
name: test_api name: test_api
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.4.9" version: "0.4.3"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.2" version: "2.1.1"
sdks: sdks:
dart: ">=2.17.0-0 <3.0.0" dart: ">=2.14.0 <3.0.0"
flutter: ">=2.2.3" flutter: ">=2.2.3"

28
pubspec.lock
View File

@ -42,14 +42,14 @@ packages:
name: collection name: collection
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.16.0" version: "1.15.0"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0" version: "1.2.0"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -88,13 +88,6 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.12.11" version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.1.4"
meta: meta:
dependency: transitive dependency: transitive
description: description:
@ -108,7 +101,7 @@ packages:
name: path name: path
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.1" version: "1.8.0"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -120,7 +113,7 @@ packages:
name: source_span name: source_span
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.2" version: "1.8.1"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@ -155,14 +148,21 @@ packages:
name: test_api name: test_api
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.4.9" version: "0.4.3"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.2" version: "2.1.1"
sdks: sdks:
dart: ">=2.17.0-0 <3.0.0" dart: ">=2.14.0 <3.0.0"
flutter: ">=2.2.3" flutter: ">=2.2.3"