From 9ff4e9d763004dfb51ef0bd1cbe9943e151f4a58 Mon Sep 17 00:00:00 2001 From: Jimmie Matsson Date: Thu, 11 Jul 2019 12:50:01 +0200 Subject: [PATCH] Version Auchan! --- .idea/encodings.xml | 2 +- .idea/gradle.xml | 7 ---- .idea/misc.xml | 37 +------------------ .idea/modules.xml | 6 +-- .idea/vcs.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- vxt-calibrate/proguard-rules-log-cat.pro | 5 +++ vxt-calibrate/proguard-rules.pro | 5 +++ .../voixtreme/calibrate/StartupActivity.java | 18 ++++++++- 10 files changed, 35 insertions(+), 53 deletions(-) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 97626ba..ada92a5 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index cc7cebe..2996d53 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,13 +8,6 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 197c30e..39c65f6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,41 +1,6 @@ - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 044ce44..ac32c3c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index e06a455..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2d45a15..5ea9881 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2943d1f..abe5def 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 14 13:07:57 CET 2019 +#Tue Jul 09 18:17:12 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/vxt-calibrate/proguard-rules-log-cat.pro b/vxt-calibrate/proguard-rules-log-cat.pro index d961b32..a65b70a 100644 --- a/vxt-calibrate/proguard-rules-log-cat.pro +++ b/vxt-calibrate/proguard-rules-log-cat.pro @@ -26,6 +26,11 @@ -keepattributes Annotation -keepattributes Signature +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + -keepclassmembers class ** { @org.greenrobot.eventbus.Subscribe ; } diff --git a/vxt-calibrate/proguard-rules.pro b/vxt-calibrate/proguard-rules.pro index 7f86d24..4278a61 100644 --- a/vxt-calibrate/proguard-rules.pro +++ b/vxt-calibrate/proguard-rules.pro @@ -26,6 +26,11 @@ -keepattributes Annotation -keepattributes Signature +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + -keepclassmembers class ** { @org.greenrobot.eventbus.Subscribe ; } diff --git a/vxt-calibrate/src/main/java/com/voixtreme/calibrate/StartupActivity.java b/vxt-calibrate/src/main/java/com/voixtreme/calibrate/StartupActivity.java index c0a4e9f..48a58aa 100644 --- a/vxt-calibrate/src/main/java/com/voixtreme/calibrate/StartupActivity.java +++ b/vxt-calibrate/src/main/java/com/voixtreme/calibrate/StartupActivity.java @@ -80,7 +80,7 @@ import java.util.List; */ public class StartupActivity extends Activity { - private static final String TAG = "StartupActivity"; + private static final String TAG = StartupActivity.class.getSimpleName(); private static final int MAX_PING = 15+1; // Desired value +1 private static final int PING_DELAY = 913; @@ -527,6 +527,7 @@ public class StartupActivity extends Activity { Lg.e(TAG, "eml: command: COMMAND_INITIALIZE_TTS"); mHandler.removeCallbacksAndMessages(null); +// mConfig.getCalibrateSettings().targetOK = 1; final boolean skipCalibrate = mConfig.getCalibrateSettings().targetOK == 0; if (mASREngine != BroadcastParams.ASR_ENGINE_NONE && !skipCalibrate) { mStopApp = true; @@ -538,7 +539,20 @@ public class StartupActivity extends Activity { Lg.w(TAG, "eml: TargetOK = 0, skipping calibrate"); } - informStatus(VxtCommon.Calibrate.CALIBRATE_STATUS_TERMINATED); +// Intent rstIntent = new Intent(BroadcastParams.INTENT_ACTION_VOIXTREME); +// rstIntent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.COMMAND_SPEECH); +// rstIntent.putExtra(BroadcastParams.EXTRAS_TEXT, MainActivity.RESET_ENGINE); +// rstIntent.putExtra(BroadcastParams.EXTRAS_RESPONSE_ACTION, BroadcastParams.INTENT_ACTION_RESPONSE); +// sendBroadcast(rstIntent); + + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + + informStatus(VxtCommon.Calibrate.CALIBRATE_STATUS_TERMINATED); + } + }, 1000); + } mKillVxtEngine = false;