rmt/voixtreme-calibrate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Version Auchan!

Browse source
This commit is contained in:
Jimmie Matsson 2019-07-11 12:50:01 +02:00
parent fda221cd8c
commit 9ff4e9d763
10 changed files with 35 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/encodings.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<component name="Encoding" addBOMForNewFiles="with NO BOM">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

7
.idea/gradle.xml generated
View file

@ -8,13 +8,6 @@
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$/../../dixitmobile-common/library" />
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/vxt-calibrate" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>

37
.idea/misc.xml generated
View file

@ -1,41 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="10">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="9">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

6
.idea/modules.xml generated
View file

@ -2,9 +2,9 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file:///data3/AndroidStudioProjects/dixit/dixitmobile-common/library/library.iml" filepath="/data3/AndroidStudioProjects/dixit/dixitmobile-common/library/library.iml" />
<module fileurl="file:///data3/AndroidStudioProjects/dixit/hubone/voiXtreme-calibrate/voiXtreme-calibrate.iml" filepath="/data3/AndroidStudioProjects/dixit/hubone/voiXtreme-calibrate/voiXtreme-calibrate.iml" />
<module fileurl="file:///data3/AndroidStudioProjects/dixit/hubone/voiXtreme-calibrate/vxt-calibrate/vxt-calibrate.iml" filepath="/data3/AndroidStudioProjects/dixit/hubone/voiXtreme-calibrate/vxt-calibrate/vxt-calibrate.iml" />
<module fileurl="file://$PROJECT_DIR$/../../dixitmobile-common/library/library.iml" filepath="$PROJECT_DIR$/../../dixitmobile-common/library/library.iml" />
<module fileurl="file://$PROJECT_DIR$/voiXtreme-calibrate.iml" filepath="$PROJECT_DIR$/voiXtreme-calibrate.iml" />
<module fileurl="file://$PROJECT_DIR$/vxt-calibrate/vxt-calibrate.iml" filepath="$PROJECT_DIR$/vxt-calibrate/vxt-calibrate.iml" />
</modules>
</component>
</project>

2
.idea/vcs.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="/data3/AndroidStudioProjects/dixit/hubone/voiXtreme-calibrate" vcs="Git" />
<mapping directory="" vcs="Git" />
</component>
</project>

2
build.gradle
View file

@ -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

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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

5
vxt-calibrate/proguard-rules-log-cat.pro
View file

@ -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 <methods>;
}

5
vxt-calibrate/proguard-rules.pro vendored
View file

@ -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 <methods>;
}

18
vxt-calibrate/src/main/java/com/voixtreme/calibrate/StartupActivity.java
View file

@ -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;