diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java index 9a48de5..02b67ef 100644 --- a/APED/app/src/main/java/com/example/aped/MainActivity.java +++ b/APED/app/src/main/java/com/example/aped/MainActivity.java @@ -6,6 +6,7 @@ import android.view.MenuItem; import android.view.Menu; import android.widget.Toast; +import com.example.aped.communication.IIO; import com.example.aped.communication.IXML; import com.example.aped.communication.TestXML; import com.google.android.material.navigation.NavigationView; @@ -24,6 +25,8 @@ public class MainActivity extends AppCompatActivity { private AppBarConfiguration mAppBarConfiguration; /** zur Verwendung von xml anstatt der direkten Einbindung.*/ private IXML xml; + /** zur Verwendung von uebergabe anstatt der direkten Einbindung.*/ + private IIO uebergabe; /** allgemeines.*/ @Override protected void onCreate(final Bundle savedInstanceState) { @@ -75,13 +78,16 @@ public class MainActivity extends AppCompatActivity { Toast.LENGTH_SHORT).show(); return true; case R.id.action_download_xml: + if (xml.download() == 0) { Toast.makeText(this, "Download .xml", Toast.LENGTH_SHORT).show(); + } return true; case R.id.action_upload_xml: + if (xml.upload() == 0) { Toast.makeText(this, "Upload .xml", Toast.LENGTH_SHORT).show(); - xml.upload(); + } return true; default: return super.onOptionsItemSelected(item); 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 new file mode 100644 index 0000000..c327685 --- /dev/null +++ b/APED/app/src/main/java/com/example/aped/communication/IIO.java @@ -0,0 +1,16 @@ +package com.example.aped.communication; + +public interface IIO { + /** + * + * @return Einlesewerte in Array + */ + String[][] rueckgabeAI(); + + /** + * + * @return Einlesewerte in Array + */ + String rueckgabeDI(); + //DO (int); +} diff --git a/APED/app/src/main/java/com/example/aped/communication/IXML.java b/APED/app/src/main/java/com/example/aped/communication/IXML.java index 69f1cfc..880941a 100644 --- a/APED/app/src/main/java/com/example/aped/communication/IXML.java +++ b/APED/app/src/main/java/com/example/aped/communication/IXML.java @@ -1,9 +1,16 @@ package com.example.aped.communication; public interface IXML { - /** dowload er XML.*/ + /** + * + * @return hat Funktioniert? + */ int download(); - /** upload er XML.*/ + + /** + * + * @return hat Funktioniert? + */ int upload(); } 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 new file mode 100644 index 0000000..7ee8a66 --- /dev/null +++ b/APED/app/src/main/java/com/example/aped/communication/TestIO.java @@ -0,0 +1,28 @@ +package com.example.aped.communication; + +public class TestIO implements IIO { + /** Test Klasse.*/ + @Override + public String[][] rueckgabeAI() { + //String AI[3][3]; + /** AI[0][0]="Test"; + AI[1][1]="5.658"; + AI[1][2]="Volt"; + + AI[1][0]="Test2"; + AI[1][1]="10"; + AI[1][2]="Ohm"; + + AI[2][0]="Test3"; + AI[2][1]="9.88"; + AI[2][2]="Ampere"; + + AI[3][0]="END";*/ + return AI; + } + /** Test Klasse.*/ + @Override + public String rueckgabeDI() { + return null; + } +} diff --git a/APED/app/src/main/java/com/example/aped/communication/TestXML.java b/APED/app/src/main/java/com/example/aped/communication/TestXML.java index 79c3f58..0b43443 100644 --- a/APED/app/src/main/java/com/example/aped/communication/TestXML.java +++ b/APED/app/src/main/java/com/example/aped/communication/TestXML.java @@ -1,12 +1,13 @@ package com.example.aped.communication; + public class TestXML implements IXML { - /** was soll bei download getan werden.*/ + /** Test Klasse.*/ @Override public int download() { return 0; } - /** was soll bei upload getan werden.*/ + /** Test Klasse.*/ @Override public int upload() { 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 51d9a7e..df0d314 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 @@ -17,6 +17,14 @@ import com.example.aped.R; public class AllIOsFragment extends Fragment { /**Azeige Modell.*/ private AllIOsViewModel allIOsViewModel; + + /** + * + * @param inflater + * @param container + * @param savedInstanceState + * @return root + */ public View onCreateView(final @NonNull LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) { diff --git a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsViewModel.java b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsViewModel.java index 1606146..5d87734 100644 --- a/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsViewModel.java +++ b/APED/app/src/main/java/com/example/aped/ui/all_IOs/AllIOsViewModel.java @@ -13,7 +13,11 @@ public class AllIOsViewModel extends ViewModel { mText.setValue("Anzeige aller Mess & Sollwertvorgaben bestimmt durch" + " die xml"); } - /** Rückgabe des Textes.*/ + + /** + * + * @return mText + */ public LiveData getText() { return mText; } diff --git a/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsFragment.java b/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsFragment.java index 21c80d5..b0244c6 100644 --- a/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsFragment.java +++ b/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsFragment.java @@ -17,7 +17,15 @@ import com.example.aped.R; public class YourIOsFragment extends Fragment { /**Azeige Modell.*/ private YourIOsViewModel yourIOsViewModel; - public View onCreateView(final @NonNull LayoutInflater inflater, + + /** + * + * @param inflater + * @param container + * @param savedInstanceState + * @return root + */ + public View onCreateView(final @NonNull LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) { yourIOsViewModel = diff --git a/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsViewModel.java b/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsViewModel.java index 55a8d7f..50990f4 100644 --- a/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsViewModel.java +++ b/APED/app/src/main/java/com/example/aped/ui/your_IOs/YourIOsViewModel.java @@ -12,7 +12,11 @@ public class YourIOsViewModel extends ViewModel { mText = new MutableLiveData<>(); mText.setValue("Personalisierte Anzeige der Mess- & Sollwerte"); } - /** Rückgabe des Textes.*/ + + /** + * + * @return test Rückgabe + */ public final LiveData getText() { return mText; } diff --git a/APED/app/src/main/res/values/colors.xml b/APED/app/src/main/res/values/colors.xml index 51228c8..761962a 100644 --- a/APED/app/src/main/res/values/colors.xml +++ b/APED/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ #FFBB86FC - #ff0006 + #f01313 #5a5458 #FF03DAC5 #FF018786