浏览代码

1、sdk新增12导联脱落的回调

guanxinyi 1 年之前
父节点
当前提交
82a63eab2d

+ 5 - 1
app/src/main/java/vinno/sportinspect/bean/TwelveHeartEntity.java

@@ -10,7 +10,8 @@ public class TwelveHeartEntity {
     public TwelveHeartEntity(){
         POINT = new ConcurrentLinkedQueue<Short>();
         CURRENTOPERATION = false;
-         RESULTCONCLUSION = null;
+        RESULTCONCLUSION = null;
+        LEADOFF = "";
     }
     public int HR;
     public ConcurrentLinkedQueue<Short> POINT;
@@ -19,4 +20,7 @@ public class TwelveHeartEntity {
     public  boolean CURRENTOPERATION;
 
     public TwelveHeartResultEntity RESULTCONCLUSION;
+
+    /// 导联脱落
+    public String LEADOFF;
 }

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

@@ -128,5 +128,7 @@ public class StatusConstant {
     public  static int BT_MEASURE_HEART_TWELVE_STABLE = 1905;// 心电测量值稳定
 
     public static int BT_MEASURE_HEART_TWELVE_RESULT_CONCLUSION = 1906;//	实时心电测量最终结论
+
+    public static int BT_MEASURE_HEART_TWELVE_LEADOFF  = 1907;//	心电导联脱落
 //    public static int BT_MEASURE_TWELVE_NOISE = 1902;//	心电测量有噪声
 }

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

@@ -53,7 +53,7 @@ public class HeartByECGWS12 extends BaseDevices{
     public static final int MESSAGE_USB_CONNECT_REMOVE_DEVICE = 0xA070;
     public static final int MESSAGE_USB_CONNECT_ERROR_OPEN_DEVICE = 0xD050;
     /// 全量的数据
-    private ConcurrentLinkedQueue<Short> mEcgQueue;
+    private ConcurrentLinkedQueue<Short> mEcgQueue=new ConcurrentLinkedQueue<Short>();
     /// 当前的数据
     private ConcurrentLinkedQueue<Short> cEcgQueue =new ConcurrentLinkedQueue<Short>();
     private class EcgPoint {
@@ -82,7 +82,7 @@ public class HeartByECGWS12 extends BaseDevices{
         @Override
         public void callLeadOffMsg(String flagOff) {// 导联脱落
             // Log.e("LF", flagOff);
-//            mHandler.obtainMessage(MESSAGE_UPDATE_LeadOff, flagOff).sendToTarget();
+            mHandler.obtainMessage(MESSAGE_UPDATE_LeadOff, flagOff).sendToTarget();
         }
 
         @Override
@@ -98,6 +98,8 @@ public class HeartByECGWS12 extends BaseDevices{
                     @Override
                     public void run() {
                         entity.CURRENTOPERATION = true;
+                        entity.RESULTCONCLUSION = null;
+                        entity.LEADOFF = "";
                         callBack(StatusConstant.BT_MEASURE_HEART_TWELVE_START_SAVE_RESULT, entity);
                     }
                 });
@@ -252,6 +254,9 @@ public class HeartByECGWS12 extends BaseDevices{
 //                    textHR.setText(msg.obj.toString() + "bpm");
                     break;
                 case MESSAGE_UPDATE_LeadOff:
+                    entity.RESULTCONCLUSION = null;
+                    entity.LEADOFF = msg.obj.toString();
+                    callBack(StatusConstant.BT_MEASURE_HEART_TWELVE_LEADOFF, entity);
 //                    textLF.setText(msg.obj.toString());
                     break;
                 case MESSAGE_CONNECT_START:
@@ -261,7 +266,6 @@ public class HeartByECGWS12 extends BaseDevices{
                 case MESSAGE_CONNECT_SUCCESS:
 //                    连接成功
                     callBack(StatusConstant.BLE_CONNECT_SUCCESS);
-                    mEcgQueue = new ConcurrentLinkedQueue<Short>();
                     break;
                 case MESSAGE_CONNECT_INTERRUPTED:
 //                    连接中断
@@ -477,6 +481,7 @@ public class HeartByECGWS12 extends BaseDevices{
                 LogUtil.d("twelveHeartResult" + twelveHeartResult.toString());
             entity.RESULTCONCLUSION = twelveHeartResult;
             entity.POINT = new ConcurrentLinkedQueue<Short>();
+            entity.LEADOFF ="";
             callBack(StatusConstant.BT_MEASURE_HEART_TWELVE_RESULT_CONCLUSION, entity);
             } else {
                 // 处理resultElement为空的情况

+ 0 - 0
demo/libs/ecgsdk_library-garea-release-1.8.6_vcg__202401040833.aar → demo/libs/ecgsdk_library.aar