Merge remote-tracking branch 'origin/legacy-release' into release

# Conflicts:
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt
This commit is contained in:
chenjuntao
2022-10-09 17:20:32 +08:00
22 changed files with 98 additions and 510 deletions

View File

@ -333,7 +333,7 @@ public class MainActivity extends BaseActivity {
// 检查是否需要触发 XAPK 安装
AppExecutor.getUiExecutor().executeWithDelay(this::resumeXapkInstallIfNeeded, 150);
QuickLoginHelper.getPhoneInfo(this);
// QuickLoginHelper.getPhoneInfo(this);
WechatBindHelper.getWechatConfig(null);
initWBSDK();
}