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

2019-10-21, v2.1.2.506

Browse source 
1. Removed VoiXtreme Engine command restrictions
This commit is contained in:
Jimmie Matsson 2019-10-21 14:51:44 +02:00
parent a678369e60
commit 541ad63f83
9 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View file

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

3
.idea/gradle.xml generated
View file

@ -3,6 +3,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.4.2'
// 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 @@
#Tue Oct 31 18:48:46 CET 2017
#Mon Sep 23 15:02:30 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

4
vxt-speaker-next/build.gradle
View file

@ -15,7 +15,7 @@ android {
lintOptions {
disable 'MissingTranslation'
abortOnError true
abortOnError false
}
defaultConfig {
@ -24,7 +24,7 @@ android {
targetSdkVersion 25
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
VERSION = "2.1.2.505"
VERSION = "2.1.2.506"
buildConfigField("String", "SPEAKERNEXT_VERSION", "\"" + VERSION + "\"")
}

14
vxt-speaker-next/src/main/java/com/voixtreme/speakernext/Common/SpkNxtLibrary.java
View file

@ -151,7 +151,7 @@ public class SpkNxtLibrary {
Lg.i(TAG, "eml: disconnectHeadset()");
Intent intent = new Intent(BroadcastParams.BROADCAST_ACTION_PAIRING_COMMAND);
Intent intent = new Intent(BroadcastParams.BROADCAST_ACTION_BT_PAIRING);
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.ACTION_DISCONNECT_DEVICE);
intent.putExtra(BroadcastParams.EXTRAS_DATA, true);
@ -170,7 +170,7 @@ public class SpkNxtLibrary {
Intent intent = new Intent();
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.setAction(BroadcastParams.BROADCAST_ACTION_PAIRING_COMMAND);
intent.setAction(BroadcastParams.BROADCAST_ACTION_BT_PAIRING);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.ACTION_RELEASE_SOCKET);
intent.putExtra(BroadcastParams.EXTRAS_RESPONSE_ACTION, BroadcastParams.BROADCAST_ACTION_RESPONSE);
intent.putExtra(BroadcastParams.EXTRAS_DEVICE_TYPE, BroadcastParams.DEVICE_TYPE_SCANNERS);
@ -276,9 +276,9 @@ public class SpkNxtLibrary {
mVocalReceiver.onInformation("ERROR: Invalid VoiXtreme Command Line: " + text);
return false;
}
} else {
mVocalReceiver.onInformation("ERROR: Missing <TTSO> / <ASR> tag: " + text);
return false;
// } else {
// mVocalReceiver.onInformation("ERROR: Missing <TTSO> / <ASR> tag: " + text);
// return false;
}
return true;
@ -404,7 +404,7 @@ public class SpkNxtLibrary {
mScannerListener.onScannerStatus(ScannerReceiver.SCANNER_STATUS_MISSING_PACKAGE);
}
} else {
Intent intent = new Intent(BroadcastParams.BROADCAST_ACTION_PAIRING_COMMAND);
Intent intent = new Intent(BroadcastParams.BROADCAST_ACTION_BT_PAIRING);
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.ACTION_PAIRING_PAIR_DEVICE);
intent.putExtra(BroadcastParams.EXTRAS_FILTER, mJScanner.bluetoothSPP.filter);
@ -526,7 +526,7 @@ public class SpkNxtLibrary {
if (getPackageIntent("spp") == null) {
mScannerListener.onScannerStatus(ScannerReceiver.SCANNER_STATUS_MISSING_PACKAGE);
} else {
Intent intent = new Intent(BroadcastParams.BROADCAST_ACTION_PAIRING_COMMAND);
Intent intent = new Intent(BroadcastParams.BROADCAST_ACTION_BT_PAIRING);
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.ACTION_CHECK_SCANNER_SERVICE_ALIVE);
intent.putExtra(BroadcastParams.EXTRAS_DEVICE_TYPE, BroadcastParams.DEVICE_TYPE_SCANNERS);

2
vxt-speaker-next/src/main/java/com/voixtreme/speakernext/MainActivity.java
View file

@ -204,7 +204,7 @@ public class MainActivity extends AppCompatActivity {
intent = new Intent();
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.setAction(BroadcastParams.BROADCAST_ACTION_PAIRING_COMMAND);
intent.setAction(BroadcastParams.BROADCAST_ACTION_BT_PAIRING);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.ACTION_RELEASE_SOCKET);
intent.putExtra(BroadcastParams.EXTRAS_RESPONSE_ACTION, BroadcastParams.BROADCAST_ACTION_RESPONSE);
intent.putExtra(BroadcastParams.EXTRAS_DEVICE_TYPE, BroadcastParams.DEVICE_TYPE_SCANNERS);

3
vxt-speaker-next/src/main/res/layout/keyboard_popup_layout.xml
View file

@ -14,8 +14,7 @@
android:keyBackground="@drawable/key_background"
android:keyPreviewLayout="@layout/key_preview"
android:keyTextColor="#fff"
android:keyTextSize="22sp"
android:popupLayout="@layout/keyboard_popup_layout"/>
android:keyTextSize="22sp" />
<ImageButton android:id="@android:id/closeButton"
android:layout_width="wrap_content"

2
vxt-speaker-next/src/main/res/values/dimens.xml
View file

@ -36,4 +36,6 @@
<dimen name="main_recycler_first_installed_text_size">12sp</dimen>
<dimen name="main_recycler_divider_width">1dp</dimen>
<dimen name="activity_horizontal_margin">6dp</dimen>
</resources>