caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

display 666 in backlightontime if no settings read

Browse source
This commit is contained in:
Roumen Georgiev 2018-06-01 10:08:13 +03:00
parent f3d19aa6f4
commit 319e786988
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRUserOptionsActivity.java
View file

@ -21,18 +21,13 @@ import android.widget.TextView;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import info.nightscout.androidaps.Constants;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
import info.nightscout.androidaps.db.ExtendedBolus;
import info.nightscout.androidaps.interfaces.PluginType; import info.nightscout.androidaps.interfaces.PluginType;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump; import info.nightscout.androidaps.plugins.PumpDanaR.DanaRPump;
import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin; import info.nightscout.androidaps.plugins.PumpDanaRKorean.DanaRKoreanPlugin;
import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin; import info.nightscout.androidaps.plugins.PumpDanaRS.DanaRSPlugin;
import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
import info.nightscout.utils.DateUtil;
import info.nightscout.utils.DecimalFormatter;
import info.nightscout.utils.SetWarnColor;
/** /**
* Created by Rumen Georgiev on 5/31/2018. * Created by Rumen Georgiev on 5/31/2018.
@ -97,15 +92,10 @@ public class DanaRUserOptionsActivity extends Activity {
Activity activity = this; Activity activity = this;
if (activity != null) if (activity != null)
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@SuppressLint("SetTextI18n")
@Override @Override
public void run() { public void run() {
DanaRPump pump = DanaRPump.getInstance(); DanaRPump pump = DanaRPump.getInstance();
if (pump.getUnits() != null) {
if(pump.getUnits() == "mmol") {
pumpUnits.setChecked(true);
}
}
if (pump.timeDisplayType != 0) { if (pump.timeDisplayType != 0) {
timeFormat.setChecked(true); timeFormat.setChecked(true);
} }
@ -113,8 +103,19 @@ public class DanaRUserOptionsActivity extends Activity {
if(pump.buttonScrollOnOff != 0) { if(pump.buttonScrollOnOff != 0) {
buttonScroll.setChecked(true); buttonScroll.setChecked(true);
} }
if (pump.beepAndAlarm != 0) {
beep.setChecked(true);
}
screenTimeout.setText(String.valueOf(pump.lcdOnTimeSec)); screenTimeout.setText(String.valueOf(pump.lcdOnTimeSec));
backlightTimeout.setText(String.valueOf(pump.backlightOnTimeSec)); backlightTimeout.setText(String.valueOf(pump.backlightOnTimeSec));
if(pump.lastSettingsRead == 0)
backlightTimeout.setText(String.valueOf(666));
if (pump.getUnits() != null) {
if(pump.getUnits().equals(Constants.MMOL)) {
pumpUnits.setChecked(true);
}
}
shutdown.setText(String.valueOf(pump.shutdownHour)); shutdown.setText(String.valueOf(pump.shutdownHour));
lowReservoir.setText(String.valueOf(pump.lowReservoirRate)); lowReservoir.setText(String.valueOf(pump.lowReservoirRate));
} }