modified Android datalogging

openxc · Jul 24, 2014 · eb60534 · eb60534
1 parent 9ad872d
commit eb60534
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/Android/ConnectedWiper/res/layout/fragment_main.xml b/Android/ConnectedWiper/res/layout/fragment_main.xml
@@ -21,17 +21,6 @@
         android:textColor="#F5F5F5"
         android:textSize="18sp" />
 
-    <TextView
-        android:id="@+id/dataLogging"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/status"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="80dp"
-        android:text="The raining status data log is being stored in the wiper_data.txt file in Downloads \n 
-the daily raining time log is being stored in the daily_record.txt file in Downloads"
-        android:textColor="#F5F5F5" />
-
     <TextView
         android:id="@+id/btStatus"
         android:layout_width="wrap_content"
@@ -85,17 +74,6 @@ the daily raining time log is being stored in the daily_record.txt file in Downl
         android:textColor="#F5F5F5"
         android:textSize="25sp" />
 
-    <TextView
-        android:id="@+id/heavyHour"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/lightRain"
-        android:layout_alignRight="@+id/dataLogging"
-        android:layout_marginRight="13dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="#F5F5F5"
-        android:textSize="20sp" />
-
     <TextView
         android:id="@+id/lightHour"
         android:layout_width="wrap_content"
@@ -128,4 +106,24 @@ the daily raining time log is being stored in the daily_record.txt file in Downl
         android:text="CLEAR"
         android:textColor="#F5F5F5" />
 
+    <TextView
+        android:id="@+id/heavyHour"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/lightRain"
+        android:layout_alignRight="@+id/status"
+        android:layout_marginRight="50dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="#F5F5F5"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/dataLogging"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/status"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="91dp"
+        android:textColor="#F5F5F5" />
+
 </RelativeLayout>
diff --git a/Android/ConnectedWiper/src/com/ford/svl/connectedwiper/MainActivity.java b/Android/ConnectedWiper/src/com/ford/svl/connectedwiper/MainActivity.java
@@ -54,6 +54,7 @@ public class MainActivity extends Activity {
 	TextView heavyHour;
 	TextView lightRain;
 	TextView lightHour;
+	TextView dataLogging;
 	Switch bt;
     BluetoothAdapter mBluetoothAdapter;
     BluetoothSocket socket;
@@ -93,6 +94,7 @@ public void onCreate(Bundle savedInstanceState) {
         wiperStatus = (TextView) findViewById(R.id.wiper);
     	btStatus = (TextView) findViewById(R.id.btStatus);
     	bt = (Switch)  findViewById(R.id.bluetooth); 
+    	dataLogging = (TextView) findViewById(R.id.dataLogging);
     	clearButton = (Button) findViewById(R.id.clearButton);
     	recordButton = (Button) findViewById(R.id.recordButton);
     	heavyRain = (TextView) findViewById(R.id.heavyRain);
@@ -140,6 +142,7 @@ public void onClick(View v) {
             			+ "m " + String.valueOf(h_sec) + "s, " + "Light rain " + String.valueOf(l_hrs) + "h " 
     					+ String.valueOf(l_min) + "m " + String.valueOf(l_sec) + "s";
     			user_record.writeToFile(dailyRecord +"\n");
+    			dataLogging.setText("The raining status data log is being stored in the user_record.txt file in Downloads");
     		}
     	});
 
@@ -165,6 +168,7 @@ public void onClick(View v) {
     					+ "m " + String.valueOf(l_sec) + "s";
     			heavyHour.setText(heavy_display);
     			lightHour.setText(light_display);
+    			dataLogging.setText("The raining status time has been cleared.");
     		}
     	});
 
@@ -246,6 +250,7 @@ void timeAdjustment() {
         			+ "m " + String.valueOf(l_sec) + "s";
      		heavyHour.setText(heavy_display);
      		lightHour.setText(light_display);
+     		dataLogging.setText("The raining status data log is being stored in the daily_record.txt file in Downloads");
 		}
     }
 
@@ -341,6 +346,7 @@ public void run() {
                                     Time now = new Time(Time.getCurrentTimezone());
                             		now.setToNow();
                                     fileManager.writeToFile(now.toString() + "   " + data +"\n");
+                                    dataLogging.setText("The raining status data log is being stored in the wiper_data.txt file in Downloads");
                                     readBufferPosition = 0;
 
                                     handler.post(new Runnable() {

diff --git a/Android/Docs/android.png b/Android/Docs/android.png