mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-13 20:24:14 +02:00
Code Issues Releases Wiki Activity

fix small bug

Browse Source
This commit is contained in:
OliE
2017-04-29 13:27:50 +02:00
parent 687c0b95ca
commit 4a839f56bb
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -46,8 +46,6 @@ import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import static android.R.attr.id;
import static com.health.openscale.R.drawable.weight;
import static com.health.openscale.core.bluetooth.BluetoothCommunication.BT_MI_SCALE; import static com.health.openscale.core.bluetooth.BluetoothCommunication.BT_MI_SCALE;
import static com.health.openscale.core.bluetooth.BluetoothCommunication.BT_OPEN_SCALE; import static com.health.openscale.core.bluetooth.BluetoothCommunication.BT_OPEN_SCALE;
@@ -174,7 +172,7 @@ public class OpenScale {
if (scaleData.getUserId() == -1) { if (scaleData.getUserId() == -1) {
if (prefs.getBoolean("smartUserAssign", false)) { if (prefs.getBoolean("smartUserAssign", false)) {
scaleData.setUserId(getSmartUserAssignment(weight, 15.0f)); scaleData.setUserId(getSmartUserAssignment(scaleData.getWeight(), 15.0f));
} else { } else {
scaleData.setUserId(getSelectedScaleUser().id); scaleData.setUserId(getSelectedScaleUser().id);
} }
@@ -200,7 +198,7 @@ public class OpenScale {
ArrayList<ScaleData> scaleUserData = scaleDB.getScaleDataList(scaleUser.get(i).id); ArrayList<ScaleData> scaleUserData = scaleDB.getScaleDataList(scaleUser.get(i).id);
if (scaleUserData.size() > 0) { if (scaleUserData.size() > 0) {
float lastWeight = scaleUserData.get(0).getConvertedWeight(getSelectedScaleUser().scale_unit); float lastWeight = scaleUserData.get(0).getWeight();
if ((lastWeight - range) <= weight && (lastWeight + range) >= weight) { if ((lastWeight - range) <= weight && (lastWeight + range) >= weight) {
inRangeWeights.put(Math.abs(lastWeight - weight), scaleUser.get(i).id); inRangeWeights.put(Math.abs(lastWeight - weight), scaleUser.get(i).id);
@@ -217,7 +215,7 @@ public class OpenScale {
} }
public void updateScaleData(ScaleData scaleData) { public void updateScaleData(ScaleData scaleData) {
scaleDB.updateEntry(id, scaleData); scaleDB.updateEntry(scaleData.getId(), scaleData);
alarmHandler.entryChanged(context, scaleData); alarmHandler.entryChanged(context, scaleData);
updateScaleData(); updateScaleData();

1
android_app/app/src/main/java/com/health/openscale/core/database/ScaleDatabase.java
View File

@@ -158,6 +158,7 @@ public class ScaleDatabase extends SQLiteOpenHelper {
public void updateEntry(long id, ScaleData scaleData) { public void updateEntry(long id, ScaleData scaleData) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(COLUMN_NAME_DATE_TIME, formatDateTime.format(scaleData.getDateTime())); values.put(COLUMN_NAME_DATE_TIME, formatDateTime.format(scaleData.getDateTime()));
values.put(COLUMN_NAME_WEIGHT, scaleData.getWeight()); values.put(COLUMN_NAME_WEIGHT, scaleData.getWeight());
values.put(COLUMN_NAME_FAT, scaleData.getFat()); values.put(COLUMN_NAME_FAT, scaleData.getFat());