Merge branch 'qa_1.1.2' into dev

# Conflicts:
#	modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
#	modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
This commit is contained in:
tongchenfei
2020-08-18 13:18:23 +08:00
17 changed files with 311 additions and 82 deletions

View File

@@ -226,6 +226,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
@Override
public void onCmdSelected(String cmd) {
Logger.d(TAG, "收到免唤醒词指令: " + cmd);
switch (cmd) {
case UNWAKE_CANCEL_SHARE:
dismissShareDialog();