V3.2.0 - Added multiple language support

This commit is contained in:
Graham Jones
2020-04-18 20:26:29 +01:00
parent 48ade0ba6f
commit b4c9d1d08d
10 changed files with 13 additions and 12 deletions

View File

@@ -311,7 +311,7 @@ public class MainActivity extends AppCompatActivity {
TextView tv;
tv = (TextView) findViewById(R.id.versionTv);
String versionName = mUtil.getAppVersionName();
tv.setText(getString(R.string.AppTitleText) + versionName);
tv.setText(getString(R.string.AppTitleText) + " " + versionName);
if (mUtil.isServerRunning()) {
mUtil.writeToSysLogFile("MainActivity.onStart - Binding to Server");

View File

@@ -66,7 +66,7 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
@Override
public void onBuildHeaders(List<Header> target) {
loadHeadersFromResource(R.xml.preference_headers, target);
Log.v(TAG,"onBuildHeaders - target.size="+target.size());
SharedPreferences SP = PreferenceManager
.getDefaultSharedPreferences(this.getApplicationContext());
String dataSourceStr = SP.getString("DataSource", "Pebble");
@@ -106,7 +106,8 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
} else {
for (int i = 0; i < target.size(); i++) {
Header h = target.get(i);
Log.v(TAG, "found - " + h.title.toString());
Log.v(TAG,"i="+i+", h="+h.toString());
Log.v(TAG, "found - " + h.title);
if (!h.title.toString().equals("Basic")) {
if (!advancedMode) {
Log.v(TAG, "an Advanced Mode Header");

View File

@@ -217,7 +217,7 @@ public class SdServer extends Service implements SdDataReceiver {
// Create our log manager.
//mLm = new LogManager(mLogDataRemote, mLogDataRemoteMobile,
// mOSDUname, mOSDPasswd, mOSDWearerId, mOSDUrl, this);
mLm = new LogManager(this);
//mLm = new LogManager(this);
Log.v(TAG, "onStartCommand: Datasource =" + mSdDataSourceName);
switch (mSdDataSourceName) {
@@ -1018,7 +1018,7 @@ public class SdServer extends Service implements SdDataReceiver {
if (mLogData) {
Log.v(TAG, "logData() - writing data to SD Card");
writeToSD();
mLm.writeToLocalDb(mSdData);
//mLm.writeToLocalDb(mSdData);
}
}