From e9dab4f566b3d4c684ae0dd8e795eede59c4cef2 Mon Sep 17 00:00:00 2001 From: m_broelemann Date: Mon, 28 Dec 2020 18:24:33 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Bild=20f=C3=BCr=20Fehlerhaften=20Zustand=20?= =?UTF-8?q?hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APED/app/src/main/res/drawable/off_signal.jpg | Bin 0 -> 7397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 APED/app/src/main/res/drawable/off_signal.jpg diff --git a/APED/app/src/main/res/drawable/off_signal.jpg b/APED/app/src/main/res/drawable/off_signal.jpg new file mode 100644 index 0000000000000000000000000000000000000000..24cdb07fe70b6bc4d96def6def800e589190e59e GIT binary patch literal 7397 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 Q@|=G}^nXNl9@^M{0Q8Vbxc~qF literal 0 HcmV?d00001 From 347d9a1b746cb7612673902ae47291ae86ac9955 Mon Sep 17 00:00:00 2001 From: m_broelemann Date: Mon, 28 Dec 2020 18:25:14 +0100 Subject: [PATCH 2/4] TestXML um Wert erweitert --- APED/app/src/main/java/com/example/aped/utils/TestXML.java | 1 + 1 file changed, 1 insertion(+) diff --git a/APED/app/src/main/java/com/example/aped/utils/TestXML.java b/APED/app/src/main/java/com/example/aped/utils/TestXML.java index 723f494..09fbb24 100644 --- a/APED/app/src/main/java/com/example/aped/utils/TestXML.java +++ b/APED/app/src/main/java/com/example/aped/utils/TestXML.java @@ -23,6 +23,7 @@ public class TestXML implements IXML { List returnList = new ArrayList<>(); returnList.add("stoff"); returnList.add("schnaps"); + returnList.add("whatever"); return returnList; } From 239c63f472a2292116d72febc09fe73636576bbd Mon Sep 17 00:00:00 2001 From: m_broelemann Date: Mon, 28 Dec 2020 18:26:04 +0100 Subject: [PATCH 3/4] =?UTF-8?q?jetzt=20Verarbeitung=20=C3=BCber=20Interfac?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aped/ui/all_IOs/AllIOsFragment.java | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 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 1dccc4f..74d4105 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 @@ -30,11 +30,11 @@ public class AllIOsFragment extends Fragment { ListView lv; SearchView searchView; ArrayAdapter adapter; - List name = MainActivity.xml.getDeviceNames();//{"IN1", "Temperatur extern > 5°C", "Strom Heizung < 10A"}; + //List name = MainActivity.xml.getDeviceNames();//{"IN1", "Temperatur extern > 5°C", "Strom Heizung < 10A"}; //String[] state = {"FALSE", "TRUE", "FALSE"}; - int[] images =new int[name.size()];// {R.drawable.red_signal, R.drawable.green_signal, R.drawable.red_signal}; - int[] favoriten = new int[name.size()];//{android.R.drawable.btn_star_big_off, android.R.drawable.btn_star_big_on, android.R.drawable.btn_star_big_off}; - int[] favoriten_state = new int[name.size()]; + int image;// =new int[MainActivity.xml.getDeviceNames().size()];// {R.drawable.red_signal, R.drawable.green_signal, R.drawable.red_signal}; + int favorite_image ;//= new int[MainActivity.xml.getDeviceNames().size()];//{android.R.drawable.btn_star_big_off, android.R.drawable.btn_star_big_on, android.R.drawable.btn_star_big_off}; + //int[] favoriten_state = new int[MainActivity.xml.getDeviceNames().size()]; @Override public View onCreateView(LayoutInflater inflater, @@ -52,7 +52,7 @@ public class AllIOsFragment extends Fragment { @Override public int getCount() { - return name.size(); + return MainActivity.xml.getDeviceNames().size(); } @Override @@ -69,17 +69,18 @@ public class AllIOsFragment extends Fragment { @Override public View getView(int i, View view, ViewGroup viewGroup) { - if(MainActivity.uebergabe.read(name.get(i))=="FALSE") - { - images[i]=R.drawable.red_signal; - }else { - images[i] = R.drawable.green_signal; + if(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="TRUE") { + image=R.drawable.green_signal; + }else if (MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))=="FALSE") { + image = R.drawable.red_signal; } - if(favoriten_state[i]==0) - { - favoriten[i]=android.R.drawable.btn_star_big_off; + 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 { - favoriten[i] = android.R.drawable.btn_star_big_on; + favorite_image = android.R.drawable.btn_star_big_off; } view = getLayoutInflater().inflate(R.layout.listview_layout, null); ImageView imageView = (ImageView) view.findViewById(R.id.images); @@ -90,21 +91,21 @@ public class AllIOsFragment extends Fragment { ButtonView_Favoriten.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view){ - if(favoriten_state[i]==0){ - favoriten_state[i]=1; - favoriten[i]=android.R.drawable.btn_star_big_on; - ButtonView_Favoriten.setImageResource(favoriten[i]); - }else{ - favoriten_state[i]=0; - favoriten[i]=android.R.drawable.btn_star_big_off; - ButtonView_Favoriten.setImageResource(favoriten[i]); + if (MainActivity.favorite.getFavorites().contains(MainActivity.xml.getDeviceNames().get(i))) { + MainActivity.favorite.removeFavorite(MainActivity.xml.getDeviceNames().get(i)); + favorite_image = android.R.drawable.btn_star_big_off; + ButtonView_Favoriten.setImageResource(favorite_image); + }else { + MainActivity.favorite.addFavorite(MainActivity.xml.getDeviceNames().get(i)); + favorite_image = android.R.drawable.btn_star_big_on; + ButtonView_Favoriten.setImageResource(favorite_image); } } }); - imageView.setImageResource(images[i]); - TextView_Name.setText(name.get(i)); - TextView_State.setText(MainActivity.uebergabe.read(name.get(i))); - ButtonView_Favoriten.setImageResource(favoriten[i]); + imageView.setImageResource(image); + TextView_Name.setText(MainActivity.xml.getDeviceNames().get(i)); + TextView_State.setText(MainActivity.uebergabe.read(MainActivity.xml.getDeviceNames().get(i))); + ButtonView_Favoriten.setImageResource(favorite_image); return view; } } From eeac813bef58aeded83f35b3cfd12d3dfd90428a Mon Sep 17 00:00:00 2001 From: m_broelemann Date: Mon, 28 Dec 2020 18:26:42 +0100 Subject: [PATCH 4/4] =?UTF-8?q?=C3=9Cbergabe=20von=20IFavorites=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APED/app/src/main/java/com/example/aped/MainActivity.java | 4 ++++ 1 file changed, 4 insertions(+) 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 ff967c5..373578c 100644 --- a/APED/app/src/main/java/com/example/aped/MainActivity.java +++ b/APED/app/src/main/java/com/example/aped/MainActivity.java @@ -14,7 +14,9 @@ import android.widget.Toast; import com.example.aped.communication.IIO; import com.example.aped.utils.ExternalStorageHandler; import com.example.aped.communication.TestIO; +import com.example.aped.utils.IFAVORITES; import com.example.aped.utils.IXML; +import com.example.aped.utils.TestFavorites; import com.example.aped.utils.TestXML; import com.example.aped.utils.XMLHandler; import com.google.android.material.navigation.NavigationView; @@ -51,6 +53,8 @@ public class MainActivity extends AppCompatActivity { public static IXML xml = new TestXML(); /** zur Verwendung von uebergabe anstatt der direkten Einbindung.*/ public static IIO uebergabe = new TestIO(); + /** zur Verwendung von favorite anstatt der direkten Einbindung.*/ + public static IFAVORITES favorite = new TestFavorites(); /** allgemeines.*/ @Override