opt

foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java

@@ -2,6 +2,7 @@ package com.mogo.commons.voice;
 
 import android.content.Context;
 import android.content.Intent;
+import android.text.TextUtils;
 
 import com.zhidao.auto.platform.voice.VoiceClient;
 
@@ -20,6 +21,7 @@ import java.util.Map;
 public class AIAssist implements VoiceClient.VoiceCmdCallBack {
 
     private static volatile AIAssist sInstance;
+    private String mLastQAndAspeakText;
 
     public static AIAssist getInstance( Context context ) {
         if ( sInstance == null ) {
@@ -75,23 +77,28 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack {
 
     @Override
     public void onCmdAction( String speakText ) {
-        IMogoVoiceCmdCallBack cmdCallBack = mQAndAMap.remove( speakText );
-        if ( cmdCallBack != null ) {
-            cmdCallBack.onCmdAction( speakText );
+        if ( !TextUtils.isEmpty( mLastQAndAspeakText ) ) {
+            IMogoVoiceCmdCallBack cmdCallBack = mQAndAMap.remove( mLastQAndAspeakText );
+            if ( cmdCallBack != null ) {
+                cmdCallBack.onCmdAction( speakText );
+            }
         }
     }
 
     @Override
     public void onCmdCancel( String speakText ) {
-        IMogoVoiceCmdCallBack cmdCallBack = mQAndAMap.remove( speakText );
-        if ( cmdCallBack != null ) {
-            cmdCallBack.onCmdCancel( speakText );
+        if ( !TextUtils.isEmpty( mLastQAndAspeakText ) ) {
+            IMogoVoiceCmdCallBack cmdCallBack = mQAndAMap.remove( mLastQAndAspeakText );
+            if ( cmdCallBack != null ) {
+                cmdCallBack.onCmdCancel( speakText );
+            }
         }
     }
 
     @Override
     public void onSpeakEnd( String speakText ) {
         if ( mQAndAMap.containsKey( speakText ) ) {
+            mLastQAndAspeakText = speakText;
             IMogoVoiceCmdCallBack cmdCallBack = mQAndAMap.get( speakText );
             if ( cmdCallBack != null ) {
                 cmdCallBack.onSpeakEnd( speakText );
@@ -107,7 +114,10 @@ public class AIAssist implements VoiceClient.VoiceCmdCallBack {
     @Override
     public void onSpeakSelectTimeOut( String speakText ) {
         if ( mQAndAMap.containsKey( speakText ) ) {
-            IMogoVoiceCmdCallBack cmdCallBack = mQAndAMap.get( speakText );
+            if ( TextUtils.equals( speakText, mLastQAndAspeakText ) ) {
+                mLastQAndAspeakText = null;
+            }
+            IMogoVoiceCmdCallBack cmdCallBack = mQAndAMap.remove( speakText );
             if ( cmdCallBack != null ) {
                 cmdCallBack.onSpeakSelectTimeOut( speakText );
                 return;

libraries/map-amap-car2/build/.transforms/b3598053165ea082b49e9538b20558fc.bin

@@ -1 +0,0 @@
-i/

libraries/map-amap-car2/build/.transforms/d01ca66139cb172b7221dd2ce5bfa877.bin

@@ -1 +0,0 @@
-o/full

libraries/map-amap-car2/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java

@@ -1,18 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.mogo.map.impl.amap;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.mogo.map.impl.amap";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.mogo.map.impl.amap";
-  public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "";
-}

libraries/map-amap-car2/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.map.impl.amap"
-    android:versionCode="1" >
-
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="22" />
-
-    <uses-feature
-        android:glEsVersion="0x00020000"
-        android:required="true" />
-
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.autonavi.permission.ACCESS_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" /> <!-- //自有权限 -->
-    <permission
-        android:name="com.autonavi.permission.ACCESS_LOCATION"
-        android:protectionLevel="normal" />
-
-    <!-- hardwareAccelerated 是否打开硬件加速，打开后430低Android（4.x）版本可能导致黑屏 -->
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-    <application>
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="9877000" />
-    </application>
-
-</manifest>

libraries/map-amap-car2/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"","enabled":true,"outputFile":"map-amap-car2-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.map.impl.amap","split":""}}]

libraries/map-amap-car2/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +0,0 @@
-{}

libraries/map-amap-car2/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/libraries/map-amap-car2/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/libraries/map-amap-car2/src/debug/jniLibs"/></dataSet></merger>

libraries/map-amap-car2/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/libraries/map-amap-car2/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/libraries/map-amap-car2/src/debug/shaders"/></dataSet></merger>