|
@@ -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为空的情况
|