670小问题修复

App.vue

@@ -30,8 +30,9 @@
 			
 			uni.getSystemInfo({success:function(res){
 					if(res.uniPlatform=='app'){
-						upgrade.checkAndUpdateWgt();
 						 bleTool.getBleTool();
+						upgrade.checkAndUpdateWgt();
+						
 					}
 			}});
 		},

pages/670/HBY670.vue

@@ -611,7 +611,9 @@
 						},
 						success: (res) => {
 							debugger;
-							let json={persissonType:'670'};
+							let json = {
+								persissonType: '670'
+							};
 							Object.assign(json, this.device);
 							res.eventChannel.emit('share', {
 								data: json
@@ -1050,7 +1052,7 @@
 				});
 			},
 			sosSetting: function(type) {
-				
+debugger;
 				if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 
 					this.showPop({
@@ -1191,7 +1193,7 @@
 							this.Status.staticWarn.time = 0;
 							return;
 						}
-						if (these.formData.qzwarn) {
+						if (these.formData.qzwarn && these.Status.staticWarn.inteval) {
 							console.log("222222");
 							these.showQzWarn(sendRb);
 						} else {
@@ -1212,7 +1214,7 @@
 						return;
 					} else if (type == 'close') {
 
-						if (this.formData.SOS = 'sg') { //解除声光报警
+						if (this.formData.SOS = 'sg' && this.Status.staticWarn.inteval) { //解除声光报警
 							this.CloseWarn(true);
 						} else {
 							this.formData.SOS = type;

pages/common/addBLE/addEquip.vue

@@ -152,6 +152,7 @@
 			these = this;
 			this.EquipMents = [];
 			ble = bleTool.getBleTool();
+			
 			ble.addDeviceFound((arr) => {
 
 				arr = arr.devices;
@@ -201,7 +202,10 @@
 
 			// this.EquipMents = [];
 			this.PairEquip = [];
-			ble && ble.StartSearch().catch((ex) => {
+			ble && ble.StartSearch().then(res=>{
+				console.log("开始搜索成功",res);
+			}).catch((ex) => {
+				console.log("开始搜索出现异常",ex);
 				if (ex.code == 10001) {
 					these.showOpenSetting();
 				}

pages/common/shareDevices/index.vue

@@ -200,13 +200,13 @@
 					const selectedPermissions = this.permissions.filter(permission => permission.checked).map(
 						permission =>
 						permission.value);
-					// const res = await deviceShareAdd({
+					const res = await deviceShareAdd({
-					// 	phonenumber: this.phone,
+						phonenumber: this.phone,
-					// 	smsCode: this.code,
+						smsCode: this.code,
-					// 	deviceId: this.itemInfo.id,
+						deviceId: this.itemInfo.id,
-					// 	permission: selectedPermissions.join(',')
+						permission: selectedPermissions.join(',')
-					// })
+					})
-					let res={code:200};
+					
 					if (res.code == 200) {
 						this.shareShow = true
 						uni.hideLoading()

utils/BleHelper.js

@@ -1,16 +1,17 @@
 import receivTool from "@/utils/BleReceive.js"
 var recei = null;
 const serviceDic = [ //合作供应商的蓝牙主服务
-	{
-		"serviceId": "0000AE30-0000-1000-8000-00805F9B34FB",
-		"writeId": "0000AE03-0000-1000-8000-00805F9B34FB",
-		"notifyId": "0000AE02-0000-1000-8000-00805F9B34FB"
-	},
 {
 		"serviceId": "0000FFE0-0000-1000-8000-00805F9B34FB",
 		"writeId": "0000FFE1-0000-1000-8000-00805F9B34FB",
 		"notifyId": "0000FFE2-0000-1000-8000-00805F9B34FB"
+	},
+	{
+		"serviceId": "0000AE30-0000-1000-8000-00805F9B34FB",
+		"writeId": "0000AE03-0000-1000-8000-00805F9B34FB",
+		"notifyId": "0000AE02-0000-1000-8000-00805F9B34FB"
 	}
+	
 ];
 
 class BleHelper {
@@ -39,7 +40,10 @@ class BleHelper {
 		}
 
 		setTimeout(() => {
+			this.OpenBlue().then(()=>{
 				this.linkAllDevices();
+			});
+			
 		}, 10);
 		this.data = {
 			isOpenBlue: false, //蓝牙模块是否开启
@@ -185,7 +189,7 @@ class BleHelper {
 			key = new Date().getTime();
 		}
 		if (key) {
-			console.log("key=" + key);
+			// console.log("key=" + key);
 			let f = this.cfg.onDeviceFound.findIndex((v) => {
 				return v.key == key;
 			});
@@ -366,6 +370,7 @@ class BleHelper {
 
 		return new Promise((resolve, reject) => {
 			if (this.data.available) {
+				console.log("蓝牙模块是可用状态");
 				resolve({
 					available: this.data.available,
 					discovering: this.data.discovering
@@ -373,6 +378,7 @@ class BleHelper {
 				return;
 			}
 			if (!this.data.isOpenBlue) {
+				console.log("蓝牙模块未打开");
 				resolve({
 					available: false,
 					discovering: false
@@ -381,12 +387,13 @@ class BleHelper {
 			}
 			uni.getBluetoothAdapterState({
 				success: (info) => {
+					console.log("蓝牙状态获取成功,",info)
 					this.data.available = info.available;
 					this.data.discovering = info.discovering;
 					resolve(info);
 				},
 				fail: (ex1) => {
-					////console.log("ex1", ex1);
+					console.log("蓝牙状态获取失败", ex1);
 					let res1 = {
 						available: false,
 						discovering: false
@@ -472,7 +479,7 @@ class BleHelper {
 						});
 
 						uni.onBluetoothDeviceFound((devices) => {
-							// console.log("发现新设备:" + JSON.stringify(devices));
+							 console.log("发现新设备:" + JSON.stringify(devices));
 							this.data.searchList = this.data.searchList.concat(
 								devices);
 							if (this.cfg.onDeviceFound) {
@@ -706,6 +713,7 @@ class BleHelper {
 				// for (let i = 0; i < serviceIds.length; i++) {
 
 				// 	promises.push(RunSearch(serviceIds[i]));
+					
 				// }
 				 promises.push(RunSearch());
 				Promise.all(promises).then(resolve).catch(reject);

utils/Common.js

@@ -257,7 +257,7 @@ export default {
 				value: "42",
 				label: "SOS",
 				checked: false,
-				type: ['210', '6170', '670']
+				type: ['670']
 			}
 		]
 	

utils/request.js

@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-const env = 'production'; //production development  //开发of线上 改这里就行
+const env = 'development'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options"+JSON.stringify(options),BASE.BASE_URL)