From f139b5b278d68b695536846f4205b0c573fbddce Mon Sep 17 00:00:00 2001
From: m_broelemann <marius.broelemann@stud.th-owl.de>
Date: Mon, 4 Jan 2021 13:23:51 +0100
Subject: [PATCH] =?UTF-8?q?nach=20=C3=A4ndern=20des=20Digital=20Out=20Zust?=
 =?UTF-8?q?andes=20wird=20jetzt=20nicht=20mehr=20die=20App=20neu=20gestart?=
 =?UTF-8?q?et?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aped/ui/all_IOs/AllIOsFragment.java       |  1 +
 .../aped/ui/visualization/PinView.java        | 72 +++++++++++++------
 2 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
index 47759de..8c23f8f 100644
--- a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
+++ b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
@@ -52,6 +52,7 @@ public class AllIOsFragment extends Fragment {
         ListView lv = (ListView) view.findViewById(R.id.idListView);
         MainListViewAdapter mainListViewAdapter = new MainListViewAdapter(mainActivity,0);
         lv.setAdapter(mainListViewAdapter);
+
         return view;
     }
 
diff --git a/APED/app/src/main/java/com/example/aped/ui/visualization/PinView.java b/APED/app/src/main/java/com/example/aped/ui/visualization/PinView.java
index 578830c..9759e2c 100644
--- a/APED/app/src/main/java/com/example/aped/ui/visualization/PinView.java
+++ b/APED/app/src/main/java/com/example/aped/ui/visualization/PinView.java
@@ -10,6 +10,8 @@ import com.example.aped.MainActivity;
 import com.example.aped.R;
 import org.json.JSONException;
 import org.json.JSONObject;
+
+import java.util.ArrayList;
 import java.util.List;
 
 public class PinView {
@@ -34,23 +36,6 @@ public class PinView {
         TextView textViewPin = (TextView) view.findViewById(
                 R.id.textPin);
 
-        switch (pinValues.get(i)){
-            case "1":
-                image=R.drawable.green_signal;
-                break;
-            case "0":
-                image=R.drawable.red_signal;
-                break;
-            default:
-                image=R.drawable.off_signal;
-                break;
-        }
-        imageView.setImageResource(image);
-
-
-        textViewPin.setText(((List<String>) (mainActivity.xml.getPort(deviceName)).get("pins")).get(i));
-
-
 
         view.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -58,7 +43,6 @@ public class PinView {
                 if((mainActivity.xml.getPort(deviceName)).get("protocol").toString().equals("DO"))  {
                     try {//                                                        Werte erst aktualisieren
                         String setState = null;
-                        String test = pinValues.get(i);
                         if(pinValues.get(i).equals("0")) {
                              setState = "{\"output\": \"1\"}";
                         }else{
@@ -96,16 +80,60 @@ public class PinView {
 
                 }else{
                     Toast.makeText(mainActivity, deviceName
-                                    + " is not a output " ,
+                                    + " is not an output " ,
                             Toast.LENGTH_SHORT).show();
                 }
-                Intent intentneustart = mainActivity.getIntent();//                 gegen richtigen Befehl tauschen da nur die visualisierung neu gestartet werden soll
-                mainActivity.finish();
-                mainActivity.startActivity(intentneustart);
+                mainActivity.uebergabe.read(deviceName,
+                        new Response.Listener<JSONObject>() {
+                            @Override
+                            public void onResponse(final JSONObject response) {
+                                try {
+                                    JSONObject state = response.getJSONObject("state");
+                                    //List<String> pinValues = new ArrayList<>();
+                                    pinValues.clear();
+                                    for(String pinName: ((List<String>)mainActivity.xml.
+                                            getPort(deviceName).
+                                            get("pins"))){
+                                        pinValues.add(state.getString(pinName));
+                                    }
+                                    switch (pinValues.get(i)){
+                                        case "1":
+                                            image=R.drawable.green_signal;
+                                            break;
+                                        case "0":
+                                            image=R.drawable.red_signal;
+                                            break;
+                                        default:
+                                            image=R.drawable.off_signal;
+                                            break;
+                                    }
+                                    imageView.setImageResource(image);
+
+                                } catch (JSONException e) {
+                                    // Richtigen log erstellen
+                                    e.printStackTrace();
+                                }
+
+                            }
+                        });
             }
         });
 
+        switch (pinValues.get(i)){
+            case "1":
+                image=R.drawable.green_signal;
+                break;
+            case "0":
+                image=R.drawable.red_signal;
+                break;
+            default:
+                image=R.drawable.off_signal;
+                break;
+        }
+        imageView.setImageResource(image);
 
+
+        textViewPin.setText(((List<String>) (mainActivity.xml.getPort(deviceName)).get("pins")).get(i));
         return view;
     }
 }