caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

rhino small refactor

Browse source
This commit is contained in:
AdrianLxM 2017-10-15 11:51:12 +02:00
parent 9008ef6f6f
commit 124ec6e992
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java
View file

@ -77,32 +77,29 @@ public class DetermineBasalAdapterMAJS {
rhino.setOptimizationLevel(-1); rhino.setOptimizationLevel(-1);
try { try {
// Note the forth argument is 1, which means the JavaScript source has
// been compressed to only one line using something like YUI //generate functions "determine_basal" and "setTempBasal"
//rhino.evaluateString(scope, javaScriptCode, "JavaScript", 1, null);
rhino.evaluateString(scope, readFile("OpenAPSMA/determine-basal.js"), "JavaScript", 0, null); rhino.evaluateString(scope, readFile("OpenAPSMA/determine-basal.js"), "JavaScript", 0, null);
String setTempBasal= "var setTempBasal = function (rate, duration, profile, rT, offline) {" +
String setTempBasalCode= "var setTempBasal = function (rate, duration, profile, rT, offline) {" +
"rT.duration = duration;\n" + "rT.duration = duration;\n" +
" rT.rate = rate;" + " rT.rate = rate;" +
"return rT;" + "return rT;" +
"};"; "};";
rhino.evaluateString(scope, setTempBasalCode, "setTempBasal.js", 0, null);
rhino.evaluateString(scope, setTempBasal, "setTempBasal.js", 0, null);
// Get the functionName defined in JavaScriptCode // Get the functionName defined in JavaScriptCode
// Object obj = scope.get(functionNameInJavaScriptCode, scope); // Object obj = scope.get(functionNameInJavaScriptCode, scope);
Object obj = scope.get("determine_basal", scope); Object determineBasalObj = scope.get("determine_basal", scope);
Object obj2 = scope.get("setTempBasal", scope); Object setTempBasalObj = scope.get("setTempBasal", scope);
if (obj instanceof Function && obj2 instanceof Function) { if (determineBasalObj instanceof Function && setTempBasalObj instanceof Function) {
Function jsFunction = (Function) obj; Function determineBasalJS = (Function) determineBasalObj;
Function jsFunctionSetTempBasal = (Function) obj2; Function setTempBasalJS = (Function) setTempBasalObj;
// Call the function with params
//prepare parameters
Object param1 = NativeJSON.parse(rhino, scope, "{\"athing\": {\"anotherthing\": 2.3}}", new Callable() { Object param1 = NativeJSON.parse(rhino, scope, "{\"athing\": {\"anotherthing\": 2.3}}", new Callable() {
@Override @Override
public Object call(Context context, Scriptable scriptable, Scriptable scriptable1, Object[] objects) { public Object call(Context context, Scriptable scriptable, Scriptable scriptable1, Object[] objects) {
@ -117,9 +114,9 @@ public class DetermineBasalAdapterMAJS {
"undefined", "undefined",
"undefined", "undefined",
"undefined", "undefined",
jsFunctionSetTempBasal}; setTempBasalJS};
NativeObject jsResult = (NativeObject) jsFunction.call(rhino, scope, scope, params); NativeObject jsResult = (NativeObject) determineBasalJS.call(rhino, scope, scope, params);
// Parse the jsResult object to a String // Parse the jsResult object to a String
String result = rhino.toString(jsResult); String result = rhino.toString(jsResult);