diff --git a/debug/app-debug.apk b/debug/app-debug.apk new file mode 100644 index 0000000000000000000000000000000000000000..47c63b944b5afb5066f6e2b536cee5126fa0806f Binary files /dev/null and b/debug/app-debug.apk differ diff --git a/debug/output.json b/debug/output.json new file mode 100644 index 0000000000000000000000000000000000000000..3104d29bb0a3689adc71e01e359ff6e7840493d2 --- /dev/null +++ b/debug/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-debug.apk","properties":{"packageId":"com.notificationFramework","split":"","minSdkVersion":"19"}}] \ No newline at end of file diff --git a/src/main/java/com/notificationFramework/sedentary/frontEnd/SaveFile.java b/src/main/java/com/notificationFramework/sedentary/frontEnd/SaveFile.java index f093b30b78a7a470007c11f8ca43bbf3e602e99a..b23ff5b8388d131caa6bb1223724f1f69b676cda 100644 --- a/src/main/java/com/notificationFramework/sedentary/frontEnd/SaveFile.java +++ b/src/main/java/com/notificationFramework/sedentary/frontEnd/SaveFile.java @@ -502,6 +502,10 @@ public class SaveFile { no++; int ack = Integer.parseInt(items[2].trim()); ack += acknowledged; + SharedPreferences shared = context.getSharedPreferences(context.getString(R.string.preference_file_key), Context.MODE_PRIVATE); + SharedPreferences.Editor editor = shared.edit(); + editor.putInt(context.getString(R.string.place_ack_total), ack ); + editor.apply(); bw.write(items[0] + " " + String.valueOf(no) + " " + ack); matched = true; }else{ diff --git a/src/main/java/com/notificationFramework/stimulus/SedentaryStimulus.java b/src/main/java/com/notificationFramework/stimulus/SedentaryStimulus.java index 2f24b9993b7fde0a4efa042ae5f71b5cf9cd55d5..d8a5eab7a880eeea9c889fbe08698f6f7c45c3be 100644 --- a/src/main/java/com/notificationFramework/stimulus/SedentaryStimulus.java +++ b/src/main/java/com/notificationFramework/stimulus/SedentaryStimulus.java @@ -180,13 +180,21 @@ public class SedentaryStimulus extends BroadcastReceiver implements Stimulus { private boolean checkContext(SharedPreferences shared, Context context){ int mostPop = shared.getInt(context.getString(R.string.store_mcp), -1); float temp = shared.getFloat(context.getString(R.string.store_temp), 18); - if (mostPop >= 0 && mostPop < 999) { + int lastPlace = shared.getInt(context.getString(R.string.store_place), 0); + int ackTotal = shared.getInt(context.getString(R.string.ack_total), 0); + int placeAck = shared.getInt(context.getString(R.string.place_ack_total), 0); + double comp = (double) placeAck / ackTotal; + if(comp < 0.2){ + return false; + }else + /*if (lastPlace >= 0 && lastPlace < 999) { //Assume work return false; } else if(temp > 18){ //Assume hot so outside??? return false; - }else{ + }else + */{ return true; } } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ee2062dd10b066ac94fe22b4e1c57205778f062b..52dfd74038ee5a1ef2c5655caac39d5335f74020 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -56,4 +56,5 @@ <string name="store_place_like">Place Likelihood</string> <string name="store_mcp">Most Common Place</string> <string name="store_last_ack">Last Acknowledgement</string> + <string name="place_ack_total">Last Place Acknowledgement Total</string> </resources>