From d5ea737449bbb80a0bf9f2da0302c2fe609908e0 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Sun, 15 Sep 2024 17:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=85=B3=E5=BD=95=E5=85=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js |  4 +-
 page_fenbao/zhuce.vue      | 76 ++++++++++++++++++++++++++------------
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 9c734f5..dec621d 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -19,8 +19,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({ 
-			// baseUrl: 'http://192.168.2.81:10002',
-			baseUrl: 'https://kg.chuangtewl.com/prod-api',
+			baseUrl: 'http://192.168.2.81:10002',
+			// baseUrl: 'https://kg.chuangtewl.com/prod-api',
 			// loadingText: '努力加载中~',
 			// loadingTime: 1000,
 			// 设置自定义头部content-type
diff --git a/page_fenbao/zhuce.vue b/page_fenbao/zhuce.vue
index 0507418..78f0f20 100644
--- a/page_fenbao/zhuce.vue
+++ b/page_fenbao/zhuce.vue
@@ -10,7 +10,7 @@
 			<view class="cen">
 				<view class="name">
 					<view class="">
-						状态：<text v-if="item.flags == true" style="color: red;">已录入</text> <text v-else
+						状态：<text v-if="item.flags == true" style="color: #e10328;">已录入</text> <text v-else
 							style="color:seagreen;">未录入</text>
 					</view>
 					<view class="" style="display: flex;">
@@ -31,7 +31,7 @@
 				</view>
 			</view>
 			<view class="rt">
-				<text style="margin-bottom: 10rpx;" :id="item.deviceId" @click="createBLEConnections(item)">开关</text>
+				<text style="margin-bottom: 10rpx;" :id="item.deviceId" @click="createBLEConnections(item)">{{item.lj}}</text>
 				<text @click="scanQRCode(item)" style="margin-bottom: 10rpx;">扫码</text>
 				<text :id="item.deviceId" @click="createBLEConnection(item)">录入</text>
 			</view>
@@ -63,7 +63,6 @@
 <script>
 	const app = getApp();
 	var xBlufi = require("@/page_components/blufi/xBlufi.js");
-	// let _this = null;
 	export default {
 		data() {
 			return {
@@ -211,7 +210,6 @@
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
 						let loadPercent = options.data;
 						let loadText = '文件读取中'
-						// console.log("文件读取中", options.data)
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
 						this.ver_data = this.parseCustomData(options.data)
@@ -236,14 +234,15 @@
 							setTimeout(()=>{
 								this.bluetoothflag = false
 							},3000)
-							uni.hideLoading(); {
+							 {
 								console.log("连接回调options.data.deviceId：" + options.data.deviceId,
 									"连接回调options.data.name：" + options.data.name)
 							}
 						} else {
 							this.shibaiflag = true
 							this.bluetoothflag = false
-							uni.hideLoading()
+							
+							
 						}
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
@@ -255,7 +254,7 @@
 								title: '蓝牙未开启,请打开手机蓝牙',
 								icon: 'none',
 								duration: 3000
-							});
+							})
 						} else {
 							this.searching = true
 						}
@@ -273,7 +272,7 @@
 							})
 							let devicesarr = options.data
 							this.devicesList.forEach(device => {
-								if (device.name.substring(0, 4) == "CTKG" || device.name.substring(0, 4) == "CTPO") {
+								if (device.name.substring(0, 4) == "CCYK") {
 									this.devicesList.push(device);
 									let uniqueDevicesList = Array.from(new Set(this.devicesList));
 									this.devicesLists = uniqueDevicesList.filter(device => {
@@ -283,9 +282,7 @@
 								}
 							})
 							// console.log('蓝牙停止搜索ok')
-							console.log(this.devicesLists, '蓝牙停止');
 							this.mengcflag = false
-							uni.hideLoading()
 							if (this.devicesLists.length == 0) {
 								this.titleflag = true
 							} else {
@@ -304,16 +301,22 @@
 												...device,
 												flags, // 直接使用 flags 变量  
 												sn: '',
+												lj:'连接'
 											}
 										})
 									}
 								})
-								console.log(this.devicesLists,'0202');
+								console.log(this.devicesLists,'0202')
+								setTimeout(()=>{
+									uni.hideLoading()
+								},2000)
 							}
 						} else {
 							//蓝牙停止搜索失败
 							this.mengcflag = false
-							uni.hideLoading()
+							setTimeout(()=>{
+								uni.hideLoading()
+							},2000)
 							console.log('蓝牙停止搜索失败');
 						}
 						this.searching = false
@@ -323,9 +326,6 @@
             
 			// 发送开关
 			createBLEConnections(e) {
-				uni.showLoading({
-					title: '执行中...'
-				})
 				this.arrs = ''
 				this.qrResult = e.name //拿到所点击的mac号
 				if (this.ver_data == null) { //判断是否有连接蓝牙
@@ -334,8 +334,29 @@
 					xBlufi.notifyStartDiscoverBle({
 						'isStart': true
 					})
+					uni.showLoading({
+						title: '连接准备中...'
+					})
 					// 停止蓝牙搜索  
 					setTimeout(() => {
+						setTimeout(()=>{
+							uni.showLoading({
+								title: '连接中...'
+							})
+							setTimeout(()=>{
+								uni.hideLoading()
+								uni.showToast({
+									title: '连接成功',
+									icon: 'success',
+									duration: 2000
+								})
+								this.devicesLists.forEach(item => {
+									if (item.name == this.qrResult) {
+										item.lj = '开关'
+									}
+								})
+							},2000)
+						},500)
 						xBlufi.notifyStartDiscoverBle({
 							'isStart': false
 						})
@@ -349,6 +370,9 @@
 						})
 					}, 1000)
 				}else{ //有连接则发送命令
+				uni.showLoading({
+					title: '执行中...'
+				})
 					let that = this //改变this指向
 					uni.getNetworkType({
 						success(res) {
@@ -370,6 +394,11 @@
 													wx.closeBLEConnection({
 														deviceId: that.deviceId,
 													})
+													that.devicesLists.forEach(item => {
+														if (item.name == that.qrResult) {
+															item.lj = '连接'
+														}
+													})
 													// console.log('guanbi');
 												},1000)
 											},2000)
@@ -473,15 +502,16 @@
 			},
 			// 点击重新搜索
 			Search() {
-				// console.log(1);
 				// if (this.status) {
 				this.mengcflag = true
 				uni.showLoading({
 					title: '请稍后...'
 				})
+				xBlufi.initXBlufi(1);
+				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
 				xBlufi.notifyStartDiscoverBle({
 					'isStart': true
-				});
+				})
 				// 重新搜索清空蓝牙数组
 				this.bluthlist = []
 				this.devicesList = []
@@ -493,7 +523,7 @@
 				this.texts = '正在扫描蓝牙设备...'
 				setTimeout(() => {
 					this.statusflag = false
-					if (this.searching) {
+					// if (this.searching) {
 						xBlufi.notifyStartDiscoverBle({
 							'isStart': false
 						});
@@ -504,11 +534,11 @@
 						} else {
 							this.texts = '扫描到以下设备，请点击录入！'
 						}
-					} else {
-						xBlufi.notifyStartDiscoverBle({
-							'isStart': true
-						});
-					}
+					// } else {
+					// 	xBlufi.notifyStartDiscoverBle({
+					// 		'isStart': true
+					// 	})
+					// }
 				}, 2000)
 				// }
 			},