新增身高体重设备

app/src/main/java/vinno/sportinspect/bean/WeightHeightEntity.java

@@ -0,0 +1,16 @@
+package vinno.sportinspect.bean;
+
+import androidx.annotation.Keep;
+
+/**
+ * @name： SportInspect
+ * @author： melon
+ * @time： 2024/3/4 14:42
+ * @version： 1.0
+ * @description：身高体重
+ */
+@Keep
+public class WeightHeightEntity {
+    public double WEIGHT;
+    public double HEIGHT;
+}

app/src/main/java/vinno/sportinspect/config/Constant.java

@@ -104,4 +104,9 @@ public class Constant {
     public static final String VIAN_BP700X_CHARACTERISTICS_WRITE_UUID = "00002a37-0000-1000-8000-00805f9b34fb"; //写入
     public static final String VIAN_BP700X_CHARACTERISTICS_READ_UUID = "00002a36-0000-1000-8000-00805f9b34fb"; //通知
 
+
+    //上禾身高体重测量秤
+    public static final String SHE20_SERVER_UUID = "53480001-534d-4152-542d-455343414c45"; //serverid
+    public static final String SHE20_CHARACTERISTICS_WRITE_UUID = "53480002-534d-4152-542d-455343414c45"; //写入
+    public static final String SHE20_CHARACTERISTICS_READ_UUID = "53480003-534d-4152-542d-455343414c45"; //通知
 }

app/src/main/java/vinno/sportinspect/config/DevicesConstant.java

