From e7e8f7934691f887ba8fa96c7e30e27b6d1dcd9b Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Wed, 9 Feb 2022 07:36:20 +0000
Subject: [PATCH] Separated data log manager into two screens (local and
 remote) to simplify interface

---
 .../LogManagerControlActivity.java            | 15 +++---
 .../layout/activity_log_manager_control.xml   | 22 ++++----
 .../res/layout/log_entry_layout_remote.xml    | 53 +++++++++++++++++++
 3 files changed, 74 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/res/layout/log_entry_layout_remote.xml

diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
index e3497dd..f5d0bea 100644
--- a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
@@ -233,7 +233,7 @@ public class LogManagerControlActivity extends AppCompatActivity {
 
 
     private void updateUi() {
-        //Log.v(TAG,"updateUi()");
+        Log.i(TAG,"updateUi()");
         boolean stopUpdating = true;
         TextView tv;
         Button btn;
@@ -250,7 +250,7 @@ public class LogManagerControlActivity extends AppCompatActivity {
         } else {
             stopUpdating = false;
         }
-
+        // Local Database ListView
         if (mEventsList != null) {
             ListView lv = (ListView) findViewById(R.id.eventLogListView);
             ListAdapter adapter = new SimpleAdapter(LogManagerControlActivity.this, mEventsList, R.layout.log_entry_layout,
@@ -264,13 +264,16 @@ public class LogManagerControlActivity extends AppCompatActivity {
         // Remote Database List View
         if (mRemoteEventsList != null) {
             ListView lv = (ListView) findViewById(R.id.remoteEventsLv);
-            ListAdapter adapter = new SimpleAdapter(LogManagerControlActivity.this, mRemoteEventsList, R.layout.log_entry_layout,
-                    new String[]{"dataTime", "type", "subType"},
-                    new int[]{R.id.event_date, R.id.event_alarmState, R.id.event_uploaded});
+            ListAdapter adapter = new SimpleAdapter(LogManagerControlActivity.this, mRemoteEventsList, R.layout.log_entry_layout_remote,
+                    new String[]{"dataTime", "type", "subType", "osdAlarmStateStr", "desc"},
+                    new int[]{R.id.event_date_remote_tv, R.id.event_type_remote_tv, R.id.event_subtype_remote_tv,
+                    R.id.event_alarmState_remote_tv, R.id.event_notes_remote_tv});
             lv.setAdapter(adapter);
+            Log.i(TAG,"adapter[0]="+adapter.getItem(0));
+            Log.i(TAG,"adapter[3]="+adapter.getItem(3));
         } else {
             //mUtil.showToast("No Remote Events");
-            Log.d(TAG, "UpdateUi: No Remote Events");
+            Log.i(TAG, "UpdateUi: No Remote Events");
             stopUpdating = false;
         }
 
diff --git a/app/src/main/res/layout/activity_log_manager_control.xml b/app/src/main/res/layout/activity_log_manager_control.xml
index 2792bc3..c08e44b 100644
--- a/app/src/main/res/layout/activity_log_manager_control.xml
+++ b/app/src/main/res/layout/activity_log_manager_control.xml
@@ -106,7 +106,7 @@
         <ListView
             android:id="@+id/eventLogListView"
             android:layout_width="wrap_content"
-            android:layout_height="150dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10dp" />
     </LinearLayout>
 
@@ -123,12 +123,6 @@
             android:text="@string/remote_database"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
-        <ListView
-            android:id="@+id/remoteEventsLv"
-            android:layout_width="wrap_content"
-            android:layout_height="150dp"
-            android:layout_marginTop="10dp" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -145,13 +139,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/authenticate" />
+            <Button
+                android:id="@+id/refresh_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/refreshBtn" />
         </LinearLayout>
 
-        <Button
-            android:id="@+id/refresh_button"
+
+        <ListView
+            android:id="@+id/remoteEventsLv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/refreshBtn" />
+            android:layout_marginTop="10dp" />
+
+
     </LinearLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/log_entry_layout_remote.xml b/app/src/main/res/layout/log_entry_layout_remote.xml
new file mode 100644
index 0000000..ffd6bee
--- /dev/null
+++ b/app/src/main/res/layout/log_entry_layout_remote.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/event_date_remote_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="date" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/event_type_remote_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="---" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=" : " />
+
+        <TextView
+            android:id="@+id/event_subtype_remote_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="---" />
+
+    </LinearLayout>
+    <TextView
+        android:id="@+id/event_alarmState_remote_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="alarm" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="date"
+        android:id="@+id/event_notes_remote_tv" />
+
+    <!--   <TextView
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:text="dataJSON"
+           android:id="@+id/event_dataJSON" />
+   -->
+</LinearLayout>
\ No newline at end of file