|
@@ -1,4 +1,3 @@
|
|
|
-
|
|
|
const app = getApp();
|
|
|
let xBlufi = require("../../../utils/blufi/xBlufi.js");
|
|
|
import strings from '../../../utils/strings.js';
|
|
@@ -31,6 +30,7 @@ Page({
|
|
|
onLoad: function (options) {
|
|
|
var that = this;
|
|
|
var param = options.param;
|
|
|
+ console.log("ddddd==aaa==" + JSON.stringify(param));
|
|
|
if (!strings.isEmpty(param)) {
|
|
|
param = JSON.parse(param);
|
|
|
that.setData({
|
|
@@ -70,9 +70,12 @@ Page({
|
|
|
// {"type":"4","result":true,"data":{"progress":100,"ssid":"muzen\u0000"}}
|
|
|
funListenDeviceMsgEvent: function (options) {
|
|
|
var that = this;
|
|
|
+ console.log("ddddd==00==" + options.type);
|
|
|
+ console.log("ddddd==11==" + JSON.stringify(options));
|
|
|
switch (options.type) {
|
|
|
// {"type":"2","result":true,"data":{"deviceId":"7C:DF:A1:FD:3A:F2","serviceId":"0000FFFF-0000-1000-8000-00805F9B34FB",
|
|
|
// "characteristicId":"0000FF01-0000-1000-8000-00805F9B34FB"}}
|
|
|
+ // 2
|
|
|
case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
|
|
|
if (options.result) {
|
|
|
console.log('初始化成功');
|
|
@@ -91,6 +94,7 @@ Page({
|
|
|
// {"type":"4","result":false,"data":{"progress":0,"ssid":""}}
|
|
|
// {"type":"4","result":true,"data":{"progress":100,"ssid":"muzen\u0000"}}
|
|
|
///连接结果
|
|
|
+ // 4
|
|
|
case xBlufi.XBLUFI_TYPE.TYPE_CONNECT_ROUTER_RESULT:
|
|
|
if (!options.result) {
|
|
|
errTi = setTimeout(() => {
|
|
@@ -138,6 +142,7 @@ Page({
|
|
|
break;
|
|
|
|
|
|
///设备连接状态回调
|
|
|
+ // -2
|
|
|
case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED:
|
|
|
that.setData({
|
|
|
connected: options.result
|