Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev-5.4.0

Browse Source 
# Conflicts:
#	app/src/main/res/layout/rank_collection_item.xml
This commit is contained in:
juntao
2021-10-25 09:47:18 +08:00
parent 2f5f52471e 1f43b8b220
commit d73a4704c8
37 changed files with 90 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/common/constant/Config.java
View File

@ -64,7 +64,7 @@ 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_TEST2";
public static final String DEFAULT_CHANNEL = "GH_TEST3";
public static final String DEFAULT_CHANNEL_FOR_RELEASE = "GH_LOST"; // 正式包的缺省渠道，避免因渠道丢失而回落到测试渠道
private static String SETTINGS_KEY = "settingsKey";