diff --git a/APED/app/build.gradle b/APED/app/build.gradle index 440cf69..b1bc785 100644 --- a/APED/app/build.gradle +++ b/APED/app/build.gradle @@ -37,6 +37,7 @@ dependencies { implementation 'androidx.navigation:navigation-ui:2.2.2' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' + implementation 'com.android.volley:volley:1.1.1' testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/APED/app/src/main/AndroidManifest.xml b/APED/app/src/main/AndroidManifest.xml index 71a046f..15e51c1 100644 --- a/APED/app/src/main/AndroidManifest.xml +++ b/APED/app/src/main/AndroidManifest.xml @@ -4,6 +4,8 @@ + + + android:theme="@style/Theme.APED" + android:usesCleartextTraffic="true"> responseListener) { + String requestString = "http://" + address + ":" + port + "/device/" + deviceName + "/"; + JsonObjectRequest request = new JsonObjectRequest( + Request.Method.GET, + requestString, + null, + responseListener, + error -> Log.e("Communicator","Error during READ: " + error.getMessage()) + ); + requestQueue.add(request); + } + + public void write(String deviceName, JSONObject message, Response.Listener responseListener) { + String requestString = "http://" + address + ":" + port + "/device/" + deviceName + "/"; + JsonObjectRequest request = new JsonObjectRequest( + Request.Method.POST, + requestString, + message, + responseListener, + error -> {Log.e("Communicator", "Error during WRITE: " + error.getMessage()); error.printStackTrace();} + ); + requestQueue.add(request); + } + + public void uploadXML(File xmlFile) { + throw new NotImplementedError(); + } + + public void downloadXML() { + throw new NotImplementedError(); + } +} diff --git a/APED/app/src/main/java/com/example/aped/communication/IIO.java b/APED/app/src/main/java/com/example/aped/communication/IIO.java deleted file mode 100644 index 1750374..0000000 --- a/APED/app/src/main/java/com/example/aped/communication/IIO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.example.aped.communication; - -import java.io.File; - -public interface IIO -{ - /** - * reads a value from a device connected to the raspberry - * @param deviceName the name of the device to read from - * @return the value read - */ - String read(String deviceName); - - /** - * writes a value to a device connected to the raspberry - * @param deviceName the name of the device to write to - * @param value the value to write to the device - * @return the value written - */ - String write(String deviceName, String value); - - /** - * uploads the config.xml to the raspberry - * @param xmlFile the config.xml - * @return 0 if everything worked - */ - int uploadXML(File xmlFile); - - /** - * downloads the current config.xml from the raspberry - * @return 0 if everything worked - */ - int downloadXML(); -} diff --git a/APED/app/src/main/java/com/example/aped/communication/TestIO.java b/APED/app/src/main/java/com/example/aped/communication/TestIO.java deleted file mode 100644 index b1ce57f..0000000 --- a/APED/app/src/main/java/com/example/aped/communication/TestIO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.example.aped.communication; - -import android.widget.Toast; - -import com.example.aped.R; - -import java.io.File; - -public class TestIO implements IIO { - - @Override - public String read(String deviceName) { - - String Wert; - switch (deviceName) { - case "stoff": - Wert = "TRUE"; - break; - case "schnaps": - Wert = "FALSE"; - break; - default: - Wert="default"; - } - return Wert; - } - - @Override - public String write(String deviceName, String value) { - return "TRUE";//Wenn erfolgreich gesendet - } - - @Override - public int uploadXML(File xmlFile) { - return 0; - } - - @Override - public int downloadXML() { - return 0; - } - -} 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 6031695..4c7979b 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 @@ -71,14 +71,14 @@ public class AllIOsFragment extends Fragment { @Override public View getView(int i, View view, ViewGroup viewGroup) { - if(mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i)).equals("TRUE")) { + /*if(mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i)).equals("TRUE")) { image=R.drawable.green_signal; }else if (mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i)).equals("FALSE")) { image = R.drawable.red_signal; } - else{ + else{*/ image = R.drawable.off_signal; - } + //} if (mainActivity.favorite.getFavorites().contains(mainActivity.xml.getDeviceNames().get(i))) { favorite_image = android.R.drawable.btn_star_big_on; }else { @@ -120,7 +120,7 @@ public class AllIOsFragment extends Fragment { imageView.setImageResource(image); TextView_Name.setText(mainActivity.xml.getDeviceNames().get(i)); - TextView_State.setText(mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i))); + //TextView_State.setText(mainActivity.uebergabe.read(mainActivity.xml.getDeviceNames().get(i))); ButtonView_Favoriten.setImageResource(favorite_image); return view; }