|
@@ -57,10 +57,10 @@ App({
|
|
|
|
|
|
///显示界面
|
|
///显示界面
|
|
wx.onAppShow(() => {
|
|
wx.onAppShow(() => {
|
|
- if (that.globalData.userInfo !== null) {
|
|
|
|
- if (!(that.globalData.client && that.globalData.client.connected)) {
|
|
|
|
- that.connect();
|
|
|
|
- }
|
|
|
|
|
|
+ console.log("gadsfasdfaf==22==");
|
|
|
|
+ if (!(that.globalData.client && that.globalData.client.connected)) {
|
|
|
|
+ console.log("gadsfasdfaf==333==");
|
|
|
|
+ that.connect();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -95,10 +95,16 @@ App({
|
|
///连接设备
|
|
///连接设备
|
|
connect() {
|
|
connect() {
|
|
var that = this;
|
|
var that = this;
|
|
- that.globalData.client = mqtt.connect(host, that.globalData.options);
|
|
|
|
|
|
+ var options = that.globalData.options;
|
|
|
|
+ console.log("gadsfasdfaf==444==");
|
|
|
|
+ that.globalData.client = mqtt.connect(host, options);
|
|
|
|
+ console.log("gadsfasdfaf==555==" + that.globalData.client);
|
|
|
|
+ console.log("gadsfasdfaf==aaaa==" + JSON.stringify(that.globalData.client));
|
|
|
|
+ console.log("gadsfasdfaf==666==" + that.globalData.client.connected);
|
|
|
|
|
|
// 设备连接
|
|
// 设备连接
|
|
that.globalData.client.on('connect', () => {
|
|
that.globalData.client.on('connect', () => {
|
|
|
|
+ console.log("gadsfasdfaf==777==");
|
|
var pages = getCurrentPages();
|
|
var pages = getCurrentPages();
|
|
var length = pages.length;
|
|
var length = pages.length;
|
|
var currentPage = pages[length - 1];
|
|
var currentPage = pages[length - 1];
|