处理636的兼容

pages/deviceInfo/deviceInfo.js

@@ -5,12 +5,11 @@ Page({
 	data: {
 		deviceConnect: false,
 
-		deviceInfo: null
+		deviceInfo: null,
 	},
 
 	onLoad(options) {
 		this.getDevice();
-		this.initBluetooth();
 
 		app.globalData.ppScale.plugin.bus.subscribe("deviceConnect", (res) => {
 			console.log('deviceInfo ===》deviceConnect', res);
@@ -21,17 +20,8 @@ Page({
 			app.globalData.ppScale.activeProtocol.codeUpdateMTU((res) => {
 				console.log("deviceInfo ===》codeUpdateMTU", res);
 
-				$.ajax("weighingScale/list/device", {}, "GET", false).then((res) => {
-					if(res.result && res.result.length) {
-						let deviceConnect = res.result.some(item => item.macAddress === app.globalData.ppScale.device.mac);
-						if(deviceConnect) {
-							this.setData({
-								deviceConnect: true
-							})
-						} else {
-							app.globalData.ppScale.plugin.Blue.disconnect();
-						}
-					}
+				this.setData({
+					deviceConnect: true
 				})
 			});
 		});
@@ -54,56 +44,27 @@ Page({
 		});
 	},
 
-	async refreshToken(fn, flag) {
-		let bodyToken = wx.getStorageSync('bodyToken');
-		let bodyTokenTime = wx.getStorageSync('bodyTokenTime');
-		if (!bodyToken || bodyTokenTime * 1000 < +new Date() || flag) {
-			let res = await app.globalData.ppScale.plugin.refreshToken({
-				url: "https://uniquehealth.lefuenergy.com",
-				data: {
-					"appKey": app.globalData.ppScale.options.key,
-					"appSecret": app.globalData.ppScale.options.secret
+	getDeviceSettingList() {
+		let seviceList = [];
+		app.globalData.ppScale.device.setting.map(item => {
+			if(this.data.deviceInfo.type === item.deviceName) {
+				seviceList.push(item);
+			}
+		})
+		if(seviceList && seviceList.length) {
+			app.globalData.ppScale.plugin.Blue.setDeviceSetting(seviceList);
+			app.globalData.ppScale.plugin.Blue.start(seviceList[0].deviceName, false);
+			app.globalData.ppScale.plugin.bus.subscribe("devicesList", (res) => {
+				console.log("deviceInfo ===> devicesList", res);
+				let fIndex = res.findIndex(item => item.deviceId === this.data.deviceInfo.deviceId);
+				if (fIndex >= 0) {
+					app.globalData.ppScale.plugin.Blue.stopBluetoothDevicesDiscovery();
+					app.globalData.ppScale.plugin.Blue.createBLEConnection(res[fIndex]);
+					return;
 				}
 			});
-			if (res.data.code == 200) {
-				wx.setStorageSync('bodyToken', res.data.data.token);
-				wx.setStorageSync('bodyTokenTime', res.data.data.expireTime);
-				fn();
-			}
-		} else {
-			fn();
 		}
 	},
-	getDeviceSettingList() {
-		let bodyToken = wx.getStorageSync("bodyToken");
-		app.globalData.ppScale.plugin.getDeviceSettingList({
-			url: "https://uniquehealth.lefuenergy.com",
-			data: {
-				appKey: app.globalData.ppScale.options.key
-			},
-			header: {
-				"token": bodyToken,
-				"Accept-Language": wx.getStorageSync("lang") || 'zh'
-			}
-		}).then((res) => {
-			if (res.data.code == 200) {
-				app.globalData.ppScale.plugin.Blue.setDeviceSetting(res.data.data);
-				app.globalData.ppScale.device.setting = res.data.data;
-				let deviceNames = res.data.data.map(item => item.deviceName);
-				app.globalData.ppScale.plugin.Blue.start(deviceNames, false);
-				app.globalData.ppScale.plugin.bus.subscribe("devicesList", (res_) => {
-					app.globalData.ppScale.plugin.Blue.stopBluetoothDevicesDiscovery();
-					app.globalData.ppScale.plugin.Blue.createBLEConnection(res_[0]);
-				});
-			} else if (res.data.code == 401 || res.data.code == 4008) {
-				// 401 token过期 / 4008 token为空
-				// 重新请求token解析数据
-				this.refreshToken(() => {
-					this.getDeviceSettingList();
-				}, true);
-			}
-		});
-	},
 
 	// 获取已经绑定的设备列表
 	getDevice() {
@@ -112,6 +73,7 @@ Page({
 			this.setData({
 				deviceInfo: res.result[0]
 			})
+			this.initBluetooth();
 		})
 	},
 
@@ -120,7 +82,7 @@ Page({
 			app.globalData.ppScale.activeProtocol.codeClearDeviceData("00", (res) => {
 				console.log("deviceInfo === codeClearDeviceData", res);
 
-				let scaleDeviceId = app.globalData.ppScale.device.mac.replace(/:/g, '');
+				let scaleDeviceId = this.data.deviceInfo.macAddress.replace(/:/g, '');
 				let params = {
 					equipmentCode: scaleDeviceId,
 				};
@@ -141,7 +103,8 @@ Page({
 				icon: "none",
 				title: "删除失败,请靠近设备并点亮后再试"
 			})
-			this.initBluetooth();
+			app.globalData.ppScale.plugin.Blue.stop();
+			this.getDeviceSettingList();
 		}
 	},