@@ -46,6 +46,7 @@ public class DevicesConstant {
             add(new Device(11, EnumDeviceTypes.ONEHEART.typeName(), "BP750X-heart", "单导心电", "单导心电(威宝龙)", "00:00:00:00:00:00", "750X-", "HeartByBP750X", true, "单导心电", "heart", false, EnumDevicesType.BLE.value()));
             add(new Device(12, EnumDeviceTypes.BLOODFAT.typeName(), "xuezhi", "血脂", "血脂(三诺)", "00:00:00:00:00:00", "", "UrineBC401BTDialog", true, "血脂", "bloodfat", false, EnumDevicesType.BLE.value()));
             add(new Device(13, EnumDeviceTypes.ICREADER.typeName(), "iDR211-L2", "人证阅读器", "人证阅读器(精伦)", "00:00:00:00:00:00", "iDR2", "ICReaderByIDR211", true, "人证阅读器", "bloodfat", false, EnumDevicesType.BLE.value()));
+            add(new Device(14, EnumDeviceTypes.WEIGHT_HEIGHT.typeName(), "SH-E20", "身高体重测量秤", "身高体重测量秤(上禾)", "00:00:00:00:00:00", "SH-eScale", "WeightHeightBySHE20", true, "身高体重测量秤", "bmi", false, EnumDevicesType.BLE.value()));
         }
     };
     public static void main(String[] args) {

app/src/main/java/vinno/sportinspect/config/StatusConstant.java

@@ -133,4 +133,11 @@ public class StatusConstant {
 
     public static int BT_MEASURE_HEART_TWELVE_LEADOFF  = 1907;//	心电导联脱落
 //    public static int BT_MEASURE_TWELVE_NOISE = 1902;//	心电测量有噪声
+
+    /**
+     * 身高体重秤
+     */
+    public static int BLE_CHECKONLINE_WEIGHTHEIGHT  = 2001;//	检查身高体重秤在线
+    public static int BLE_MEASURE_WEIGHTHEIGHT_STARTED  = 2002;//	身高体重秤启动测量
+    public static int BLE_MEASURE_WEIGHTHEIGHT_RESULT  = 2003;//	身高体重秤测量结果
 }

app/src/main/java/vinno/sportinspect/devices/WeightHeightBySHE20.java

@@ -0,0 +1,181 @@
+package vinno.sportinspect.devices;
+
+import androidx.annotation.Keep;
+
+import com.clj.fastble.BleManager;
+import com.clj.fastble.callback.BleNotifyCallback;
+import com.clj.fastble.callback.BleWriteCallback;
+import com.clj.fastble.data.BleDevice;
+import com.clj.fastble.exception.BleException;
+
+import org.json.JSONObject;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import vinno.sportinspect.bean.WeightHeightEntity;
+import vinno.sportinspect.config.Constant;
+import vinno.sportinspect.config.StatusConstant;
+import vinno.sportinspect.utils.log.LogUtil;
+
+/**
+ * @name： SportInspect
+ * @author： melon
+ * @time： 2024/3/4 14:27
+ * @version： 1.0
+ * @description：上禾E20身高体重秤
+ */
+@Keep
+public class WeightHeightBySHE20 extends BaseDevices {
+    @Override
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
+//        //判断是否配对
+//        if (!isBound(mac)) {
+//            callBack(StatusConstant.BLE_NO_BOUND);
+//            return;
+//        }
+        connect(mac, (bleDevice, isFirst) -> {
+            if (isFirst == 0) notifyDataChange(bleDevice);
+        });
+    }
+
+    private void notifyDataChange(BleDevice bleDevice) {
+        BleManager.getInstance().notify(bleDevice, Constant.SHE20_SERVER_UUID, Constant.SHE20_CHARACTERISTICS_READ_UUID, new BleNotifyCallback() {
+            @Override
+            public void onNotifySuccess() {
+                LogUtil.d("vinno==>BleManager---> indicate success");
+                checkOnline();
+            }
+
+            @Override
+            public void onNotifyFailure(BleException exception) {
+                LogUtil.d("vinno==>BleManager---> indicate fail ---   " + exception.getDescription());
+                BleManager.getInstance().stopNotify(bleDevice, Constant.SHE20_SERVER_UUID, Constant.SHE20_CHARACTERISTICS_READ_UUID);
+                disConnectDevice();
+                callBack(StatusConstant.BLE_REGISTER_NOTIFY_FAIL);
+            }
+
+            @Override
+            public void onCharacteristicChanged(byte[] data) {
+                parseData(data);
+            }
+        });
+    }
+
+    @Override
+    public void parseData(byte[] data) {
+        String result = new String(data);
+        LogUtil.d("vinno==>BleManager--->parseData: " + result);
+
+        if (result.equals("$60")) {
+            onCheckOnlineCallbcak(result);
+        } else if (result.equals("$11")) {
+            onStartMeasureCallbcak(result);
+        } else {
+            handleResultData(result);
+        }
+    }
+
+
+    /**
+     * 处理测量结果数据
+     *
+     * @param result
+     */
+    private void handleResultData(String result) {
+        final String[] dataList = result.split("\r\n");
+        for (int i = 0; i < dataList.length; i++) {
+            final String data = dataList[i];
+            if (data.startsWith("W:")) {
+                onWeightHeightCallbcak(data);
+                break;
+            }
+        }
+    }
+
+    /**
+     * 检查设备在线
+     */
+    private void checkOnline() {
+        LogUtil.d("WeightHeightBySHE20==>CheckOnline");
+        sendCommand("10$");
+    }
+
+    /**
+     * 启动测量
+     */
+    private void startMeasure() {
+        LogUtil.d("WeightHeightBySHE20==>StartMeasure");
+        sendCommand("11$");
+    }
+
+    /**
+     * 回调 - 检查设备在线
+     */
+    private void onCheckOnlineCallbcak(String result) {
+        LogUtil.d("WeightHeightBySHE20==>OnCheckOnlineCallbcak, Result: " + result);
+        if (result.equals("$60")) {
+            startMeasure();
+        }
+    }
+
+    /**
+     * 回调 - 启动测量
+     */
+    private void onStartMeasureCallbcak(String result) {
+        LogUtil.d("WeightHeightBySHE20==>OnStartMeasureCallbcak, Result: " + result);
+    }
+
+    /**
+     * 回调 - 身高体重结果
+     */
+    private void onWeightHeightCallbcak(String result) {
+        // W:075.8 H:172.5
+        // LogUtil.d("WeightHeightBySHE20==>OnWeightHeightCallbcak, Result: " + result);
+        float w = 0, h = 0;
+        Pattern pattern = Pattern.compile("W:(\\d+\\.\\d+) H:(\\d+\\.\\d+)");
+        Matcher matcher = pattern.matcher(result);
+        if (matcher.find()) {
+            String wStr = matcher.group(1);
+            String hStr = matcher.group(2);
+            w = Float.parseFloat(wStr);
+            h = Float.parseFloat(hStr);
+        }
+        final WeightHeightEntity entity = new WeightHeightEntity();
+        entity.WEIGHT = w;
+        entity.HEIGHT = h;
+        callBack(StatusConstant.BLE_MEASURE_WEIGHTHEIGHT_RESULT, entity);
+    }
+
+    /**
+     * 发送命令
+     *
+     * @param command
+     */
+    private void sendCommand(String command) {
+        final byte[] bytes = command.getBytes();
+        sendCommandData(bytes);
+    }
+
+
+    /**
+     * 发送命令数据
+     *
+     * @param data
+     */
+    private void sendCommandData(byte[] data) {
+        // 数据下发服务，属性为无应答写入，当手机需要发送数据给外设的时候，直接通过这个服务发送数据即可。
+        BleManager.getInstance().write(bleDeviceConnection, Constant.SHE20_SERVER_UUID, Constant.SHE20_CHARACTERISTICS_WRITE_UUID, data, new BleWriteCallback() {
+            @Override
+            public void onWriteSuccess(int current, int total, byte[] justWrite) {
+                LogUtil.d("=============write success");
+            }
+
+            @Override
+            public void onWriteFailure(BleException exception) {
+                LogUtil.d("=============write fail");
+            }
+        });
+    }
+}

