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

Merge remote-tracking branch 'origin/release' into feature-issues1801

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt
#	libraries/LGLibrary
This commit is contained in:
juntao
2022-07-22 14:19:53 +08:00
parent 7029c170a4 6823f27ff3
commit e8b00cc87f
65 changed files with 289 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -230,10 +230,10 @@ public class MainActivity extends BaseActivity {
mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class);
final String message = com.gh.gamecenter.common.constant.Config.getExceptionMsg();
if (!TextUtils.isEmpty(message)) {
com.gh.gamecenter.common.constant.Config.setExceptionMsg(null);
DataUtils.reportException(this, new Throwable(message));
final boolean containsErrorMsg = com.gh.gamecenter.common.constant.Config.isContainsErrorMsg();
if (containsErrorMsg) {
com.gh.gamecenter.common.constant.Config.updateContainsErrorMsg(false);
DataUtils.reportException(this, new Throwable(com.gh.gamecenter.common.constant.Config.getExceptionMsg()));
// 被改过的包闪退时增加跳转到光环游戏详情并自动下载的方法
if (com.gh.gamecenter.common.constant.Config.DEFAULT_CHANNEL_FOR_RELEASE.equals(HaloApp.getInstance().getChannel())) {
DialogHelper.showCenterWarningDialog(this, "发生闪退", "光环助手发生了闪退，建议安装到最新版本修复异常"