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

2019-08-14, v6.1.2.503

Browse source 
1. Fixed bug in the LoggerService

 UPDATED - silentMode
This commit is contained in:
jima 2020-03-04 12:31:49 +01:00
commit c5acf1226a
8 changed files with 211 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -34,10 +34,14 @@ captures/
# Intellij
*.iml
.idea/workspace.xml
.idea/vcs.xml
.idea/modules.xml
.idea/libraries
.idea
.idea/
#.idea/workspace.xml
#.idea/modules.xml
#.idea/misc.xml
#.idea/libraries
#.idea/vcs.xml
#.idea/codeStyleSettings.xml
# Keystore files
*.jks

116
.idea/codeStyles/Project.xml generated Normal file
View file

@ -0,0 +1,116 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme>
</component>

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>

12
.idea/gradle.xml generated
View file

@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="testRunner" value="PLATFORM" />
<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>

6
.idea/modules.xml generated
View file

@ -2,9 +2,9 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<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" />
<module fileurl="file://$PROJECT_DIR$/../../dixitmobile-common/library/library.iml" filepath="$PROJECT_DIR$/../../dixitmobile-common/library/library.iml" group="voiXtreme-calibrate/library" />
<module fileurl="file://$PROJECT_DIR$/voiXtreme-calibrate.iml" filepath="$PROJECT_DIR$/voiXtreme-calibrate.iml" group="voiXtreme-calibrate" />
<module fileurl="file://$PROJECT_DIR$/vxt-calibrate/vxt-calibrate.iml" filepath="$PROJECT_DIR$/vxt-calibrate/vxt-calibrate.iml" group="voiXtreme-calibrate/vxt-calibrate" />
</modules>
</component>
</project>

2
vxt-calibrate/build.gradle
View file

@ -17,7 +17,7 @@ android {
targetSdkVersion 25
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
VERSION = "6.1.2.505"
VERSION = "6.1.2.506"
buildConfigField("String", "CALIBRATE_VERSION", "\"" + VERSION + "\"")
}

2
vxt-calibrate/src/main/java/com/voixtreme/calibrate/MainActivity.java
View file