app/src/main/java/vinno/sportinspect/enums/EnumDeviceTypes.java

@@ -18,6 +18,7 @@ public enum EnumDeviceTypes {
     ONEHEART("heart"),
     BLOODFAT("bloodfat"),
     ICREADER("ic_reader"),
+    WEIGHT_HEIGHT("weight_height"),
     URINE("urine");
     String typeName;
     private EnumDeviceTypes(String typeName) {

demo/src/main/java/com/vinno/sdk/demo/SplashScreenActivity.java

@@ -33,7 +33,7 @@ public class SplashScreenActivity extends AppCompatActivity {
 
     private TextView tv_result;
     private Spinner spinner;
-    private String[] types = new String[]{"temp", "weight", "sugar", "urine", "lung", "spo2", "nibp", "heart", "ic_reader", "twelveheart"};
+    private String[] types = new String[]{"temp", "weight", "sugar", "urine", "lung", "spo2", "nibp", "heart", "ic_reader", "twelveheart","weight_height"};
     String typeName = types[0];
     private Spinner spinnerTypeResult;
     List<String> models = new ArrayList<>();
@@ -288,6 +288,16 @@ public class SplashScreenActivity extends AppCompatActivity {
             request("PARSE_TWELVE_ECG_RESULT");
         });
 
+        //连接身高体重
+        findViewById(R.id.bt_connect_weight_height).setOnClickListener(v -> {
+            request("BLUETOOTH_CONNECT");
+        });
+        //断开身高体重连接
+        findViewById(R.id.bt_disconnect_weight_height).setOnClickListener(v -> {
+            request("BLE_DISCONNECT");
+        });
+
+        //bt_connect_weight_height
     }
 
     void request(String action) {

demo/src/main/res/layout/activity_splash_screen.xml

@@ -433,6 +433,40 @@
                 android:layout_height="wrap_content"
                 android:text="停止读卡" />
         </LinearLayout>
+
+        <!--> 身高体重秤 <-->
+        <LinearLayout
+            android:id="@+id/ll_weight_height"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="选择型号："
+                android:textStyle="bold" />
+
+            <Spinner
+                android:id="@+id/weight_height_spinner"
+                android:layout_width="@dimen/dp_150"
+                android:layout_height="wrap_content"></Spinner>
+
+            <Button
+                android:id="@+id/bt_connect_weight_height"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:text="连接身高体重秤" />
+
+            <Button
+                android:id="@+id/bt_disconnect_weight_height"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:text="断开身高体重秤" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
     <TextView