diff --git a/app/release/app-release-4.2.6.apk b/app/release/app-release-4.2.7.apk similarity index 84% rename from app/release/app-release-4.2.6.apk rename to app/release/app-release-4.2.7.apk index 483f38e..9a5c0a9 100644 Binary files a/app/release/app-release-4.2.6.apk and b/app/release/app-release-4.2.7.apk differ diff --git a/app/src/main/java/uk/org/openseizuredetector/FragmentBatt.java b/app/src/main/java/uk/org/openseizuredetector/FragmentBatt.java index 4a40974..6d67fbb 100644 --- a/app/src/main/java/uk/org/openseizuredetector/FragmentBatt.java +++ b/app/src/main/java/uk/org/openseizuredetector/FragmentBatt.java @@ -132,7 +132,7 @@ public class FragmentBatt extends FragmentOsdBaseClass { mLineChart.refreshDrawableState(); float xSpan = (nWatchBattArr * 5.0f) / 60.0f; // time in minutes assuming one point every 5 seconds. mLineChart.setDescription(getString(R.string.watch_batt_hist) - + String.format("%.1f", xSpan) + + " " + String.format("%.1f", xSpan) + " " + getString(R.string.minutes)); mLineChart.setDescriptionTextSize(12f); mLineChart.invalidate(); diff --git a/app/src/main/java/uk/org/openseizuredetector/FragmentCommon.java b/app/src/main/java/uk/org/openseizuredetector/FragmentCommon.java index 6c4226b..ec5afa8 100644 --- a/app/src/main/java/uk/org/openseizuredetector/FragmentCommon.java +++ b/app/src/main/java/uk/org/openseizuredetector/FragmentCommon.java @@ -10,6 +10,8 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import android.text.format.Time; + public class FragmentCommon extends FragmentOsdBaseClass { String TAG = "FragmentCommon"; @@ -94,8 +96,12 @@ public class FragmentCommon extends FragmentOsdBaseClass { tv.setTextColor(okTextColour); tv = (TextView) mRootView.findViewById(R.id.data_time_tv); + Time tnow = new Time(Time.getCurrentTimezone()); + tnow.setToNow(); + double tdiff; + tdiff = (tnow.toMillis(false) - mConnection.mSdServer.mSdData.dataTime.toMillis(false))/1000.; tv.setText("Time =" + mConnection.mSdServer.mSdData.dataTime.format("%H:%M:%S") - + " (" + String.format("%.1f s)",mConnection.mSdServer.mSdData.timeDiff)); + + " (" + String.format("%.0f s, %.1f s)",mConnection.mSdServer.mSdData.timeDiff, tdiff)); tv.setBackgroundColor(okColour); tv.setTextColor(okTextColour); diff --git a/app/src/main/java/uk/org/openseizuredetector/FragmentWatchSig.java b/app/src/main/java/uk/org/openseizuredetector/FragmentWatchSig.java index dfc82ab..3f5c1c6 100644 --- a/app/src/main/java/uk/org/openseizuredetector/FragmentWatchSig.java +++ b/app/src/main/java/uk/org/openseizuredetector/FragmentWatchSig.java @@ -73,8 +73,8 @@ public class FragmentWatchSig extends FragmentOsdBaseClass { xAxis.setTextColor(Color.WHITE); YAxis yAxis = mLineChart.getAxisLeft(); - //yAxis.setAxisMinValue(40f); - //yAxis.setAxisMaxValue(240f); + yAxis.setAxisMaxValue(-50f); + yAxis.setAxisMinValue(-100f); yAxis.setDrawGridLines(true); yAxis.setDrawLabels(true); yAxis.setTextColor(Color.WHITE);