From 218a224816bc2ca22079af8e91b4089b46480649 Mon Sep 17 00:00:00 2001 From: rtrimana Date: Mon, 2 Oct 2017 11:10:31 -0700 Subject: [PATCH] Completing the addition of iotcloud into the 4th benchmark - alarm control over the cloud! --- .../HomeSecurityController.java | 27 ++----------------- .../PhoneInterface/Control/.idea/misc.xml | 2 +- .../com/example/ali/control/MainActivity.java | 2 ++ 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java index c146c6f..6615f83 100644 --- a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java +++ b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java @@ -147,7 +147,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt createKeyIoTCloud("alarm", NOT_ACTIVE); System.out.println("DEBUG: Setting alarm to NOT-ACTIVE!"); } - // TODO: Just use alarm for now as a status to cloud + // TODO: We can extend the usage of other keys to have a complete monitoring system for every device /*for(SmartthingsSensorSmart smartSensor : smartSensorsSet.values()) { createKeyIoTCloud("sensor" + Integer.toString(id++), NOT_ACTIVE); @@ -201,7 +201,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt * @return [void] None. */ private void updateIoTCloud(String key, IoTString val) { - + // No key creation here! try { IoTString iotKey = new IoTString(key); t1.update(); @@ -253,8 +253,6 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt senDetectStatus.put(sensorId, false); System.out.println("DEBUG: Initialized sensor detection to false!"); // Initialize IoTCloud -// createKeyIoTCloud("sensor" + Integer.toString(sensorId), NOT_ACTIVE); -// System.out.println("DEBUG: Setting sensor" + sensorId + " to NOT-ACTIVE!"); sen.setId(sensorId++); sen.registerCallback(this); System.out.println("DEBUG: Registered sensor callback!"); @@ -296,10 +294,6 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt // Initialize detection to false camDetectStatus.put(cam, false); - - // Initialize IoTCloud -// createKeyIoTCloud("camera", NOT_ACTIVE); -// System.out.println("DEBUG: Setting camera to NOT-ACTIVE!"); } } @@ -313,18 +307,10 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt // Get and init the alarm (this single alarm set can serve multiple zones / rooms) Iterator alarmIt = alarmSet.iterator(); AlarmSmart alm = (AlarmSmart) alarmIt.next(); - // Initialize IoTCloud - only 1 alarm -// createKeyIoTCloud("alarm", NOT_ACTIVE); -// System.out.println("DEBUG: Setting alarm to NOT-ACTIVE!"); // Initialize the alarm controller, do it here since it only needs to be done once per controller try { alm.init(); System.out.println("DEBUG: Initialized alarm!"); - // TODO: Check that this initialization works for multiple times - might be that setZone() only works once! - //for (RoomSmart room : roomSet.values()) { - // turnOffAlarms(room.getRoomID()); - // System.out.println("DEBUG: Initialized alarm for room (turn off): " + room.getRoomID()); - //} } catch (Exception e) { e.printStackTrace(); } @@ -347,9 +333,6 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt System.out.println("DEBUG: Initialized doorlock! ID: " + doorlockId); doorlockStatus.put(doorlockId, false); System.out.println("DEBUG: Initialized doorlock status to false!"); - // Initialize IoTCloud -// createKeyIoTCloud("doorlock" + Integer.toString(doorlockId), NOT_ACTIVE); -// System.out.println("DEBUG: Setting doorlock to NOT-ACTIVE!"); doorlock.setId(doorlockId++); doorlock.registerCallback(this); System.out.println("DEBUG: Registered doorlock callback!"); @@ -647,12 +630,6 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt // Init all Smartthings sensors initSmartthingsSensors(rm); - //try { - // Thread.sleep(5000); - //} catch (Exception e) { - // e.printStackTrace(); - //} - } // Init all doorlocks initDoorLocks(); diff --git a/benchmarks/other/PhoneInterface/Control/.idea/misc.xml b/benchmarks/other/PhoneInterface/Control/.idea/misc.xml index 5d19981..fbb6828 100644 --- a/benchmarks/other/PhoneInterface/Control/.idea/misc.xml +++ b/benchmarks/other/PhoneInterface/Control/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java b/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java index 1133cc4..c1fb208 100644 --- a/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java +++ b/benchmarks/other/PhoneInterface/Control/app/src/main/java/com/example/ali/control/MainActivity.java @@ -61,6 +61,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe if (intStatus == 0) { alarmStatus.setText("OFF"); + alarmButton.setText("ON"); alarmStatus.setTextColor(Color.BLUE); //alarmSwitch.setChecked(false); alarmOn = false; @@ -68,6 +69,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe } else {// value 1 alarmStatus.setText("ON"); + alarmButton.setText("OFF"); alarmStatus.setTextColor(Color.RED); //alarmSwitch.setChecked(true); alarmOn = true; -- 2.34.1