|
@@ -581,20 +581,6 @@ Page({
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- onUnload() {
|
|
|
- var that = this;
|
|
|
- if (!strings.isEmpty(that.data.intervalId)) {
|
|
|
- clearInterval(that.data.intervalId);
|
|
|
- that.data.intervalId = null;
|
|
|
- }
|
|
|
- if (app.globalData.client === null) {
|
|
|
- return;
|
|
|
- };
|
|
|
- app.globalData.client.end(true);
|
|
|
- app.globalData.client.end(true);
|
|
|
- app.globalData.client = null;
|
|
|
- },
|
|
|
-
|
|
|
onTapIndex(e) {
|
|
|
var that = this;
|
|
|
var index = e.currentTarget.dataset.index;
|
|
@@ -1036,8 +1022,19 @@ Page({
|
|
|
|
|
|
///销毁蓝牙
|
|
|
onUnload() {
|
|
|
+ var that = this;
|
|
|
+ if (!strings.isEmpty(that.data.intervalId)) {
|
|
|
+ clearInterval(that.data.intervalId);
|
|
|
+ that.data.intervalId = null;
|
|
|
+ }
|
|
|
BtHelper.getInstance().disconnect();
|
|
|
- }
|
|
|
+ if (app.globalData.client === null) {
|
|
|
+ return;
|
|
|
+ };
|
|
|
+ app.globalData.client.end(true);
|
|
|
+ app.globalData.client.end(true);
|
|
|
+ app.globalData.client = null;
|
|
|
+ },
|
|
|
})
|
|
|
|
|
|
// 去掉此功能,先留着吧
|