Merge remote-tracking branch 'origin/dev' into dev

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java

@@ -16,14 +16,12 @@ public class NavigatorApps {
     private static AppInfo app = new AppInfo( "导航", "com.mogo.launcher.navi.search", "", 0, null, R.drawable.module_apps_ic_navigator_navi, 1 );
     private static AppInfo app_ = new AppInfo( "导航", "com.mogo.launcher.navi.search", "", 0, null, R.drawable.module_apps_ic_navigator_navi_disable, 1 );
     private static AppInfo app2 = new AppInfo( "音乐", "com.pvetec.musics", "", 0, null, R.drawable.module_apps_ic_navigator_media, 2 );
-    private static AppInfo app3 = new AppInfo( "个人中心", "com.zhidao.auto.personal", "", 0, null, R.drawable.module_apps_ic_navigator_personcenter, 3 );
     private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist, 4 );
 
     public static List< AppInfo > getApps() {
         List< AppInfo > sApps = new ArrayList<>();
         sApps.add( app );
         sApps.add( app2 );
-//        sApps.add( app3 );
         sApps.add( app4 );
         return sApps;
     }
@@ -32,7 +30,6 @@ public class NavigatorApps {
         List< AppInfo > sApps = new ArrayList<>();
         sApps.add( app );
         sApps.add( app2 );
-//        sApps.add( app3 );
         sApps.add( app4 );
         return sApps;
     }

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java

@@ -2,6 +2,7 @@ package com.mogo.module.apps.view;
 
 import android.view.View;
 
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.device.Devices;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.module.apps.AppServiceHandler;
@@ -34,7 +35,7 @@ class OnAiAssistClickListener implements View.OnClickListener {
             trackNavigatorClickEvent( 5 );
         } else {
             if ( mDebugModeOpen ) {
-                AIAssist.startAssistant( v.getContext(), 2 );
+                AIAssist.startAssistant( v.getContext(), 1 );
                 trackNavigatorClickEvent( 5 );
                 return;
             }
@@ -42,7 +43,7 @@ class OnAiAssistClickListener implements View.OnClickListener {
                 mLastClickTime = System.currentTimeMillis();
                 mClickCounter++;
             } else {
-                if ( mClickCounter == TOTAL_CLICK_AMOUNT && !mDebugModeOpen ) {
+                if ( mClickCounter == TOTAL_CLICK_AMOUNT ) {
                     AIAssist.startAssistant( v.getContext(), 2 );
                     TipToast.shortTip( "开启语音调试" );
                     mClickCounter = 0;
@@ -50,7 +51,7 @@ class OnAiAssistClickListener implements View.OnClickListener {
                     mDebugModeOpen = true;
                 } else if ( System.currentTimeMillis() - mLastClickTime > INTERVAL ) {
                     mClickCounter = 0;
-                    TipToast.shortTip( "请在2秒内打开调试模式" );
+                    TipToast.shortTip( "请在2秒内连续点击5次打开语音调试模式" );
                 } else {
                     mClickCounter++;
                 }