Tested all communication with Particle

Author: uzbhutta

app/src/main/java/com/umarbhutta/xlightcompanion/particle/ParticleBridge.java

@@ -27,9 +27,9 @@ public class ParticleBridge {
     public static final int MAX_DEVICES = 6;
 
     //Login details
-    public static final String EMAIL = "sunbaoshi1975@gmail.com";
-    public static final String PASSWORD = "1qazxsw2";
-    public static final String DEVICE_ID = "2d0027001647343432313031";
+    public static final String EMAIL = "umar.bhutta@hotmail.com";
+    public static final String PASSWORD = "ballislife2016";
+    public static final String DEVICE_ID = "30003e001547343339383037";
 
     //Particle vars
     public static ParticleDevice currDevice;
@@ -46,6 +46,7 @@ public class ParticleBridge {
     //ring values
     public static final int RING_ALL = 0;
     public static final int RING_1 = 1;
+
     public static final int RING_2 = 2;
     public static final int RING_3 = 3;
     //ring text
@@ -181,7 +182,7 @@ public static int JSONConfigScenario(final int brightness, final int cw, final i
         new Thread() {
             @Override
             public void run() {
-                int scenarioId = ScenarioFragment.name.size() + 1;
+                int scenarioId = ScenarioFragment.name.size();
                 boolean x[] = {false, false, false};
 
                 //construct first part of string input, and store it in arraylist (of size 1)
@@ -216,7 +217,7 @@ public void run() {
                 if (x[1]) {
                     //construct last part of string input, store in arraylist
                     //json = "\"ring3\":[" + STATE_ON + "," + cw + "," + ww + "," + r + "," + g + "," + b + "],\"brightness\":" + brightness + ",\"filter\":" + DEFAULT_FILTER_ID + "}";
-                    json = "{'x2':'\"ring3\":[" + STATE_ON + "," + cw + "," + ww + "," + r + "," + g + "," + b + "],\"brightness\":" + brightness + ",\"filter\":" + DEFAULT_FILTER_ID + "}'}";
+                    json = "\"ring3\":[" + STATE_ON + "," + cw + "," + ww + "," + r + "," + g + "," + b + "],\"brightness\":" + brightness + ",\"filter\":" + DEFAULT_FILTER_ID + "}";
                     message.add(json);
                     //send in last part of string
                     try {
@@ -232,13 +233,16 @@ public void run() {
         return resultCode;
     }
 
-    public static int JSONConfigSchedule(final boolean isRepeat, final String weekdays, final int hour, final int minute) {
+    public static int JSONConfigAlarm(final int nodeId, final boolean isRepeat, final String weekdays, final int hour, final int minute, final String scenarioName) {
+        final int[] doneSending = {0};
         new Thread() {
             @Override
             public void run() {
+                boolean x[] = {false, false, false, false};
+
+                //SCHEDULE
                 int scheduleId = ScheduleFragment.name.size();
                 int repeat = isRepeat ? 1 : 0;
-                boolean x[] = {false, false};
 
                 //construct first part of string input, and store it in arraylist (of size 1)
                 String json = "{'x0': '{\"op\":1,\"fl\":0,\"run\":0,\"uid\":\"a" + scheduleId + "\",\"isRepeat\":" + repeat + ", '}";
@@ -256,67 +260,108 @@ public void run() {
 
                 if (x[0]) {
                     //construct second part of string input, store in arraylist
-                    json = "{\"weekdays\":\"" + weekdays + "\",\"hour\":" + hour + ",\"min\":" + minute + ",\"alarm_id\":" + DEFAULT_ALARM_ID + "}";
+                    json = "\"weekdays\":" + "2" + ",\"hour\":" + hour + ",\"min\":" + minute + ",\"alarm_id\":" + DEFAULT_ALARM_ID + "}";
                     message.add(json);
                     //send in second part of string
                     try {
                         Log.e(TAG, "JSONConfigSchedule " + message.get(0));
                         resultCode = currDevice.callFunction("JSONConfig", message);
                         x[1] = true;
+                        doneSending[0] = 5;
                     } catch (ParticleCloudException | ParticleDevice.FunctionDoesNotExistException | IOException e) {
                         e.printStackTrace();
                     }
                     message.clear();
-                }
-            }
-        }.start();
-        return 1;
-    }
 
-    public static int JSONConfigRule(final int nodeId, final String scenarioName) {
-        new Thread() {
-            @Override
-            public void run() {
-                int rule_schedule_notif_Id = ScheduleFragment.name.size() + 1;
-                int scenarioId = 1;
-                for (int i = 0; i < ScenarioFragment.name.size(); i++) {
-                    if (scenarioName == ScenarioFragment.name.get(i)) {
-                        scenarioId = i + 1;
-                    }
-                }
-                boolean x[] = {false, false};
 
-                //construct first part of string input, and store it in arraylist (of size 1)
-                String json = "{'x0': '{\"op\":1,\"fl\":0,\"run\":0,\"uid\":\"r" + rule_schedule_notif_Id + "\",\"node_id\":" + nodeId + ", '}";
-                ArrayList<String> message = new ArrayList<>();
-                message.add(json);
-                //send in first part of string
-                try {
-                    Log.e(TAG, "JSONConfigRule" + message.get(0));
-                    resultCode = currDevice.callFunction("JSONConfig", message);
-                    x[0] = true;
-                } catch (ParticleCloudException | ParticleDevice.FunctionDoesNotExistException | IOException e) {
-                    e.printStackTrace();
-                }
-                message.clear();
 
-                if (x[0]) {
-                    //construct second part of string input, store in arraylist
-                    json = "{'x1': '\"SCT_uid\":\"a" + rule_schedule_notif_Id + "\",\"SNT_uid\":\"s" + scenarioId + "\",\"notif_uid\":\"n" + rule_schedule_notif_Id + "\"} '}";
-                    message.add(json);
-                    //send in second part of string
+                    //RULE
+                    int rule_schedule_notif_Id = ScheduleFragment.name.size() - 1;
+                    int scenarioId = 1;
+                    for (int i = 0; i < ScenarioFragment.name.size(); i++) {
+                        if (scenarioName == ScenarioFragment.name.get(i)) {
+                            scenarioId = i;
+                        }
+                    }
+
+                    //construct first part of string input, and store it in arraylist (of size 1)
+                    String json2 = "{'x0': '{\"op\":1,\"fl\":0,\"run\":0,\"uid\":\"r" + rule_schedule_notif_Id + "\",\"node_id\":" + nodeId + ", '}";
+                    ArrayList<String> message2 = new ArrayList<>();
+                    message2.add(json2);
+                    //send in first part of string
                     try {
-                        Log.i(TAG, "JSONConfigRule" + message.get(0));
-                        resultCode = currDevice.callFunction("JSONConfig", message);
-                        x[1] = true;
+                        Log.e(TAG, "JSONConfigRule " + message2.get(0));
+                        resultCode = currDevice.callFunction("JSONConfig", message2);
+                        x[2] = true;
                     } catch (ParticleCloudException | ParticleDevice.FunctionDoesNotExistException | IOException e) {
                         e.printStackTrace();
                     }
-                    message.clear();
+                    message2.clear();
+
+                    if (x[2]) {
+                        //construct second part of string input, store in arraylist
+                        json2 = "\"SCT_uid\":" + rule_schedule_notif_Id + ",\"SNT_uid\":" + scenarioId + ",\"notif_uid\":" + rule_schedule_notif_Id + "}";
+                        message2.add(json2);
+                        //send in second part of string
+                        try {
+                            Log.i(TAG, "JSONConfigRule " + message2.get(0));
+                            resultCode = currDevice.callFunction("JSONConfig", message2);
+                            x[3] = true;
+                        } catch (ParticleCloudException | ParticleDevice.FunctionDoesNotExistException | IOException e) {
+                            e.printStackTrace();
+                        }
+                        message2.clear();
+                    }
                 }
             }
         }.start();
         return resultCode;
     }
 
+//    public static int JSONConfigRule(final int nodeId, final String scenarioName) {
+//        new Thread() {
+//            @Override
+//            public void run() {
+//                int rule_schedule_notif_Id = ScheduleFragment.name.size() + 1;
+//                int scenarioId = 1;
+//                for (int i = 0; i < ScenarioFragment.name.size(); i++) {
+//                    if (scenarioName == ScenarioFragment.name.get(i)) {
+//                        scenarioId = i + 1;
+//                    }
+//                }
+//                boolean x[] = {false, false};
+//
+//                //construct first part of string input, and store it in arraylist (of size 1)
+//                String json = "{'x0': '{\"op\":1,\"fl\":0,\"run\":0,\"uid\":\"r" + rule_schedule_notif_Id + "\",\"node_id\":" + nodeId + ", '}";
+//                ArrayList<String> message = new ArrayList<>();
+//                message.add(json);
+//                //send in first part of string
+//                try {
+//                    Log.e(TAG, "JSONConfigRule" + message.get(0));
+//                    resultCode = currDevice.callFunction("JSONConfig", message);
+//                    x[0] = true;
+//                } catch (ParticleCloudException | ParticleDevice.FunctionDoesNotExistException | IOException e) {
+//                    e.printStackTrace();
+//                }
+//                message.clear();
+//
+//                if (x[0]) {
+//                    //construct second part of string input, store in arraylist
+//                    json = "\"SCT_uid\":\"a" + rule_schedule_notif_Id + "\",\"SNT_uid\":\"s" + scenarioId + "\",\"notif_uid\":\"n" + rule_schedule_notif_Id + "\"}";
+//                    message.add(json);
+//                    //send in second part of string
+//                    try {
+//                        Log.i(TAG, "JSONConfigRule" + message.get(0));
+//                        resultCode = currDevice.callFunction("JSONConfig", message);
+//                        x[1] = true;
+//                    } catch (ParticleCloudException | ParticleDevice.FunctionDoesNotExistException | IOException e) {
+//                        e.printStackTrace();
+//                    }
+//                    message.clear();
+//                }
+//            }
+//        }.start();
+//        return resultCode;
+//    }
+
 }

app/src/main/java/com/umarbhutta/xlightcompanion/schedule/AddScheduleActivity.java

@@ -238,13 +238,15 @@ public void onClick(View v) {
                     weekdays += "0";
                 }
 
-                //call JSONConfigSchedule to send a schedule row
-                int addScheduleReturn = ParticleBridge.JSONConfigSchedule(isRepeat, weekdays, hour, minute);
-                //add Rule row when schedule row has been added
-                if (addScheduleReturn == 1) {
-                    ParticleBridge.JSONConfigRule(defeaultNodeId, scenarioName);
+                if (outgoingWeekdays == "Mo Tu We Th Fr Sa Su ") {
+                    outgoingWeekdays = "Every day";
+                } else if (outgoingWeekdays == "") {
+                    outgoingWeekdays = "Today";
                 }
 
+                //call JSONConfigAlarm to send a schedule row
+                ParticleBridge.JSONConfigAlarm(defeaultNodeId, isRepeat, weekdays, hour, minute, scenarioName);
+
                 //send data to update the list
                 Intent returnIntent = getIntent();
                 returnIntent.putExtra(ScheduleFragment.SCENARIO_NAME, scenarioName);