From 8f9b06184f2babb7283d55d33c6a55c5359346b2 Mon Sep 17 00:00:00 2001 From: weiwentan23 Date: Wed, 6 Oct 2021 14:28:16 +0800 Subject: [PATCH 1/3] Fix issue in AA-252, disconnect does not work --- .../androidradiodriver/AndroidBleRadioByteCommunication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5e9c8f85..5dcc4a75 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java @@ -169,7 +169,7 @@ public void onCharacteristicChanged(byte[] data) { @Override public void disconnect() { - + BleManager.getInstance().disconnectAllDevice(); } @Override From 3e7a1dd0137e8a1f97a8d6a9a65b4839d8a5e6cb Mon Sep 17 00:00:00 2001 From: weiwentan23 Date: Thu, 7 Oct 2021 15:29:16 +0800 Subject: [PATCH 2/3] update fix in AA-252 to be device specific --- .../androidradiodriver/AndroidBleRadioByteCommunication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5dcc4a75..81cd1356 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/androidradiodriver/AndroidBleRadioByteCommunication.java @@ -169,7 +169,7 @@ public void onCharacteristicChanged(byte[] data) { @Override public void disconnect() { - BleManager.getInstance().disconnectAllDevice(); + BleManager.getInstance().disconnect(mBleDevice); } @Override From aeaa4ceeb94009ddd9ea75b30fd3fa78bee716c6 Mon Sep 17 00:00:00 2001 From: weiwentan23 Date: Fri, 8 Oct 2021 11:55:04 +0800 Subject: [PATCH 3/3] fix AA-253, listed plot signals inconsistent issue --- .../guiUtilities/supportfragments/SignalsToPlotFragment.java | 3 +-- .../shimmerresearch/shimmerserviceexample/MainActivity.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/SignalsToPlotFragment.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/SignalsToPlotFragment.java index 77f12060..781706f9 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/SignalsToPlotFragment.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/guiUtilities/supportfragments/SignalsToPlotFragment.java @@ -196,9 +196,8 @@ public static String joinStrings(String[] a){ public void setDeviceNotStreamingView() { String[] notStreamingMsg = new String[]{"Device not streaming", "Signals to plot can only be displayed when device is streaming"}; - ArrayAdapter adapter = new ArrayAdapter(context, android.R.layout.simple_list_item_1, notStreamingMsg); + ArrayAdapter adapter = new ArrayAdapter(getActivity(), android.R.layout.simple_list_item_1, notStreamingMsg); setListAdapter(adapter); } - } 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 d0edecb8..fd63137e 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java +++ b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmerserviceexample/MainActivity.java @@ -358,6 +358,7 @@ public void onShimmerDeviceSelected(String macAddress, String deviceName) { dynamicPlot = plotFragment.getDynamicPlot(); mService.stopStreamingAllDevices(); + signalsToPlotFragment.setDeviceNotStreamingView(); } @Override