From ea5627b3dac7797377052cd71e2fe6633a0acbf9 Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Wed, 2 Jun 2021 16:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=AD=A3=E5=BC=8F=E5=8C=85?=
 =?UTF-8?q?=E5=92=8C=E6=B5=8B=E8=AF=95=E5=8C=85=E7=9A=84=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=B8=A0=E9=81=93=EF=BC=8C=E9=81=BF=E5=85=8D=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=85=E5=9B=A0=E6=B8=A0=E9=81=93=E4=B8=A2=E5=A4=B1=E8=80=8C?=
 =?UTF-8?q?=E5=9B=9E=E8=90=BD=E5=88=B0=E6=B5=8B=E8=AF=95=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/constant/Config.java | 1 +
 app/src/main/java/com/halo/assistant/HaloApp.java    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 e594a8f1b1..addf7f8369 100644
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@@ -62,6 +62,7 @@ public class Config {
     public static final String PATCHES = "patches";
 
     public static final String DEFAULT_CHANNEL = "GH_TEST2";
+    public static final String DEFAULT_CHANNEL_FOR_RELEASE = "GH_206"; // 正式包的缺省渠道，避免因渠道丢失而回落到测试渠道
 
     private static String SETTINGS_KEY = "settingsKey";
 
diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java
index 1a24f593fb..f010c174f9 100644
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@@ -148,7 +148,11 @@ public class HaloApp extends MultiDexApplication {
 
             mChannel = ChannelReaderUtil.getChannel(this);
             if (mChannel == null || TextUtils.isEmpty(mChannel.trim())) {
-                mChannel = Config.DEFAULT_CHANNEL;
+                if (BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG) {
+                    mChannel = Config.DEFAULT_CHANNEL;
+                } else {
+                    mChannel = Config.DEFAULT_CHANNEL_FOR_RELEASE;
+                }
             }
             // 异步初始化 SP
             SPUtils.getString("");