do not show second sensor data if only one sensor selected

vitas · Apr 20, 2019 · 9ec91a5 · 9ec91a5
1 parent 46ec973
commit 9ec91a5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothBaseActivity.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothBaseActivity.java
@@ -35,7 +35,7 @@ public class BluetoothBaseActivity extends AppCompatActivity {
     protected Handler mHandler ;
     protected boolean mIsBound;
     protected BluetoothPipe mBluetoothPipe;
-    protected ArrayList<DeviceTag> mDeviceTags;
+    protected ArrayList<DeviceTag> mDeviceTags = new ArrayList<>();;
     protected boolean autoStart;
 
     protected ServiceConnection serviceConnection = new ServiceConnection() {
@@ -144,9 +144,6 @@ public void onDataReceived(byte[] data, String message) {
         mBluetoothPipe.setBluetoothConnectionListener(new BluetoothPipe.BluetoothConnectionListener() {
             public void onDeviceConnected(DeviceTag deviceTag) {
 
-                if (mDeviceTags == null) {
-                    mDeviceTags = new ArrayList<>();
-                }
                 mDeviceTags.add(deviceTag);
 
                 Toast.makeText(getApplicationContext()

diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPipe.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/BluetoothPipe.java
@@ -67,7 +67,10 @@ public boolean isDiscovery() {
     }
 
     public boolean cancelDiscovery() {
-        return mBluetoothAdapter.cancelDiscovery();
+        if (mBluetoothAdapter != null) {
+            return mBluetoothAdapter.cancelDiscovery();
+        }
+        return false;
     }
 
     public void setupService(BluetoothService blService, Handler handler) {

diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowActivity.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowActivity.java
@@ -207,6 +207,8 @@ public void onChanged(@Nullable ThrowGauge user) {
             }
         });
 
+        mGaugeViewModel.setMultiDevice(mDeviceTags.size()>1);
+
         this.RunMode = 0;
 
         mHandler = new DataHandler();

diff --git a/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGaugeViewModel.java b/app/src/main/java/com/pitchgauge/j9pr/pitchgauge/ThrowGaugeViewModel.java
@@ -12,6 +12,7 @@
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.v4.content.res.ResourcesCompat;
+import android.view.View;
 
 import java.text.DecimalFormat;
 import java.util.Locale;
@@ -22,6 +23,7 @@
 public class ThrowGaugeViewModel extends AndroidViewModel implements Observable {
     private PropertyChangeRegistry callbacks = new PropertyChangeRegistry();
     private Handler mHandler;
+    private boolean mMultiDevice;
 
     @Override
     public void addOnPropertyChangedCallback(
@@ -353,6 +355,10 @@ public Drawable getMaxTravelColor2() {
             return ResourcesCompat.getDrawable(getApplication().getResources(), R.drawable.layout_range_green, null);
     }
 
+    public int getSecondSensorVisible() {
+        return mMultiDevice?View.VISIBLE:View.GONE;
+    }
+
     public void setMinTravel(String value){
         int d = Integer.parseInt(value);
         getThrowGauge().getValue().SetMinTravel(d);
@@ -426,4 +432,8 @@ public double parseDecimal(String input) throws ParseException {
         }
         return number.doubleValue();
     }
+
+    public void setMultiDevice(boolean multiDevice) {
+        mMultiDevice = multiDevice;
+    }
 }
diff --git a/app/src/main/res/layout/throw_activity.xml b/app/src/main/res/layout/throw_activity.xml
@@ -83,6 +83,7 @@
                 android:gravity="center|center_horizontal"
                 android:padding="4dp"
                 android:text="@{CommandthrowViewModel.Angle2}"
+                android:visibility="@{CommandthrowViewModel.secondSensorVisible}"
                 android:textSize="34sp" />
 
         </LinearLayout>
@@ -132,6 +133,7 @@
                 android:gravity="center|center_horizontal"
                 android:padding="4dp"
                 android:text="@{CommandthrowViewModel.Travel2}"
+                android:visibility="@{CommandthrowViewModel.secondSensorVisible}"
                 android:textColor="@android:color/white"
                 android:textSize="34sp" />
 
@@ -178,6 +180,7 @@
                 android:background="@drawable/rounded_back"
                 android:gravity="center"
                 android:text="@{CommandthrowViewModel.MaxTravel2}"
+                android:visibility="@{CommandthrowViewModel.secondSensorVisible}"
                 android:textSize="24sp" />
 
             <Button
@@ -237,6 +240,7 @@
                 android:background="@drawable/rounded_back"
                 android:gravity="center"
                 android:text="@{CommandthrowViewModel.MinTravel2}"
+                android:visibility="@{CommandthrowViewModel.secondSensorVisible}"
                 android:textSize="24sp" />
 
             <Button
-Original file line number
+Diff line change
@@ Expand Up / @@ -207,6 +207,8 @@ public void onChanged(@Nullable ThrowGauge user) { @@
                 }
             });
+            mGaugeViewModel.setMultiDevice(mDeviceTags.size()>1);
             this.RunMode = 0;
             mHandler = new DataHandler();
@@ Expand Down @@