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

Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0

Browse Source
This commit is contained in:
CsHeng
2017-07-10 15:01:39 +08:00
parent 10b1380aad b239407c25
commit 979ee209dd
192 changed files with 3118 additions and 5157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/base/BaseActivity.java
View File

@ -112,7 +112,7 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity {
public void onEventMainThread(final EBShowDialog showDialog) {
if (!mIsPause && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
if ("hijack".equals(showDialog.getType())) {
DialogUtils.showQqSessionDialog(this, null);// 建议用户联系客服
DialogUtils.showQqSessionDialog(this, "2586716223");// 建议用户联系客服
} else if ("plugin".equals(showDialog.getType())) {
DialogUtils.showPluginDialog(this, new DialogUtils.ConfirmListener() {
@Override