From 0c918bd826c10ab3bc2efaf809796d4aa48e5b3d Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Mon, 15 Jul 2019 16:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=B8=A0=E9=81=93(GH=5FTEST)?=
 =?UTF-8?q?=E5=BC=80=E5=90=AFJS=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/common/constant/Config.java   |  2 ++
 .../main/java/com/gh/common/util/DataUtils.java    |  4 ++--
 .../main/java/com/gh/common/view/RichEditor.java   | 14 +++++---------
 app/src/main/java/com/halo/assistant/HaloApp.java  |  3 ++-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java
index eb4939ad6b..a75466b414 100644
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@@ -43,6 +43,8 @@ public class Config {
     public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
     public static final String PATCHES = "patches";
 
+    public static final String DEFAULT_CHANNEL = "GH_TEST";
+
     private static String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java
index c85866e09b..3d6adbfe50 100644
--- a/app/src/main/java/com/gh/common/util/DataUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataUtils.java
@@ -75,7 +75,7 @@ public class DataUtils {
 
             // 设置数据上报策略
             // 测试渠道的时候即时上传，方便查看日志
-            if ("GH_TEST".equals(HaloApp.getInstance().getChannel())) {
+            if (Config.DEFAULT_CHANNEL.equals(HaloApp.getInstance().getChannel())) {
                 StatConfig.setStatSendStrategy(StatReportStrategy.INSTANT);
             } else {
                 StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD);
@@ -99,7 +99,7 @@ public class DataUtils {
 
         // init bugly
         try {
-            CrashReport.setIsDevelopmentDevice(context, "GH_TEST".equals(channel));
+            CrashReport.setIsDevelopmentDevice(context, Config.DEFAULT_CHANNEL.equals(channel));
 
             CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);
             strategy.setEnableANRCrashMonitor(false);
diff --git a/app/src/main/java/com/gh/common/view/RichEditor.java b/app/src/main/java/com/gh/common/view/RichEditor.java
index 030dec2a1c..c7d7841bbd 100644
--- a/app/src/main/java/com/gh/common/view/RichEditor.java
+++ b/app/src/main/java/com/gh/common/view/RichEditor.java
@@ -14,6 +14,7 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import com.gh.common.constant.Config;
 import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.GsonUtils;
 import com.gh.common.util.HtmlUtils;
@@ -22,6 +23,7 @@ import com.gh.common.util.NetworkUtils;
 import com.gh.common.util.RichEditorUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.qa.entity.EditorInsertEntity;
+import com.halo.assistant.HaloApp;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -129,7 +131,8 @@ public class RichEditor extends WebView {
         setWebChromeClient(new WebChromeClient()); // 不要重写这个方法否则无法加载
         setWebViewClient(createWebViewClient());
 
-        if (isNativeBuildDebug() && Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
+        if (Config.DEFAULT_CHANNEL.equals(HaloApp.getInstance().getChannel())
+                && Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
             setWebContentsDebuggingEnabled(true);
         }
 
@@ -553,19 +556,12 @@ public class RichEditor extends WebView {
         boolean shouldOverrideUrlLoading(WebView view, String url);
     }
 
-    public static boolean isNativeBuildDebug() {
-        if (BuildConfig.DEBUG || "internal".equals(BuildConfig.FLAVOR)) {
-            return true;
-        }
-        return false;
-    }
-
     class NativeCallBack {
 
         @SuppressLint("JavascriptInterface")
         @JavascriptInterface
         boolean isNativeBuildDebug() {
-            return RichEditor.isNativeBuildDebug();
+            return "internal".equals(BuildConfig.FLAVOR);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java
index 8626f81be4..6105c008ec 100644
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@@ -16,6 +16,7 @@ import com.facebook.drawee.backends.pipeline.Fresco;
 import com.gh.base.GHActivityLifecycleCallbacksImpl;
 import com.gh.common.LocalBroadcastReceiver;
 import com.gh.common.PushManager;
+import com.gh.common.constant.Config;
 import com.gh.common.exposure.ExposureManager;
 import com.gh.common.im.ImReceiver;
 import com.gh.common.util.DataUtils;
@@ -113,7 +114,7 @@ public class HaloApp extends TinkerAppLike {
 
         mChannel = ChannelReaderUtil.getChannel(getApplication());
         if (mChannel == null || TextUtils.isEmpty(mChannel.trim())) {
-            mChannel = "GH_TEST";
+            mChannel = Config.DEFAULT_CHANNEL;
         }
 
         try {