From 81abe18e825728a82c2f99f5d6a830aae6766f5d Mon Sep 17 00:00:00 2001 From: weiwentan23 Date: Tue, 2 Nov 2021 14:03:34 +0800 Subject: [PATCH 1/3] Add bin file directory text --- .../supportfragments/DataSyncFragment.java | 2 ++ .../AndroidBleRadioByteCommunication.java | 2 +- .../res/layouts/fragments/layout/data_sync.xml | 14 ++++++++++++++ .../shimmerserviceexample/MainActivity.java | 7 +++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/DataSyncFragment.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/DataSyncFragment.java index 2324e7b7..46be6d46 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/DataSyncFragment.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/DataSyncFragment.java @@ -19,6 +19,7 @@ public class DataSyncFragment extends Fragment { public static EditText editTextTrialName; public static TextView TextViewPayloadIndex; public static TextView TextViewSpeed; + public static TextView TextViewDirectory; public DataSyncFragment() { // Required empty public constructor @@ -46,6 +47,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { editTextTrialName = (EditText) getView().findViewById(R.id.trialName); TextViewPayloadIndex = (TextView) getView().findViewById(R.id.payloadIndex); TextViewSpeed = (TextView) getView().findViewById(R.id.speed); + TextViewDirectory = (TextView) getView().findViewById(R.id.directory); super.onActivityCreated(savedInstanceState); } diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java index 0b12185a..4896e4c4 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java @@ -193,7 +193,7 @@ public void onWriteFailure(BleException exception) { public void stop() { } - public String convertMacIDtoUUID(String MacID) { + public static String convertMacIDtoUUID(String MacID) { String uuid = "00000000-0000-0000-0000-"; return uuid + MacID.replace(":", ""); } diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/res/layouts/fragments/layout/data_sync.xml b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/res/layouts/fragments/layout/data_sync.xml index 15901478..468f006a 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/res/layouts/fragments/layout/data_sync.xml +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/res/layouts/fragments/layout/data_sync.xml @@ -43,6 +43,20 @@ android:textSize="14dp" android:inputType="text"/> + + + Date: Tue, 2 Nov 2021 14:34:17 +0800 Subject: [PATCH 2/3] Some update on the bin file directory text --- .../shimmerresearch/shimmerserviceexample/MainActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java index d855f00c..51dab3d3 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java +++ b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java @@ -66,6 +66,7 @@ public class MainActivity extends AppCompatActivity implements ConnectedShimmers SignalsToPlotFragment signalsToPlotFragment; DataSyncFragment dataSyncFragment; public String selectedDeviceAddress, selectedDeviceName; + String binFileDirectory; boolean mServiceFirstTime; XYPlot dynamicPlot; @@ -189,7 +190,7 @@ public boolean onOptionsItemSelected(MenuItem item) { mDevice3.setTrialName(trialName); mDevice3.setParticipantID(participantName); mDevice3.getMapOfVerisenseProtocolByteCommunication().get(COMMUNICATION_TYPE.BLUETOOTH).setRootPathForBinFile(android.os.Environment.getExternalStorageDirectory().getAbsolutePath()); - DataSyncFragment.TextViewDirectory.setText("Directory : " + String.format("%s/%s/%s/%s/BinaryFiles", android.os.Environment.getExternalStorageDirectory().getAbsolutePath(), trialName, participantName, UUID)); + binFileDirectory = String.format("%s/%s/%s/%s/BinaryFiles", android.os.Environment.getExternalStorageDirectory().getAbsolutePath(), trialName, participantName, UUID); mDevice3.getMapOfVerisenseProtocolByteCommunication().get(COMMUNICATION_TYPE.BLUETOOTH).readLoggedData(); } return true; @@ -403,6 +404,7 @@ public void handleMessage(Message msg) { } else if(msg.what == Shimmer.MSG_IDENTIFIER_SYNC_PROGRESS){ SyncProgressDetails mDetails = (SyncProgressDetails)((CallbackObject)msg.obj).mMyObject; + DataSyncFragment.TextViewDirectory.setText("Directory : " + binFileDirectory); DataSyncFragment.TextViewPayloadIndex.setText("Current Payload Index : " + Integer.toString(mDetails.mPayloadIndex)); DataSyncFragment.TextViewSpeed.setText("Speed(KBps) : " + Double.toString(mDetails.mTransferRateBytes/1024)); } From d0324d303b5e05f37941ee646fdb2ce5a2b98fae Mon Sep 17 00:00:00 2001 From: weiwentan23 Date: Wed, 3 Nov 2021 14:18:11 +0800 Subject: [PATCH 3/3] change the implementation of bin file directory label --- .../ShimmerAndroidInstrumentDriver/build.gradle | 4 ++-- .../AndroidBleRadioByteCommunication.java | 4 +--- .../shimmerServiceExample/build.gradle | 4 ++-- .../shimmerserviceexample/MainActivity.java | 10 ++-------- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index 9d0be86b..b16c3562 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -74,13 +74,13 @@ dependencies { compile files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar') compile files('libs/AndroidBluetoothLibrary.jar') compile files('libs/androidplot-core-0.5.0-release.jar') - implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.7'){ + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.8'){ // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'com.google.protobuf' exclude group: 'org.apache.commons.math' } - implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.7'){ + implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.8'){ // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'com.google.protobuf' diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java index 4896e4c4..3fd2f001 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java @@ -183,7 +183,6 @@ public void onWriteSuccess(int current, int total, byte[] justWrite) { @Override public void onWriteFailure(BleException exception) { - System.out.println("Write Fail"); } }); @@ -193,13 +192,12 @@ public void onWriteFailure(BleException exception) { public void stop() { } - public static String convertMacIDtoUUID(String MacID) { + public String convertMacIDtoUUID(String MacID) { String uuid = "00000000-0000-0000-0000-"; return uuid + MacID.replace(":", ""); } public String getUuid() { - //"00000000-0000-0000-0000-E7EC37A0D234" return convertMacIDtoUUID(this.mMac); } } diff --git a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle index 865471b0..d472008e 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle @@ -41,13 +41,13 @@ android { dependencies { compile project(':ShimmerAndroidInstrumentDriver') - implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.7'){ + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManagerDev', version:'JA-56 v0.8'){ // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'com.google.protobuf' exclude group: 'org.apache.commons.math' } - implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.7'){ + implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-56 v0.8'){ // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'com.google.protobuf' diff --git a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java index 51dab3d3..30717d91 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java +++ b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java @@ -37,14 +37,12 @@ import com.shimmerresearch.android.guiUtilities.ShimmerDialogConfigurations; import com.shimmerresearch.android.guiUtilities.supportfragments.SignalsToPlotFragment; import com.shimmerresearch.android.shimmerService.ShimmerService; -import com.shimmerresearch.androidradiodriver.AndroidBleRadioByteCommunication; import com.shimmerresearch.bluetooth.ShimmerBluetooth; import com.shimmerresearch.driver.CallbackObject; import com.shimmerresearch.driver.ObjectCluster; import com.shimmerresearch.driver.ShimmerDevice; import com.shimmerresearch.exceptions.ShimmerException; import com.shimmerresearch.driver.Configuration.COMMUNICATION_TYPE; -import com.shimmerresearch.verisense.VerisenseDevice; import com.shimmerresearch.verisense.communication.SyncProgressDetails; import com.shimmerresearch.android.VerisenseDeviceAndroid; @@ -66,7 +64,6 @@ public class MainActivity extends AppCompatActivity implements ConnectedShimmers SignalsToPlotFragment signalsToPlotFragment; DataSyncFragment dataSyncFragment; public String selectedDeviceAddress, selectedDeviceName; - String binFileDirectory; boolean mServiceFirstTime; XYPlot dynamicPlot; @@ -186,11 +183,9 @@ public boolean onOptionsItemSelected(MenuItem item) { VerisenseDeviceAndroid mDevice3 = (VerisenseDeviceAndroid)mService.getShimmer(selectedDeviceAddress); String participantName = DataSyncFragment.editTextParticipantName.getText().toString(); String trialName = DataSyncFragment.editTextTrialName.getText().toString(); - String UUID = AndroidBleRadioByteCommunication.convertMacIDtoUUID(selectedDeviceAddress); mDevice3.setTrialName(trialName); mDevice3.setParticipantID(participantName); mDevice3.getMapOfVerisenseProtocolByteCommunication().get(COMMUNICATION_TYPE.BLUETOOTH).setRootPathForBinFile(android.os.Environment.getExternalStorageDirectory().getAbsolutePath()); - binFileDirectory = String.format("%s/%s/%s/%s/BinaryFiles", android.os.Environment.getExternalStorageDirectory().getAbsolutePath(), trialName, participantName, UUID); mDevice3.getMapOfVerisenseProtocolByteCommunication().get(COMMUNICATION_TYPE.BLUETOOTH).readLoggedData(); } return true; @@ -347,7 +342,6 @@ public int getItemPosition(Object object) { return PagerAdapter.POSITION_NONE; } } - private Handler mHandler = new Handler() { public void handleMessage(Message msg) { if(msg.what == ShimmerBluetooth.MSG_IDENTIFIER_STATE_CHANGE) { @@ -373,7 +367,6 @@ public void handleMessage(Message msg) { if(dataSyncFragment != null){ DataSyncFragment.TextViewPayloadIndex.setText(""); DataSyncFragment.TextViewSpeed.setText(""); - DataSyncFragment.TextViewDirectory.setText(""); } break; case CONNECTING: @@ -395,6 +388,8 @@ public void handleMessage(Message msg) { break; case STREAMING_LOGGED_DATA: Toast.makeText(getApplicationContext(), "Data Sync: " + shimmerName + " " + macAddress, Toast.LENGTH_SHORT).show(); + VerisenseDeviceAndroid mDevice3 = (VerisenseDeviceAndroid)mService.getShimmer(selectedDeviceAddress); + DataSyncFragment.TextViewDirectory.setText("Directory : " + mDevice3.getDataFilePath()); break; case DISCONNECTED: Toast.makeText(getApplicationContext(), "Device disconnected: " + shimmerName + " " + macAddress, Toast.LENGTH_SHORT).show(); @@ -404,7 +399,6 @@ public void handleMessage(Message msg) { } else if(msg.what == Shimmer.MSG_IDENTIFIER_SYNC_PROGRESS){ SyncProgressDetails mDetails = (SyncProgressDetails)((CallbackObject)msg.obj).mMyObject; - DataSyncFragment.TextViewDirectory.setText("Directory : " + binFileDirectory); DataSyncFragment.TextViewPayloadIndex.setText("Current Payload Index : " + Integer.toString(mDetails.mPayloadIndex)); DataSyncFragment.TextViewSpeed.setText("Speed(KBps) : " + Double.toString(mDetails.mTransferRateBytes/1024)); }