@ -504,7 +504,7 @@ public class MainActivity extends Activity {
String id = bundle.getString(BroadcastParams.EXTRAS_ID, "NO-ID");
String text = bundle.getString(BroadcastParams.EXTRAS_TEXT, "");
if (command != MY_COMMAND_EVENT) {
if (command != MY_COMMAND_EVENT) {
Lg.d(TAG, "received: COMMAND: " + bundle.getInt(BroadcastParams.EXTRAS_ACTION, -1));
Lg.d(TAG, "received: TEXT: " + text);
Lg.d(TAG, "received: ID: " + id);

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

@ -283,16 +283,8 @@ public class StartupActivity extends Activity {
updateStatus(getString(R.string.status_verifying_input_status) + type);
mProgressBar.setVisibility(View.VISIBLE);
}
});
mAudioManager.stopBluetoothSco();
mHandler.postDelayed(new Runnable() {
@Override
public void run() {
Lg.i(TAG, "sending: COMMAND_VERIFY_INPUT_TYPE");
Lg.i(TAG, "sending: COMMAND_VERIFY_INPUT_TYPE: " + mConfig.getInputType());
Intent intent = new Intent(BroadcastParams.INTENT_ACTION_VOIXTREME);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.COMMAND_VERIFY_INPUT_TYPE);
@ -302,7 +294,25 @@ public class StartupActivity extends Activity {
Lg.w(TAG, "eml: send: COMMAND_VERIFY_INPUT_TYPE");
sendBroadcast(intent);
}
}, 3500);
});
// mAudioManager.stopBluetoothSco();
// mHandler.postDelayed(new Runnable() {
// @Override
// public void run() {
// Lg.i(TAG, "sending: COMMAND_VERIFY_INPUT_TYPE: " + mConfig.getInputType());
//
// Intent intent = new Intent(BroadcastParams.INTENT_ACTION_VOIXTREME);
// intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.COMMAND_VERIFY_INPUT_TYPE);
// intent.putExtra(BroadcastParams.EXTRAS_DATA, mConfig.getInputType());
// intent.putExtra(BroadcastParams.EXTRAS_RESPONSE_ACTION, BroadcastParams.INTENT_ACTION_RESPONSE);
//
// Lg.w(TAG, "eml: send: COMMAND_VERIFY_INPUT_TYPE");
// sendBroadcast(intent);
// }
// }, 3500);
}
private void terminateVoiXtremeService(boolean sleep) {
@ -473,12 +483,20 @@ public class StartupActivity extends Activity {
private void stopBeep() {
mHandler.removeCallbacks(mBeepRunnable);
Intent intent = new Intent(BroadcastParams.INTENT_ACTION_VOIXTREME);
intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.COMMAND_BEEP_TEST);
intent.putExtra(BroadcastParams.EXTRAS_RESPONSE_ACTION, BroadcastParams.INTENT_ACTION_RESPONSE);
intent.putExtra(BroadcastParams.EXTRAS_DATA, false);
Lg.w(TAG, "eml: send: COMMAND_BEEP_TEST: stop");
sendBroadcast(intent);
if (mMediaPlayer != null) {
mMediaPlayer.release();
mMediaPlayer = null;
}
// mHandler.removeCallbacks(mBeepRunnable);
//
// if (mMediaPlayer != null) {
// mMediaPlayer.release();
// mMediaPlayer = null;
// }
}
/**
@ -525,8 +543,14 @@ public class StartupActivity extends Activity {
return;
}
if (command == BroadcastParams.COMMAND_BEEP_TEST) {
Lg.e(TAG, "eml: command: COMMAND_BEEP_TEST");
beepTest2();
return;
}
if (command == BroadcastParams.COMMAND_VERIFY_INPUT_TYPE) {
Lg.e(TAG, "eml: command: COMMAND_VERIFY_INPUT_TYPE");
Lg.e(TAG, "eml: command: COMMAND_VERIFY_INPUT_TYPE: " + data);
if (data != null && data.equals("fail")) {
Lg.i(TAG, "got input info: fail");
showErrorInputDevice();
@ -938,22 +962,22 @@ public class StartupActivity extends Activity {
String type = adapter.getItem(position);
if (type != null) {
if (type.equals(getString(R.string.input_type_open))) {
mAudioManager.setMode(AudioManager.MODE_NORMAL);
// mAudioManager.setMode(AudioManager.MODE_NORMAL);
mConfig.setInputType(BroadcastParams.INPUT_TYPE_OPEN);
verifyInputConnection();
}
else if (type.equals(getString(R.string.input_type_wireless))) {
mAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION); //jima
// mAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION); //jima
mConfig.setInputType(BroadcastParams.INPUT_TYPE_BLUETOOTH);
beepTest();
}
else if (type.equals(getString(R.string.input_type_nfc))) {
mAudioManager.setMode(AudioManager.MODE_IN_CALL);
// mAudioManager.setMode(AudioManager.MODE_IN_CALL);
mConfig.setInputType(BroadcastParams.INPUT_TYPE_NFC);
beepTest();
}
else if (type.equals(getString(R.string.input_type_wired))) {
mAudioManager.setMode(AudioManager.MODE_NORMAL);
// mAudioManager.setMode(AudioManager.MODE_NORMAL);
mConfig.setInputType(BroadcastParams.INPUT_TYPE_WIRED);
verifyInputConnection();
}
@ -972,11 +996,21 @@ public class StartupActivity extends Activity {
BluetoothAdapter.getDefaultAdapter().enable();
}
Intent intent = new Intent(BroadcastParams.INTENT_ACTION_VOIXTREME);
intent.putExtra(BroadcastParams.EXTRAS_ACTION, BroadcastParams.COMMAND_BEEP_TEST);
intent.putExtra(BroadcastParams.EXTRAS_RESPONSE_ACTION, BroadcastParams.INTENT_ACTION_RESPONSE);
intent.putExtra(BroadcastParams.EXTRAS_DATA, true);
Lg.w(TAG, "eml: send: COMMAND_BEEP_TEST: start");
sendBroadcast(intent);
}
private void beepTest2() {
DialogInterface.OnClickListener dialogClickListener;
AlertDialog.Builder builder = new AlertDialog.Builder(this);
mAudioManager.setBluetoothScoOn(true);
mAudioManager.startBluetoothSco();
// mAudioManager.setBluetoothScoOn(true);
// mAudioManager.startBluetoothSco();
final boolean isNFC = mConfig.getInputType() == BroadcastParams.INPUT_TYPE_NFC;
@ -986,7 +1020,7 @@ public class StartupActivity extends Activity {
terminateNoNFC();
return;
} else {
if (Build.MODEL.equals("TC51") && Build.MANUFACTURER.equals("Zebra Technologies")) {
if (Build.MODEL.equals(Common.MODEL_ZEBRA_TC51) && Build.MANUFACTURER.equals("Zebra Technologies")) {
Lg.w(TAG, "eml: Zebra TC51 found...");
} else {
checkHeadsetStatus();
@ -1014,16 +1048,16 @@ public class StartupActivity extends Activity {
builder.setMessage(getString(R.string.hear_beep));
mMediaPlayer = new MediaPlayer();
try {
AssetFileDescriptor afd = getAssets().openFd("informational.wav");
mMediaPlayer.setAudioStreamType(AudioManager.STREAM_VOICE_CALL);
mMediaPlayer.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(),afd.getLength());
mMediaPlayer.prepare();
mHandler.post(mBeepRunnable);
} catch (Exception e) {
e.printStackTrace();
}
// mMediaPlayer = new MediaPlayer();
// try {
// AssetFileDescriptor afd = getAssets().openFd("informational.wav");
// mMediaPlayer.setAudioStreamType(AudioManager.STREAM_VOICE_CALL);
// mMediaPlayer.setDataSource(afd.getFileDescriptor(),afd.getStartOffset(),afd.getLength());
// mMediaPlayer.prepare();
// mHandler.post(mBeepRunnable);
// } catch (Exception e) {
// e.printStackTrace();
// }
Lg.w(TAG, "eml: showing dialog #5");
@ -1307,7 +1341,7 @@ public class StartupActivity extends Activity {
private void openBTPairing() {
mAudioManager.stopBluetoothSco();
// mAudioManager.stopBluetoothSco();
Intent intent = getPackageManager().getLaunchIntentForPackage(Common.PACKAGE_BT_PAIRING);
if (intent == null) {