|
@@ -33,7 +33,7 @@ Page({
|
|
|
// unConnect scaning connecting connected
|
|
|
connectStateTypes: connectStateTypes,
|
|
|
ble: {
|
|
|
- state: connectStateTypes.scaning,
|
|
|
+ state: connectStateTypes.unConnect,
|
|
|
devName: "",
|
|
|
deviceId: "",
|
|
|
init: false,
|
|
@@ -70,7 +70,7 @@ Page({
|
|
|
let serverUuid = '';
|
|
|
let characteristicUuid = '';
|
|
|
|
|
|
- let server = services.find(s=>s.uuid === controlUuid);
|
|
|
+ let server = bleServices.find(s=>s.uuid === controlUuid);
|
|
|
if(!server)
|
|
|
{
|
|
|
// return bleFail('获取服务失败', '该设备不支持该程序');
|
|
@@ -279,7 +279,7 @@ Page({
|
|
|
|
|
|
async connectServices(){
|
|
|
// uuid FF01
|
|
|
- let [err,res] = await handle(ble.getServices());
|
|
|
+ let [err,res] = await handle(ble.getBleServices());
|
|
|
if(err){ return this.bleFail('获取服务失败', err.errMsg);}
|
|
|
// 保存服务信息;
|
|
|
bleServices = res;
|