From c3c3e611ab79f3ab91a10295de466f9c3ca34522 Mon Sep 17 00:00:00 2001
From: "pansong291@sina.com" <pansong291@sina.com>
Date: Sun, 18 Aug 2019 20:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=89=E9=94=99=E8=AF=AF=E6=97=B6=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=BC=9A=E5=8D=A1=E6=AD=BB=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/pansong291/xposed/quickenergy/Config.java    | 2 +-
 app/src/main/java/pansong291/xposed/quickenergy/Log.java   | 7 ++++++-
 .../java/pansong291/xposed/quickenergy/XposedHook.java     | 1 -
 .../pansong291/xposed/quickenergy/ui/MainActivity.java     | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/pansong291/xposed/quickenergy/Config.java b/app/src/main/java/pansong291/xposed/quickenergy/Config.java
index 0f85f23..1d4a895 100644
--- a/app/src/main/java/pansong291/xposed/quickenergy/Config.java
+++ b/app/src/main/java/pansong291/xposed/quickenergy/Config.java
@@ -814,7 +814,7 @@ public static Config json2Config(String json)
   {
    Log.printStackTrace(TAG, e);
    if(json != null)
-    Log.showDialogOrToastAndRecordLog("配置文件格式有误，已重置配置文件", "");
+    Log.showToastIgnoreConfig("配置文件格式有误，已重置配置文件", "");
    config = defInit();
   }
   if(config.reInit)
diff --git a/app/src/main/java/pansong291/xposed/quickenergy/Log.java b/app/src/main/java/pansong291/xposed/quickenergy/Log.java
index a98e25d..270ab80 100644
--- a/app/src/main/java/pansong291/xposed/quickenergy/Log.java
+++ b/app/src/main/java/pansong291/xposed/quickenergy/Log.java
@@ -57,10 +57,15 @@ public static void showDialogAndRecordLog(String str, String str2)
   recordLog(str, str2);
  }
 
- public static void showToast(final String str, String str2)
+ public static void showToast(String str, String str2)
  {
   if(Config.showMode() != Config.ShowMode.TOAST)
    return;
+  showToastIgnoreConfig(str, str2);
+ }
+ 
+ public static void showToastIgnoreConfig(final String str, String str2)
+ {
   Log.i(TAG, str + str2);
   final Activity activity = RpcCall.h5Activity;
   if(activity != null)
diff --git a/app/src/main/java/pansong291/xposed/quickenergy/XposedHook.java b/app/src/main/java/pansong291/xposed/quickenergy/XposedHook.java
index 74ebe8a..1ed6da1 100644
--- a/app/src/main/java/pansong291/xposed/quickenergy/XposedHook.java
+++ b/app/src/main/java/pansong291/xposed/quickenergy/XposedHook.java
@@ -30,7 +30,6 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Th
      protected void beforeHookedMethod(MethodHookParam param) throws Throwable
      {
       param.args[0] = true;
-      RpcCall.h5Activity = (Activity)param.thisObject;
      }
     });
   }
diff --git a/app/src/main/java/pansong291/xposed/quickenergy/ui/MainActivity.java b/app/src/main/java/pansong291/xposed/quickenergy/ui/MainActivity.java
index 625b021..ff60116 100644
--- a/app/src/main/java/pansong291/xposed/quickenergy/ui/MainActivity.java
+++ b/app/src/main/java/pansong291/xposed/quickenergy/ui/MainActivity.java
@@ -13,6 +13,7 @@
 import android.widget.Toast;
 import pansong291.xposed.quickenergy.Config;
 import pansong291.xposed.quickenergy.R;
+import pansong291.xposed.quickenergy.RpcCall;
 
 public class MainActivity extends Activity
 { 
@@ -30,6 +31,7 @@ protected void onCreate(Bundle savedInstanceState)
   super.onCreate(savedInstanceState);
   setContentView(R.layout.activity_main);
   setModuleActive(false);
+  RpcCall.h5Activity = this;
 
   Config.shouldReloadConfig = true;