DeletandoDadosDoDevicesStatus

GabrielSirtoriCorrea · Jul 17, 2020 · 4c1e78f · 4c1e78f
1 parent a37da3a
commit 4c1e78f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/...com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java b/...com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java
@@ -75,7 +75,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
         removeAlert.setPositiveButton("Excluir", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
-                connection.sendRequest(connection.prepareDelete("deleteDevice", ID));
+                connection.sendRequest(connection.prepareDelete("deleteDevice", ID, txtDevice.getText().toString()));
 
                 if(connection.getMsgStatus()) {
                     Toast.makeText(getContext(), "Excluído", Toast.LENGTH_SHORT).show();

diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java
@@ -28,8 +28,6 @@ public class ServerConnection extends AsyncTask<JSONObject, Integer, ArrayList<J
     private ArrayList<JSONArray> list = null;
     private JSONArray arrayResponse;
     private char[] buffer;
-    private StringBuilder requestBuilder;
-    private String requestLine;
     private boolean msgStatus = false;
 
 
@@ -254,6 +252,20 @@ public JSONObject prepareDelete(String request, int deleteId){
         return jsonRequest;
     }
 
+    public JSONObject prepareDelete(String request, int deleteId, String name){
+        try {
+            this.jsonRequest = new JSONObject();
+            this.jsonRequest.put("header", "gazeboindustries09082004");
+            this.jsonRequest.put("request", request);
+            this.jsonRequest.put("deleteId", deleteId);
+            this.jsonRequest.put("deleteName", name);
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return jsonRequest;
+    }
+
     public JSONObject prepareSetDevice(String request, String device, int action){
         try {
             this.jsonRequest = new JSONObject();

diff --git a/Server/DevicesStatus.json b/Server/DevicesStatus.json
@@ -6,9 +6,5 @@
     "Friday": {
         "action": 0,
         "url": ".com"
-    },
-    "teste": {
-        "action": 0,
-        "url": ".com"
     }
 }
diff --git a/Server/Server.py b/Server/Server.py
@@ -163,6 +163,17 @@ def handle(self):
                         elif clientRequest['request'] == 'deleteDevice':
                             dataBaseConnection.deleteDevice(clientRequest['deleteId'])
 
+                            readFile = open('E:/Sexta-Feira-Mark_6/Server/DevicesStatus.json', 'r')
+
+                            newJson = json.load(readFile)
+
+                            print(newJson)
+
+                            del newJson[clientRequest['deleteName']]
+
+                            writeFile = open('E:/Sexta-Feira-Mark_6/Server/DevicesStatus.json', 'w')
+                            json.dump(newJson, writeFile, indent=4)
+
                             self.request.send(json.dumps({'requestStatus': True}).encode())
 
                         elif clientRequest['request'] == 'deleteHomeWork':