This commit is contained in:
leafwai
2021-09-17 16:28:24 +08:00
parent c7db544684
commit 4aacc425a9
69 changed files with 592 additions and 475 deletions

View File

@ -43,6 +43,7 @@ import com.gh.common.util.ClassUtils;
import com.gh.common.util.DataUtils;
import com.gh.common.util.DeviceTokenUtils;
import com.gh.common.util.DeviceUtils;
import com.gh.common.util.DialogHelper;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.DirectUtils;
import com.gh.common.util.DisplayUtils;
@ -234,17 +235,21 @@ public class MainActivity extends BaseActivity {
if (!TextUtils.isEmpty(message)) {
Config.setExceptionMsg(null);
AppUncaughtHandler.reportException(this, new Throwable(message));
DialogUtils.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退,马上反馈以帮助我们更好地修复问题?(只需简单描述你刚才的操作)"
DialogHelper.showWarningDialog(this, "发生闪退", "光环助手刚刚发生了闪退,马上反馈以帮助我们更好地修复问题?(只需简单描述你刚才的操作)"
, "暂不", "马上反馈",
() -> {
startActivityForResult(SuggestionActivity.getIntent(MainActivity.this, SuggestType.crash, "APP闪退"), 100);
MtaHelper.onEventWithBasicDeviceInfo(
"闪退弹窗",
"玩家操作", "点击反馈");
return null;
},
() -> MtaHelper.onEventWithBasicDeviceInfo(
"闪退弹窗",
"玩家操作", "点击关闭"));
() -> {
MtaHelper.onEventWithBasicDeviceInfo(
"闪退弹窗",
"玩家操作", "点击关闭");
return null;
});
}
// checkTinkerPath(); // 看情况是否需要显示补丁弹窗
@ -396,13 +401,14 @@ public class MainActivity extends BaseActivity {
private void showKefuReportDialog() {
// 只有是APP闪退反馈成功后弹出联系客服的弹窗
String str = "您也可以联系客服进一步描述闪退的情况,如果您反馈的是新问题,即有机会获得红包奖励";
DialogUtils.showWarningDialog(MainActivity.this, "反馈成功", Html.fromHtml(str.substring(0, str.indexOf("红包奖励")) + "<font color='#FF0000'>红包奖励</font>"), "暂不", "联系客服",
DialogHelper.showWarningDialog(MainActivity.this, "反馈成功", Html.fromHtml(str.substring(0, str.indexOf("红包奖励")) + "<font color='#FF0000'>红包奖励</font>"), "暂不", "联系客服",
() -> {
if (ShareUtils.isQQClientAvailable(this)) {
DirectUtils.directToQqConversation(this, null);
} else {
toast("本机未安装QQ应用");
}
return null;
}, null);
}
@ -684,12 +690,18 @@ public class MainActivity extends BaseActivity {
msg = "" + downloadEntity.getName() + "》已下载完但还未安装,是否立即安装?";
}
DownloadEntity finalDownloadEntity = downloadEntity;
DialogUtils.showWarningDialog(this,
DialogHelper.showWarningDialog(this,
"提示", msg,
"直接退出",
"立即安装",
() -> handler.postDelayed(() -> PackageInstaller.install(MainActivity.this, finalDownloadEntity), 200),
this::finish);
() -> {
handler.postDelayed(() -> PackageInstaller.install(MainActivity.this, finalDownloadEntity), 200);
return null;
},
() -> {
finish();
return null;
});
return true;
}
System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);