|
@@ -48,6 +48,7 @@ import io.mega.megablelib.MegaBleBuilder;
|
|
|
import io.mega.megablelib.MegaBleCallback;
|
|
|
import io.mega.megablelib.MegaBleClient;
|
|
|
import io.mega.megablelib.MegaBleConst;
|
|
|
+import io.mega.megablelib.MegaRawdataConfig;
|
|
|
import io.mega.megablelib.enums.MegaBleBattery;
|
|
|
import io.mega.megablelib.model.MegaBleDevice;
|
|
|
import io.mega.megablelib.model.bean.MegaAdvOnly;
|
|
@@ -233,7 +234,7 @@ public class CommonController extends BaseController{
|
|
|
*/
|
|
|
|
|
|
@PostMapping(value ="/connect/bluetooth/{model}",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
|
|
|
- public Result<Object> connectBluetooth( @PathVariable("model") String model,@RequestBody ConnectBluetoothRequestParam param){
|
|
|
+ public Result<Object> connectBluetooth( @PathVariable("model") String model,@RequestBody ConnectBluetoothRequestParam param) throws InterruptedException {
|
|
|
|
|
|
Log.i(TAG,param.getMac());
|
|
|
fileName = "测试文件名称";
|
|
@@ -329,7 +330,7 @@ public class CommonController extends BaseController{
|
|
|
//notice UI modify rssi
|
|
|
@Override
|
|
|
public void onRssiReceived(int rssi) {
|
|
|
-
|
|
|
+ Log.d("rssi","--------"+rssi);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -375,7 +376,7 @@ public class CommonController extends BaseController{
|
|
|
// mock id, key,use yours
|
|
|
MegaBleBuilder builder = new MegaBleBuilder();
|
|
|
try{
|
|
|
- megaBleClient = builder
|
|
|
+ megaBleClient = new MegaBleBuilder()
|
|
|
.withSecretId("D4CE5DD515F81247")
|
|
|
.withSecretKey("uedQ2MgVEFlsGIWSgofHYHNdZSyHmmJ5")
|
|
|
.withContext(MainActivity.context)
|
|
@@ -385,8 +386,12 @@ public class CommonController extends BaseController{
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
// 开发测试时,可以开启debug
|
|
|
- megaBleClient.setDebugEnable(true);
|
|
|
+ megaBleClient.setDebugEnable(false);
|
|
|
megaBleClient.connect(param.getMac(), param.getName());
|
|
|
+ //Thread.sleep(10000);
|
|
|
+ megaBleClient.enableV2ModePulse(true);//开启脉诊
|
|
|
+ MegaRawdataConfig rawdataConfig = new MegaRawdataConfig(true, false, "", 54378);
|
|
|
+ megaBleClient.enableRawdataPulse(rawdataConfig);
|
|
|
}else if(model.equals(Constant.MODEL_ECG)){
|
|
|
fileName = "心电-"+param.getUserName()+"-"+param.getPhoneNumber()+"-"+DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMddHHmmss");
|
|
|
//connect ECG device
|