Browse Source

1、更新设备

guanxinyi 1 year ago
parent
commit
68dba00f4c

+ 2 - 2
app/src/main/java/vinno/sportinspect/config/DevicesConstant.java

@@ -38,8 +38,8 @@ public class DevicesConstant {
             add(new Device(8, EnumDeviceTypes.WAIST.typeName(), "waist", "腰围尺", "腰围尺", "", "", "WaistToHipDialog", true, "腰臀比", "yaotunbi", true, EnumDevicesType.manual.value()));
             add(new Device(9, EnumDeviceTypes.LUNG.typeName(), "SP80B", "肺活仪", "肺活仪(SP80B)", "00:00:00:00:00:00", "PULMO80B", "LungByContec", true, "肺活仪", "lung", false, EnumDevicesType.BLE.value()));
             //add(new Device(EnumDeviceLungKey.PROJECT_MODEL_VALUE,"A31-W","肺活仪","VINNO肺活仪(A31-W)","00:00:00:00:00:00","A322","LungA31WDialog|fragment_lung", true,"肺活仪","lung", false, EnumDevicesType.BLE.value()));
-            add(new Device(10, EnumDeviceTypes.URINE.typeName(), "Ui-10C", "尿液分析仪", "尿液分析(Ui-10C)", "00:00:00:00:00:00", "BLE-EMP-Ui", "UrineByUi", true, "尿液分析", "urine", false, EnumDevicesType.BLE.value()));// 因为蓝牙名称相同
-            add(new Device(10, EnumDeviceTypes.URINE.typeName(), "Ui-1", "尿液分析仪", "尿液分析(Ui-1)", "00:00:00:00:00:00", "BLE-EMP-Ui", "UrineByUi", true, "尿液分析", "urine", false, EnumDevicesType.BLE.value()));
+//            add(new Device(10, EnumDeviceTypes.URINE.typeName(), "Ui-10C", "尿液分析仪", "尿液分析(Ui-10C)", "00:00:00:00:00:00", "BLE-EMP-Ui", "UrineByUi", true, "尿液分析", "urine", false, EnumDevicesType.BLE.value()));// 因为蓝牙名称相同
+            add(new Device(10, EnumDeviceTypes.URINE.typeName(), "Ui-1", "尿液分析仪", "尿液分析(Ui-1)", "00:00:00:00:00:00", "BLE-EMP-Ui", "UrineByUi1", true, "尿液分析", "urine", false, EnumDevicesType.BLE.value()));
             add(new Device(10, EnumDeviceTypes.URINE.typeName(), "BC401BT", "尿液分析仪", "尿液分析(BT401)", "00:00:00:00:00:00", "BC01", "UrineByBC401BT", true, "尿液分析", "urine", false, EnumDevicesType.BLE.value()));
             add(new Device(11, EnumDeviceTypes.TWELVEHEART.typeName(), "pe1204", "十二导心电", "十二导心电(华清心仪)", "", "", "UrineBC401BTDialog", true, "十二导心电", "heart", false, EnumDevicesType.jump.value())); //跳转到其他app
             add(new Device(11, EnumDeviceTypes.TWELVEHEART.typeName(), "ECGWS12", "十二导心电", "十二导心电(康泰)", "00:00:00:00:00:00", "ECGWS12", "HeartByECGWS12", true, "十二导心电", "heart", false, EnumDevicesType.BT.value()));

+ 4 - 4
app/src/main/java/vinno/sportinspect/devices/HeartByECGWS12.java

@@ -293,14 +293,14 @@ public class HeartByECGWS12 extends BaseDevices {
                     mEcgQueue = new ConcurrentLinkedQueue<Short>();
                     callBack(StatusConstant.BLE_CONNECT_SUCCESS);
                     /// 设置基线滤波
-                    data.setFilter(4);
-                    LogUtil.d("设置基线滤波");
+                    data.setFilter(7);
+                    LogUtil.d("设置滤波全开");
                     /// 设置强的基线滤波
-                    data.setDftCmd(2);
+                    data.setDftCmd(1);
                     break;
                 case MESSAGE_CONNECT_INTERRUPTED:
 //                    连接中断
-                    callBack(StatusConstant.BLE_DISCONNECT);
+                    callBack(StatusConstant.BLE_CONNECT_FAIL);
                     LogUtil.d("连接中断");
                     mEcgQueue = null;
                     break;