From d1e693defa8cf1a1dd3128de9407f5cf2d197f7b Mon Sep 17 00:00:00 2001
From: zu <jnu.seven@gmail.com>
Date: Wed, 17 Mar 2021 22:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0flutter=E5=9B=9E=E8=B0=83nati?=
 =?UTF-8?q?ve=E5=85=85=E5=80=BC=E9=A1=B5=E9=9D=A2;=20=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E5=95=86=E5=9F=8E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/proguard-rules.pro                                   | 1 +
 .../com/yizhuan/erban/application/XChatApplication.java  | 9 ++++++++-
 .../java/com/yizhuan/erban/home/fragment/MeFragment.java | 4 ++++
 .../java/com/yizhuan/erban/ui/pay/ChargeActivity.java    | 8 ++++++++
 app/src/main/res/layout/fragment_me.xml                  | 2 ++
 xplan-flutter                                            | 2 +-
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index bedee0d51..8b86d3fd7 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -384,4 +384,5 @@
 -keep class io.flutter.embedding.android.**  { *; }
 -keep class io.flutter.plugins.**  { *; }
 -keep class com.yuxiaor.flutter.g_faraday.** { *; }
+-keep class net.sqlcipher.** { *; }
 
diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
index 4175f4d2a..fb1296438 100644
--- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
+++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
@@ -65,6 +65,7 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.module_hall.HallDataManager;
 import com.yizhuan.erban.radish.wallet.RadishWalletManager;
 import com.yizhuan.erban.reciever.ConnectiveChangedReceiver;
+import com.yizhuan.erban.ui.pay.ChargeActivity;
 import com.yizhuan.erban.utils.PushMessageHandler;
 import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.yizhuan.xchat_android_core.Constants;
@@ -261,7 +262,13 @@ public class XChatApplication extends Application {
 
             @Override
             public void pushNativeRoute(String pageName, HashMap<String, String> arguments) {
-
+                if (pageName == null) {
+                    return;
+                }
+                if (pageName.equals("charge")) {
+                    FlutterBoost.instance().currentActivity()
+                            .startActivity(ChargeActivity.getIntent(FlutterBoost.instance().currentActivity()));
+                }
             }
 
             @Override
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
index 28ed417d3..9cafb1b41 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
 
+import com.idlefish.flutterboost.FlutterBoost;
 import com.yizhuan.erban.MainActivity;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.UIHelper;
@@ -379,6 +380,9 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
                             }
                         });
 
+                break;
+            case R.id.match_mall:
+                FlutterBoost.instance().open("mall", null);
                 break;
             default:
                 break;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
index 04219fc11..d90b98f0b 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
@@ -103,6 +103,14 @@ public class ChargeActivity extends BaseActivity {
     private final int BINDCODE_GOLD = 200;
     private CompositeDisposable compositeDisposable = new CompositeDisposable();
 
+    public static Intent getIntent(Context context) {
+        UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
+        if (context == null || userInfo == null) {
+            return null;
+        }
+        return new Intent(context, ChargeActivity.class);
+    }
+
     public static void start(Context context) {
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
         if (context == null || userInfo == null) return;
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index a8836ff1f..1715132c5 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -371,6 +371,7 @@
                         app:layout_rowWeight="1" />
 
                     <TextView
+                        android:id="@+id/match_mall"
                         android:layout_width="0dp"
                         android:layout_marginTop="15dp"
                         android:drawableTop="@mipmap/icon_decoration"
@@ -378,6 +379,7 @@
                         android:text="商城"
                         android:textColor="@color/color_c6c6e9"
                         android:textSize="13sp"
+                        android:onClick="@{click}"
                         app:layout_columnWeight="1"
                         app:layout_rowWeight="1" />
 
diff --git a/xplan-flutter b/xplan-flutter
index a9508182c..b8fab44a7 160000
--- a/xplan-flutter
+++ b/xplan-flutter
@@ -1 +1 @@
-Subproject commit a9508182ce1041a20614b54eaf96c9b9ddffd8b3
+Subproject commit b8fab44a7d73543cd48babffbce6b9a30447beb3