1、12导心电修改

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

@@ -13,11 +13,10 @@ public class RequestConstant {
     public final  static  String SEARCH_START_BT = "SEARCH_START_BT";
     public final  static  String SEARCH_STOP = "SEARCH_STOP";
 
-    public final  static  String BLE_CONNECT = "BLE_CONNECT";
+    public final  static  String BLUETOOTH_CONNECT = "BLUETOOTH_CONNECT";
     public final  static  String BLE_DISCONNECT = "BLE_DISCONNECT";
     public final  static  String BLE_IS_CONNECTED = "BLE_IS_CONNECTED";
 
-    public final  static  String BT_CONNECT = "BT_CONNECT";
 
     public final  static  String BT_DISCONNECT = "BT_DISCONNECT";
     public final  static  String BT_IS_CONNECTED = "BT_IS_CONNECTED";
@@ -26,4 +25,5 @@ public class RequestConstant {
     public final  static  String STOP_NIBP = "STOP_NIBP";
     public final  static  String RESULT_NIBP = "RESULT_NIBP";
 
+
 }

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

@@ -75,7 +75,7 @@ abstract public class BaseDevices {
         this.onBleMeasureResultListener = onBleMeasureResultListener;
     }
     //连接设备
-    public  void BLE_CONNECT(JSONObject params){
+    public  void BLUETOOTH_CONNECT(JSONObject params){
         String mac = null;
         try {
             mac = params.getString("MAC");
@@ -83,21 +83,8 @@ abstract public class BaseDevices {
             throw new RuntimeException(e);
         }
         this.mac = mac;
-
     }
 
-    // 连接经典蓝牙
-    public  void BT_CONNECT(JSONObject params){
-        String mac = null;
-        try {
-            mac = params.getString("MAC");
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        this.mac = mac;
-
-
-    }
     //连接蓝牙函数
     public void connect(String mac, OnBleConnectSuccessListener onBleConnectSuccessListener){
         if (isConnecting) {
@@ -198,6 +185,4 @@ abstract public class BaseDevices {
             callBack( BLE_SUPPORT_METHOD );
         }
     }
-
-
 }

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

@@ -26,8 +26,8 @@ import vinno.sportinspect.utils.log.LogUtil;
 @Keep
 public class BoolSugarBeneCheck extends BaseDevices {
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac,  (bleDevice,isFirst)  -> {
             if( isFirst == 0 ) notifyDataChange(bleDevice);
         });

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

@@ -31,8 +31,8 @@ import vinno.sportinspect.utils.log.LogUtil;
 public class BoolSugarIsens extends BaseDevices {
 
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         //判断是否配对
         if (!isBound(mac)) {
             callBack(StatusConstant.BLE_NO_BOUND);

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

@@ -41,8 +41,8 @@ import com.vivachek.protocol.enums.WarnCodeEnums;
 @Keep
 public class BoolSugarVivachek extends BaseDevices implements ParseListener {
     @Override
-    public void BLE_CONNECT(JSONObject params) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
         Parse.INSTANCE.setParseListener(this);
         connect(mac, (bleDevice, isFirst) -> {
             if (isFirst == 0) notifyDataChange(bleDevice);

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

@@ -40,8 +40,8 @@ public class HeartByBP750X extends BaseDevices {
     private RecordList rec_n = new RecordList();
 
     @Override
-    public void BLE_CONNECT(JSONObject params) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac, (bleDevice, isFirst) -> {
             if (isFirst == 0) notifyDataChange(bleDevice);
         });

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

@@ -5,6 +5,7 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
 import com.clj.fastble.BleManager;
@@ -54,6 +55,7 @@ public class HeartByECGWS12 extends BaseDevices{
     final TwelveHeartEntity entity = new TwelveHeartEntity();
 
     private EcgPoint []srcDataBuffer = new EcgPoint[srcDataBufferSize];
+    Handler handler = new Handler(Looper.getMainLooper());
 
     class nativeMsg extends NativeCallBack {
 
@@ -61,12 +63,7 @@ public class HeartByECGWS12 extends BaseDevices{
         public void callHRMsg(short hr) {// 心率
             mHandler.obtainMessage(MESSAGE_UPDATE_HR, hr).sendToTarget();
             entity.HR =  hr;
-//            LogUtil.d("gxy+" + hr);
-//            callBack(StatusConstant.BT_MEASURE_HEART_TWELVE_RESULT, entity);
-            //            System.out.println(Arrays.toString(wave));
-//            callBack(StatusConstant.BT_MEASURE_HEART_TWELVE_RESULT, Arrays.toString(wave).substring(0, 10));
         }
-
         @Override
         public void callLeadOffMsg(String flagOff) {// 导联脱落
             // Log.e("LF", flagOff);
@@ -80,6 +77,7 @@ public class HeartByECGWS12 extends BaseDevices{
 
         @Override
         public void callCaseStateMsg(short state) {
+            /// TODO 开始存储文件
 //            if (state == 0) {
 //                Log.e("Save", "start");// 开始存储文件
 //            } else {
@@ -88,22 +86,26 @@ public class HeartByECGWS12 extends BaseDevices{
         }
 
         @Override
-        public void callHBSMsg(short hbs) {// 心率 hbs = 1表示有心跳
+        public void callHBSMsg(short hbs) {
+            /// TODO 心率 hbs = 1表示有心跳
             // Log.e("HeartBeat", "Sound"+hbs);
         }
 
         @Override
-        public void callBatteryMsg(short per) {// 采集盒电量
+        public void callBatteryMsg(short per) {
+            /// TODO 采集盒电量
             // Log.e("Battery", ""+per);
         }
 
         @Override
-        public void callCountDownMsg(short per) {// 剩余存储时长
+        public void callCountDownMsg(short per) {
+            /// TODO 剩余存储时长
             // Log.e("CountDown", ""+per);
         }
 
         @Override
         public void callWaveColorMsg(boolean flag) {
+            /// TODO 当测量稳定后可以改变颜色
 //            Log.e("WaveColor", "" + flag);
 //            if (flag) {
 //                // 波形稳定后颜色变为绿色
@@ -114,7 +116,6 @@ public class HeartByECGWS12 extends BaseDevices{
         }
         @Override
         public void callEcgWaveDataMsg(short[] wave) {
-            // TODO Auto-generated method stub
 
             if (mEcgQueue != null) {
                 Vector<EcgPoint> points = convertEcg(wave);
@@ -124,15 +125,21 @@ public class HeartByECGWS12 extends BaseDevices{
                     }
                 }
                 entity.POINT = mEcgQueue;
-                if(mEcgQueue.size() %(1250*12) ==0) {
-                    callBack(StatusConstant.BT_MEASURE_HEART_TWELVE_RESULT, entity);
+                if(mEcgQueue.size() %(125*12*5) ==0) {
+                    if (mEcgQueue.size() % (125 * 12 * 5) == 0) {
+                        handler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                callBack(StatusConstant.BT_MEASURE_HEART_TWELVE_RESULT, entity);
+                            }
+                        });
+                    }
                 }
             }
 
         }
         @Override
         public void callEcg18WaveDataMsg(short[] wave) {
-            // TODO Auto-generated method stub
 //            if (mEcgQueue != null) {
 //                for (int i = 72; i < 90; i++) {
 //                    mEcgQueue.offer(wave[i]);
@@ -141,7 +148,6 @@ public class HeartByECGWS12 extends BaseDevices{
         }
         @Override
         public void callEcg15WaveDataMsg(short[] wave) {
-            // TODO Auto-generated method stub
 //            if (mEcgQueue != null) {
 //                for (int i = 60; i < 75; i++) {
 //                    mEcgQueue.offer(wave[i]);
@@ -150,13 +156,11 @@ public class HeartByECGWS12 extends BaseDevices{
         }
         @Override
         public void callVcgWaveDataMsg(short[] wave) {
-            // TODO Auto-generated method stub
 
         }
 
         @Override
         public void callVcgWaveRPosMsg(int[] flag) {
-            // TODO Auto-generated method stub
 
         }
 
@@ -279,8 +283,8 @@ public class HeartByECGWS12 extends BaseDevices{
     };
 
     @Override
-    public void BT_CONNECT(JSONObject params) {
-        super.BT_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
         /// 蓝牙采集
         data = new DataUtils(BleManager.getInstance().getContext(), mac,DataUtils.ECG_LEAD_WILSON,false,
                 new BluConnectionStateListener() {
@@ -309,11 +313,11 @@ public class HeartByECGWS12 extends BaseDevices{
                                 -1).sendToTarget();
                     }
                 });
-
+        LogUtil.d("开始采集12导心电");
         data.gatherStart(new nativeMsg());
+    }
 
 
-    }
 
     @Override
     public void parseData(byte[] data) {

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

@@ -68,8 +68,8 @@ public class ICReaderByIDR211 extends BaseDevices {
 
 
     @Override
-    public void BLE_CONNECT(JSONObject params) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
 
         final BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(this.mac);
         readerTask.setBleDevice(device);

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

@@ -41,8 +41,8 @@ public class LungByContec extends BaseDevices {
     private BluetoothDevice bluetoothDevice;
     private boolean isScaning = false;//是否正在扫描
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         if (sdk == null) {
             initSdk();
         }

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

@@ -40,8 +40,8 @@ import vinno.sportinspect.utils.Utils;
 public class NibpByAOJ30B extends BaseDevices{
 
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac,  (bleDevice,isFirst)  -> {
             if( isFirst == 0 ) notifyDataChange(bleDevice);
         } );

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

@@ -37,8 +37,8 @@ public class NibpByBP750X extends BaseDevices {
     private RecordList rec_n = new RecordList();
 
     @Override
-    public void BLE_CONNECT(JSONObject params) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac, (bleDevice, isFirst) -> {
             if (isFirst == 0) notifyDataChange(bleDevice);
         });

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

@@ -51,8 +51,8 @@ public class NibpByYE620C extends BaseDevices {
     private BluetoothGattService otaService;
     private BluetoothGattCharacteristic otaCharacteristic;
     @Override
-    public void BLE_CONNECT(JSONObject params) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac, (bleDevice, isFirst) -> {
             if (isFirst == 0) connect(bleDevice);
         });

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

@@ -26,8 +26,8 @@ import vinno.sportinspect.utils.Utils;
 public class Spo2ByAOJ70B extends BaseDevices{
 
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac,  (bleDevice,isFirst)  -> {
             if( isFirst == 0 ) notifyDataChange(bleDevice);
         } );

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

@@ -24,8 +24,8 @@ abstract public class TempBasic extends BaseDevices {
     protected String SERVER_UUID;
     protected String CHARACTERISTICS_UUID;
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac,  (bleDevice,isFirst)  -> {
             if( isFirst == 0 ) notifyDataChange(bleDevice);
         });

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

@@ -24,10 +24,10 @@ import vinno.sportinspect.utils.Utils;
 public class TempByAOJ20A extends TempBasic {
     protected float minTemp = 32, maxTemp = 42.9f;
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
         this.SERVER_UUID = Constant.AOJ_20A_SERVER_UUID;
         this.CHARACTERISTICS_UUID = Constant.AOJ_20A_CHARACTERISTICS_READ_UUID;
-        super.BLE_CONNECT(params);
+        super.BLUETOOTH_CONNECT(params);
     }
     @Override
     public void parseData(byte[] data) {

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

@@ -23,10 +23,10 @@ import vinno.sportinspect.utils.Utils;
 public class TempByDT extends TempBasic{
     protected float minTemp = 32, maxTemp = 42.5f;
     @Override
-    public  void BLE_CONNECT(JSONObject params ) {
+    public  void BLUETOOTH_CONNECT(JSONObject params ) {
         this.SERVER_UUID = Constant.TEP_SERVER_UUID;
         this.CHARACTERISTICS_UUID = Constant.TEP_CHARACTERISTICS_UUID;
-        super.BLE_CONNECT(params);
+        super.BLUETOOTH_CONNECT(params);
     }
     @Override
     public void parseData(byte[] data) {

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

@@ -23,10 +23,10 @@ import vinno.sportinspect.utils.log.LogUtil;
 public class TempByYuwell extends TempBasic {
     protected float minTemp = 32, maxTemp = 43;
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
         this.SERVER_UUID = Constant.YUWELL_TEP_SERVER_UUID;
         this.CHARACTERISTICS_UUID = Constant.YUWELL_TEP_CHARACTERISTICS_UUID;
-        super.BLE_CONNECT(params);
+        super.BLUETOOTH_CONNECT(params);
     }
     @Override
     public void parseData(byte[] data) {

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

@@ -39,8 +39,8 @@ public class UrineByBC401BT extends  BaseDevices{
     private ContecDevice bluetoothDevice;
     private boolean isScaning = false;//是否正在扫描
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         if (sdk == null) {
             initSdk();
         }

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

@@ -28,8 +28,8 @@ import vinno.sportinspect.utils.log.LogUtil;
 @Keep
 public class UrineByUi1 extends BaseDevices{
     @Override
-    public void BLE_CONNECT(JSONObject params ) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params ) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac, new OnBleConnectSuccessListener() {
             @Override
             public void onBleConnectSuccess(BleDevice bleDevice, int isFirst) {

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

@@ -27,8 +27,8 @@ import vinno.sportinspect.utils.log.LogUtil;
 public class WeightEHome extends BaseDevices{
 
     @Override
-    public void BLE_CONNECT(JSONObject params) {
-        super.BLE_CONNECT(params);
+    public void BLUETOOTH_CONNECT(JSONObject params) {
+        super.BLUETOOTH_CONNECT(params);
         connect(mac,  (bleDevice,isFirst)  -> {
             if( isFirst == 0 ) notifyDataChange(bleDevice);
         } );

demo/build.gradle

@@ -31,7 +31,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    //implementation fileTree(dir: 'libs', include: ['*.aar'])
+//    implementation fileTree(dir: 'libs', include: ['*.aar'])
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.6.0'
     testImplementation 'junit:junit:4.13.2'

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

@@ -131,7 +131,12 @@ public class SplashScreenActivity extends AppCompatActivity {
             });
             JSONObject params = new JSONObject();
             try {
-                params.put("ACTION", "SEARCH_START");
+                if(typeName == "twelveheart") {
+                    params.put("ACTION", "SEARCH_START_BT");
+
+                }else {
+                    params.put("ACTION", "SEARCH_START");
+                }
                 params.put("TYPE", typeName); //不传就是搜索全部设备
                 params.put("SCAN_TIMEOUT", 10000);//50秒
                 VinnnoVnoteSdk.getInstance().request(params);
@@ -147,7 +152,7 @@ public class SplashScreenActivity extends AppCompatActivity {
 
         //体温测量
         findViewById(R.id.bt_connect_temp).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //断开体温计
         findViewById(R.id.bt_disconnect_temp).setOnClickListener(v -> {
@@ -156,7 +161,7 @@ public class SplashScreenActivity extends AppCompatActivity {
 
         //体重秤
         findViewById(R.id.bt_connect_weight).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //断开体重秤
         findViewById(R.id.bt_disconnect_weight).setOnClickListener(v -> {
@@ -165,7 +170,7 @@ public class SplashScreenActivity extends AppCompatActivity {
         });
         //血糖仪
         findViewById(R.id.bt_connect_sugar).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //断开血糖仪
         findViewById(R.id.bt_disconnect_sugar).setOnClickListener(v -> {
@@ -173,7 +178,7 @@ public class SplashScreenActivity extends AppCompatActivity {
         });
 
         findViewById(R.id.bt_connect_lung).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //断开血糖仪
         findViewById(R.id.bt_disconnect_lung).setOnClickListener(v -> {
@@ -181,7 +186,7 @@ public class SplashScreenActivity extends AppCompatActivity {
         });
         //尿液分析仪
         findViewById(R.id.bt_connect_urine).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //断开尿液分析仪
         findViewById(R.id.bt_disconnect_urine).setOnClickListener(v -> {
@@ -189,7 +194,7 @@ public class SplashScreenActivity extends AppCompatActivity {
         });
         //连接血氧仪
         findViewById(R.id.bt_connect_spo2).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //断开血氧仪
         findViewById(R.id.bt_disconnect_spo2).setOnClickListener(v -> {
@@ -199,7 +204,7 @@ public class SplashScreenActivity extends AppCompatActivity {
         //request( "USER_DATA_CALLBACK");  收到离线数据回调
         //连接血压计
         findViewById(R.id.bt_connect_nibp).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //获取结果
         findViewById(R.id.bt_resNibp).setOnClickListener(v -> {
@@ -242,7 +247,7 @@ public class SplashScreenActivity extends AppCompatActivity {
 
         //连接心电
         findViewById(R.id.bt_connect_heart).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //断开心电
         findViewById(R.id.bt_disconnect_heart).setOnClickListener(v -> {
@@ -252,7 +257,7 @@ public class SplashScreenActivity extends AppCompatActivity {
 
         //开始读身份证
         findViewById(R.id.bt_connect_ic_reader).setOnClickListener(v -> {
-            request("BLE_CONNECT");
+            request("BLUETOOTH_CONNECT");
         });
         //停止读身份证
         findViewById(R.id.bt_disconnect_ic_reader).setOnClickListener(v -> {
@@ -261,11 +266,13 @@ public class SplashScreenActivity extends AppCompatActivity {
 
         //开始十二导心电
         findViewById(R.id.bt_connect_twelvehear).setOnClickListener(v -> {
-            request("BT_CONNECT");
+            request("BLUETOOTH_CONNECT");
+
         });
         //停止十二导心电
         findViewById(R.id.bt_disconnect_twelvehear).setOnClickListener(v -> {
-            request("BT_DISCONNECT");
+//            request("BLE_DISCONNECT");
+            request("GATHER_START");
         });
 
     }