From caff513958ed7834df0819cf5cf47fb4716601b3 Mon Sep 17 00:00:00 2001
From: Jeffrey Martin <Animeman1999@gmail.com>
Date: Sat, 5 Dec 2015 13:15:37 -0500
Subject: [PATCH] adds menu control for output
---
.../broadcom/app/wicedsense/MainActivity.java | 16 +++++++++++++---
.../com/broadcom/ui/ExitConfirmFragment.java | 5 +----
.../app/src/main/res/layout/database_output.xml | 7 +++++++
WicedSense/app/src/main/res/menu/main.xml | 2 +-
WicedSense/app/src/main/res/values/strings.xml | 2 ++
5 files changed, 24 insertions(+), 8 deletions(-)
create mode 100644 WicedSense/app/src/main/res/layout/database_output.xml
diff --git a/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java b/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java
index d4248a2..f9f3fba 100644
--- a/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java
+++ b/WicedSense/app/src/main/java/com/broadcom/app/wicedsense/MainActivity.java
@@ -567,6 +567,8 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
*/
@Override
public boolean onOptionsItemSelected(MenuItem item) {
+ boolean isDeviceSelected = (mSenseManager != null && mSenseManager.getDevice() != null);
+ boolean isDeviceConnected = isDeviceSelected && mSenseManager.isConnectedAndAvailable();
switch (item.getItemId()) {
case R.id.action_connectdisconnect:
mConnectDisconnectPending = true;
@@ -576,8 +578,13 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
case R.id.action_pick:
launchDevicePicker();
return true;
- case R.id.update_fw:
- checkForFirmwareUpdate();
+ case R.id.data_dump:
+ if (isDeviceConnected){
+ Toast.makeText(this,R.string.disconnect_message, Toast.LENGTH_SHORT).show();
+ }else {
+ DataDump();
+ }
+
return true;
case R.id.get_fw_info:
getFirmwareInfo();
@@ -591,6 +598,7 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
return false;
}
+
/**
* Callback invoked when the user finishes with the license agreement dialog
*/
@@ -1116,5 +1124,7 @@ public class MainActivity extends Activity implements OnLicenseAcceptListener,
mDatabase.insert(WicedDBSchema.ThermoTable.NAME, null, values);
}
-
+ public void DataDump(){
+ Log.d(JEFF_TAG, "Place data dump in ExitConfirmFragment.java");
+ }
}
diff --git a/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java b/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java
index fe03234..9dcf585 100644
--- a/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java
+++ b/WicedSense/app/src/main/java/com/broadcom/ui/ExitConfirmFragment.java
@@ -76,7 +76,6 @@ public class ExitConfirmFragment extends DialogFragment implements
if (mCallback != null) {
try {
if (which == AlertDialog.BUTTON_POSITIVE) {
- databaseDump();
mCallback.onExit();
} else if (which == AlertDialog.BUTTON_NEGATIVE) {
mCallback.onExitCancelled();
@@ -86,8 +85,6 @@ public class ExitConfirmFragment extends DialogFragment implements
}
}
}
- public void databaseDump (){
- Log.d(JEFF_TAG, "Place data dump in ExitConfirmFragment.java");
- }
+
}
diff --git a/WicedSense/app/src/main/res/layout/database_output.xml b/WicedSense/app/src/main/res/layout/database_output.xml
new file mode 100644
index 0000000..fb3d8a2
--- /dev/null
+++ b/WicedSense/app/src/main/res/layout/database_output.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/WicedSense/app/src/main/res/menu/main.xml b/WicedSense/app/src/main/res/menu/main.xml
index 1ec6444..221cefc 100644
--- a/WicedSense/app/src/main/res/menu/main.xml
+++ b/WicedSense/app/src/main/res/menu/main.xml
@@ -33,7 +33,7 @@
<item
android:id="@+id/data_dump"
android:orderInCategory="200"
- android:title="@string/update_fw"/>
+ android:title="@string/data_dump"/>
<item
android:id="@+id/get_fw_info"
android:orderInCategory="200"
diff --git a/WicedSense/app/src/main/res/values/strings.xml b/WicedSense/app/src/main/res/values/strings.xml
index d229dda..07439bd 100644
--- a/WicedSense/app/src/main/res/values/strings.xml
+++ b/WicedSense/app/src/main/res/values/strings.xml
@@ -43,6 +43,8 @@
<string name="setting_title_gyro">Gyro</string>
<string name="setting_title_ecompass">eCompass</string>
<string name="setting_title_accelerometer">Accelerometer</string>
+ <string name="data_dump">Data Dump</string>
+ <string name="disconnect_message">Disconnect from Wiced first.</string>
<string-array name="temperature_scale_type_names">
<item>Fahrenheit</item>
--
GitLab