caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

ruffy: take over Menu changes (robustness, presumably), from 46e92833.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-10-18 23:23:26 +02:00
parent 51aceadfb1
commit d9235cf54b
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 49 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/Menu.java
View file

@ -2,6 +2,7 @@ package org.monkey.d.ruffy.ruffy.driver.display;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.Log;
import org.monkey.d.ruffy.ruffy.driver.display.menu.BolusType; import org.monkey.d.ruffy.ruffy.driver.display.menu.BolusType;
import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuBlink; import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuBlink;
@ -17,7 +18,7 @@ import java.util.Map;
* Created by fishermen21 on 20.05.17. * Created by fishermen21 on 20.05.17.
*/ */
public class Menu implements Parcelable { public class Menu implements Parcelable{
private MenuType type; private MenuType type;
private Map<MenuAttribute,Object> attributes = new HashMap<>(); private Map<MenuAttribute,Object> attributes = new HashMap<>();
@ -34,34 +35,43 @@ public class Menu implements Parcelable {
String clas = in.readString(); String clas = in.readString();
String value = in.readString(); String value = in.readString();
MenuAttribute a = MenuAttribute.valueOf(attr); if(attr!=null && clas!=null && value!=null) {
Object o = null; MenuAttribute a = MenuAttribute.valueOf(attr);
if (Integer.class.toString().equals(clas)) { Object o = null;
o = new Integer(value); if (Integer.class.toString().equals(clas)) {
} else if (Double.class.toString().equals(clas)) { o = new Integer(value);
o = new Double(value); } else if (Double.class.toString().equals(clas)) {
} else if (Boolean.class.toString().equals(clas)) { o = new Double(value);
o = new Boolean(value); } else if (Boolean.class.toString().equals(clas)) {
} else if (MenuDate.class.toString().equals(clas)) { o = new Boolean(value);
o = new MenuDate(value); } else if (MenuDate.class.toString().equals(clas)) {
} else if (MenuTime.class.toString().equals(clas)) { o = new MenuDate(value);
o = new MenuTime(value); } else if (MenuTime.class.toString().equals(clas)) {
} else if (MenuBlink.class.toString().equals(clas)) { o = new MenuTime(value);
o = new MenuBlink(); } else if (MenuBlink.class.toString().equals(clas)) {
} else if (BolusType.class.toString().equals(clas)) { o = new MenuBlink();
o = BolusType.valueOf(value); } else if (BolusType.class.toString().equals(clas)) {
} else if (String.class.toString().equals(clas)) { o = BolusType.valueOf(value);
o = new String(value); } else if (String.class.toString().equals(clas)) {
} o = new String(value);
} else {
Log.e("MENU","unknown class: "+clas);
}
if (o != null) {
attributes.put(a, o); if (o != null) {
} else { attributes.put(a, o);
// Log.e("MenuIn", "failed to parse: " + attr + " / " + clas + " / " + value); } else {
Log.e("MenuIn", "failed to parse: " + attr + " / " + clas + " / " + value);
}
}
else
{
Log.e("MenuIn", "failed to parse: " + attr + " / " + clas + " / " + value);
} }
}catch(Exception e) }catch(Exception e)
{ {
// Log.e("MenuIn","Exception in read",e); Log.e("MenuIn","Exception in read",e);
} }
} }
@ -98,14 +108,23 @@ public class Menu implements Parcelable {
{ {
try try
{ {
dest.writeString(a.toString());
Object o = attributes.get(a);
dest.writeString(o.getClass().toString()); String atr = a.toString();
dest.writeString(o.toString()); Object o = attributes.get(a);
String clas = o.getClass().toString();
String v = o.toString();
if(atr != null && o != null && v != null) {
dest.writeString(atr);
dest.writeString(clas);
dest.writeString(v);
}
else
{
Log.e("Menu","null in write :/");
}
}catch(Exception e) }catch(Exception e)
{ {
// Log.v("MenuOut","error in write",e); Log.v("MenuOut","error in write",e);
} }
} }
} }