MO_Mobile_Systeme/APED_App
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://its-gitlab.init.hs-owl.de/mo_b_l/aped_app

Browse Source
This commit is contained in:
paul-loedige 2021-01-04 13:41:29 +01:00
commit 98a4bed7b0
2 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsFragment.java
View File

@ -52,6 +52,7 @@ public class AllIOsFragment extends Fragment {
ListView lv = (ListView) view.findViewById(R.id.idListView); ListView lv = (ListView) view.findViewById(R.id.idListView);
MainListViewAdapter mainListViewAdapter = new MainListViewAdapter(mainActivity,0); MainListViewAdapter mainListViewAdapter = new MainListViewAdapter(mainActivity,0);
lv.setAdapter(mainListViewAdapter); lv.setAdapter(mainListViewAdapter);
return view; return view;
} }

72
APED/app/src/main/java/com/example/aped/ui/visualization/PinView.java
View File

@ -10,6 +10,8 @@ import com.example.aped.MainActivity;
import com.example.aped.R; import com.example.aped.R;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class PinView { public class PinView {
@ -34,23 +36,6 @@ public class PinView {
TextView textViewPin = (TextView) view.findViewById( TextView textViewPin = (TextView) view.findViewById(
R.id.textPin); 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() { view.setOnClickListener(new View.OnClickListener() {
@Override @Override
@ -58,7 +43,6 @@ public class PinView {
if((mainActivity.xml.getPort(deviceName)).get("protocol").toString().equals("DO")) { if((mainActivity.xml.getPort(deviceName)).get("protocol").toString().equals("DO")) {
try {// Werte erst aktualisieren try {// Werte erst aktualisieren
String setState = null; String setState = null;
String test = pinValues.get(i);
if(pinValues.get(i).equals("0")) { if(pinValues.get(i).equals("0")) {
setState = "{\"output\": \"1\"}"; setState = "{\"output\": \"1\"}";
}else{ }else{
@ -96,16 +80,60 @@ public class PinView {
}else{ }else{
Toast.makeText(mainActivity, deviceName Toast.makeText(mainActivity, deviceName
+ " is not a output " , + " is not an output " ,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
Intent intentneustart = mainActivity.getIntent();// gegen richtigen Befehl tauschen da nur die visualisierung neu gestartet werden soll mainActivity.uebergabe.read(deviceName,
mainActivity.finish(); new Response.Listener<JSONObject>() {
mainActivity.startActivity(intentneustart); @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; return view;
} }
} }