From f7b17cabe2530ddffd51784ae0bb765010d6f54c Mon Sep 17 00:00:00 2001
From: zu <jnu.seven@gmail.com>
Date: Mon, 7 Jun 2021 17:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7flutter=5Fboost?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/flutter/XplanFlutterBoostDelegate.java       | 10 +++++++---
 .../yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java   |  2 +-
 xplan-flutter                                          |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java b/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java
index 5ae7938e0..b54d54fa4 100644
--- a/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java
+++ b/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java
@@ -15,12 +15,13 @@ import com.yizhuan.xchat_android_core.UriProvider;
 import com.yizhuan.xchat_android_core.user.UserModel;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import io.flutter.embedding.android.FlutterActivityLaunchConfigs;
 
 public class XplanFlutterBoostDelegate implements FlutterBoostDelegate {
     @Override
-    public void pushNativeRoute(String pageName, HashMap<String, String> arguments) {
+    public void pushNativeRoute(String pageName, Map<String, Object> arguments) {
         if (pageName == null) {
             return;
         }
@@ -52,7 +53,7 @@ public class XplanFlutterBoostDelegate implements FlutterBoostDelegate {
             return;
         }
         if (pageName.equals(RouterConstants.NATIVE_PAGE_WEBVIEW)) {
-            String url = arguments.get(RouterConstants.NATIVE_PAGE_ARG_WEBVIEW_URL);
+            String url = (String) arguments.get(RouterConstants.NATIVE_PAGE_ARG_WEBVIEW_URL);
             if (url == null || url.isEmpty()) {
                 return;
             }
@@ -70,7 +71,10 @@ public class XplanFlutterBoostDelegate implements FlutterBoostDelegate {
     }
 
     @Override
-    public void pushFlutterRoute(String pageName, String uniqueId, HashMap<String, String> arguments) {
+    public void pushFlutterRoute(String pageName, String uniqueId, Map<String, Object> arguments) {
+        if (arguments == null) {
+            arguments = new HashMap<>();
+        }
         Intent intent = new FlutterBoostActivity.CachedEngineIntentBuilder(FlutterBoostActivity.class, FlutterBoost.ENGINE_ID)
                 .backgroundMode(FlutterActivityLaunchConfigs.BackgroundMode.opaque)
                 .destroyEngineWithActivity(false)
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java
index be7caea77..0e08fb844 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java
@@ -50,7 +50,7 @@ public class MsgViewHolderMatch extends MsgViewHolderBase {
     @Override
     protected void onItemClick() {
         if (matchAttachment != null && matchAttachment.isNeedForwardToMatchDetail()) {
-            HashMap<String, String> args = new HashMap<>();
+            HashMap<String, Object> args = new HashMap<>();
             args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, matchAttachment.getMatchId());
             FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_MATCH_DETAIL, args);
         }
diff --git a/xplan-flutter b/xplan-flutter
index 4c6ffd0f7..3f195cf04 160000
--- a/xplan-flutter
+++ b/xplan-flutter
@@ -1 +1 @@
-Subproject commit 4c6ffd0f792aca652e435a5b11c3b6471c53988a
+Subproject commit 3f195cf046aa8ff9a74d2230189e40a9f27956c9