Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

This commit is contained in:
张玉久
2020-01-09 18:25:24 +08:00
31 changed files with 149 additions and 84 deletions

View File

@ -428,7 +428,7 @@ public class MainActivity extends BaseActivity {
DialogUtils.showWarningDialog(MainActivity.this, "反馈成功", Html.fromHtml(str.substring(0, str.indexOf("红包奖励")) + "<font color='#FF0000'>红包奖励</font>"), "暂不", "联系客服",
() -> {
if (ShareUtils.isQQClientAvailable(this)) {
DirectUtils.directToQqConversation(this, "3467475980");
DirectUtils.directToQqConversation(this, null);
} else {
toast("本机未安装QQ应用");
}
@ -442,7 +442,6 @@ public class MainActivity extends BaseActivity {
// DownloadManager.getInstance(this).removeObserver(dataWatcher);
handler.removeCallbacksAndMessages(null);
DownloadManager.getInstance(this).resetMarkData();
}
@NonNull