diff --git a/androidPrivacy.json b/androidPrivacy.json
index 6e900af..3e91c29 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -2,7 +2,7 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://dmsapp.skf.com.cn/HummerService/Resource/Template/1765175615670.html\">《服务协议》</a>和<a href=\"https://dmsapp.skf.com.cn/HummerService/Resource/Template/1765176086420.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://cnxhyc.com/jquan/2026/02/09/80806c4209c74bd0a223415683ec300d.html\">《服务协议》</a>和<a href=\"https://cnxhyc.com/jquan/2026/02/09/4a4d05227c1242d1a505b98586704c39.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "hrefLoader" : "system",
diff --git a/api/6170/callPolice.js b/api/6170/callPolice.js
index 88a5e01..ccbac70 100644
--- a/api/6170/callPolice.js
+++ b/api/6170/callPolice.js
@@ -6,4 +6,8 @@ export function deviceSendAlarmMessage(data) {
     method: 'post',
     data: data
   })
+}
+
+export function deviceDefaultAlarm(data){
+	return Promise.reject(data);
 }
\ No newline at end of file
diff --git a/components/MessagePopup/MessagePopup.vue b/components/MessagePopup/MessagePopup.vue
index 46291b3..8f3a628 100644
--- a/components/MessagePopup/MessagePopup.vue
+++ b/components/MessagePopup/MessagePopup.vue
@@ -48,7 +48,7 @@
 		  
 		  <view
 		    class="popup-button-cancel" 
-			
+			v-if="showCancel"
 		   :style="{display:showCancel?'block':'none'}"
 		    @click="handleCancelClick"
 		  >{{ buttonCancelText?buttonCancelText:'取消' }}</view>
diff --git a/components/MsgBox/MsgBox.vue b/components/MsgBox/MsgBox.vue
new file mode 100644
index 0000000..77e99f1
--- /dev/null
+++ b/components/MsgBox/MsgBox.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="msgBox" v-if="Msgboxs.length>0">
+		
+		<MessagePopup v-for="item,index in Msgboxs" :visible="item.showPop" :type="item.popType" :bgColor="item.bgColor"
+			:borderColor="item.borderColor" :textColor="item.textColor" :buttonBgColor="item.buttonBgColor"
+			:buttonTextColor="item.buttonTextColor" :iconUrl="item.iconUrl" :message="item.message"
+			:buttonText="item.buttonText" @buttonClick="okCallback(item,index)" :visiblePrompt="item.visiblePrompt"
+			:promptTitle="item.promptTitle" v-model="item.modelValue" @closePop="closePop(item)"
+			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" @cancelPop="cancelClick(item,index)" />
+	</view>
+</template>
+
+<script>
+	export default {
+		 name: 'MsgBox',
+		data() {
+			return {
+				Msgboxs:[]
+			}
+		},
+		methods: {
+			//确认按钮事件，如果回调函数返回true,将阻止关闭弹窗
+			okCallback(item,index){
+				let flag=false;
+				if(item.okCallback){
+					flag=item.okCallback(item,index)
+				}
+				
+				if(flag){
+					return;
+				}
+				this.closePop(item);
+			},
+			//取消按钮,如果回调函数返回true，将阻止关闭弹窗
+			cancelClick(item,index){
+				let flag=false;
+				if(item.cancelCallback){
+					flag=item.cancelCallback(item,index)
+				}
+				
+				if(flag){
+					return;
+				}
+				this.closePop(item);
+			},
+			closePop: function(item) {
+			
+				if (item) {
+					this.Msgboxs.find((v, i) => {
+						if (item.key === v.key) {
+							this.Msgboxs.splice(i, 1);
+						}
+					});
+			
+					if (item.cancelCallback) {
+						item.cancelCallback();
+					}
+				} else {
+					if (this.Msgboxs.length > 0) {
+						this.Msgboxs.splice(this.Msgboxs.length - 1, 1);
+					}
+			
+				}
+			
+			},
+			//根据传入的配置，自定义一个弹窗
+			showPop: function(option,isClear) {
+				let def = {
+					key: '',
+					showPop: true, //是否显示弹窗
+					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE600',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
+					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: false,
+					okCallback: null,
+					showSlot: false,
+					buttonCancelText: '',
+					showCancel: false,
+					cancelCallback: null
+				}
+				let json = {};
+				let keys = Object.keys(def);
+			
+				for (let i = 0; i < keys.length; i++) {
+					let key = keys[i];
+			
+					json[key] = def[key];
+				}
+				if (option) {
+					keys = Object.keys(option);
+					for (let i = 0; i < keys.length; i++) {
+						let key = keys[i];
+			
+						json[key] = option[key];
+					}
+				}
+			
+				if (!json.borderColor) {
+					json.borderColor = '#BBE600';
+					json.buttonBgColor = '#BBE600';
+				}
+				json.showPop = true;
+				if (!('key' in json)) {
+					json.key = new Date().getTime();
+				}
+				
+				this.Msgboxs.push(json);
+				
+				return json;
+			},
+			//弹出预定好的三种弹窗
+			showMsg(msg,btnTxt, type,okCallback) {
+			
+				let cfg = {
+					error: {
+						icoUrl: '/static/images/6155/DeviceDetail/uploadErr.png',
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434"
+					},
+					succ: {
+						icoUrl: '/static/images/common/success.png',
+						borderColor: "#BBE600",
+						buttonBgColor: "#BBE600"
+					},
+					warn: {
+						icoUrl: '/static/images/common/warning.png',
+						borderColor: "#FFC84E",
+						buttonBgColor: "#FFC84E",
+					}
+				}
+			
+				if (!type) {
+					type = 'error';
+				}
+				if (!cfg[type]) {
+					type = 'error';
+				}
+			
+			
+				let guid =  new Date().getTime()+"";
+				let options = {
+					key: guid,
+					message: msg,
+					iconUrl: cfg[type].icoUrl,
+					borderColor: cfg[type].borderColor,
+					buttonBgColor: cfg[type].buttonBgColor,
+					buttonText: btnTxt?btnTxt:'确定',
+					okCallback: okCallback?okCallback:this.closePop
+				};
+				return this.showPop(options);
+				
+			},					
+			//清除所有弹窗
+			clearPops(){
+				this.Msgboxs=[];
+			},
+			//获取当前所有弹窗的数量
+			getPops(){
+				return this.Msgboxs.length;
+			}
+		}
+	}
+</script>
+
+<style>
+.msgBox{
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 9999;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+</style>
diff --git a/config/index.js b/config/index.js
index 31d9e3c..d8101c0 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,7 +2,7 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.2.34:8000',//http://139.224.253.23:8000
+		BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000		
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
diff --git a/manifest.json b/manifest.json
index d9ccd8e..0e8e898 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "星汉物联",
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
-    "versionName" : "1.0.15",
+    "versionName" : "1.0.17",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
diff --git a/pages.json b/pages.json
index 8ee4097..9b578b8 100644
--- a/pages.json
+++ b/pages.json
@@ -414,6 +414,14 @@
 			{
 				"navigationBarTitleText" : "录制语音"
 			}
+		},
+		{
+			"path" : "pages/common/addScan/ScanEquip",
+			"style" : 
+			{
+				"navigationBarTitleText" : "扫码",
+				"navigationStyle": "custom"	
+			}
 		}
 		
 
diff --git a/pages/018A/HBY018A.vue b/pages/018A/HBY018A.vue
index bcb5419..3d5fb41 100644
--- a/pages/018A/HBY018A.vue
+++ b/pages/018A/HBY018A.vue
@@ -505,7 +505,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue
index eff28dd..ea99012 100644
--- a/pages/100/HBY100.vue
+++ b/pages/100/HBY100.vue
@@ -57,9 +57,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<!-- <view class="item">
 				<text class="lbl">设备状态</text>
@@ -572,8 +572,11 @@
 
 				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
+			these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
+				}).catch(ex=>{
+					these.formData.bleStatu = 'err';
 				});
 				these.setBleFormData();
 
@@ -589,7 +592,21 @@
 			this.Status.pageHide = false;
 		},
 		computed: {
-
+			getbleStatu(){
+				if(this.formData.bleStatu===true){
+					return '已连接';
+				}
+				if(this.formData.bleStatu==='connecting'){
+					return '连接中';
+				}
+				if(this.formData.bleStatu==='dicconnect'){
+					return '正在断开';
+				}
+				if(this.formData.bleStatu==='err'){
+					return '连接异常';
+				}
+				return '未连接';
+			}
 		},
 		methods: {
 			handleRightClick(item, s) {
@@ -736,7 +753,7 @@
 								for (let i = 0; i < header.length; i++) {
 									dataView.setUint8(i, header[i]);
 								}
-								console.log("curr=" + curr + "orderNo=", orderNo);
+								// console.log("curr=" + curr + "orderNo=", orderNo);
 								dataView.setUint8(14, '0x' + orderNo.substring(0, 2));
 								dataView.setUint8(15, '0x' + orderNo.substring(2, 4));
 
@@ -764,7 +781,7 @@
 											});
 										}
 
-										console.log("发送成功," + curr + "/" + total);
+										// console.log("发送成功," + curr + "/" + total);
 										this.Status.curr = curr;
 										curr++;
 
@@ -1179,7 +1196,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -1212,12 +1233,14 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu='connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
 						text: '连接成功'
 					});
 				}).catch(ex => {
+					these.formData.bleStatu='err';
 					updateLoading(these, {
 						text: ex.msg
 					})
@@ -1304,6 +1327,33 @@
 
 				return f;
 			},
+			
+			bleStatuToggle(){
+				let f=this.getDevice();
+				if(!f){
+					this.showBleUnConnect();
+					return;
+				}
+				if(this.formData.bleStatu===true){
+					this.formData.bleStatu='dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r=>{
+						this.formData.bleStatu=false;
+					});
+					return;
+				}
+				
+				if(this.formData.bleStatu===false  || this.formData.bleStatu==='err'){
+					this.formData.bleStatu='connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex=>{
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+				
+				
+			},
 
 
 			setBleFormData() {
diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue
index 0e779f9..8a89368 100644
--- a/pages/102/HBY102.vue
+++ b/pages/102/HBY102.vue
@@ -58,9 +58,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<!-- <view class="item">
 				<text class="lbl">设备状态</text>
@@ -147,7 +147,7 @@
 		</view>
 
 
-		<view  style="padding-bottom: 20rpx;">
+		<view style="padding-bottom: 20rpx;">
 
 
 			<view class="proinfo lamp">
@@ -489,8 +489,11 @@
 
 				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
+				}).catch(ex => {
+					these.formData.bleStatu = 'err';
 				});
 				these.formData.sta_IntrusTime = 0;
 				these.formData.sta_sosadd = "";
@@ -530,10 +533,25 @@
 					}
 				});
 				return active;
+			},
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
 			}
 		},
 		methods: {
-			getLinkedCnt() {//获取在线设备的数量
+			getLinkedCnt() { //获取在线设备的数量
 
 				let f = this.getDevice();
 				// #ifdef  APP-PLUS
@@ -552,11 +570,11 @@
 					let buffer = {
 						ins_Quantity: "query"
 					};
-					ble.sendString(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30).then(res=>{
-						setTimeout(()=>{
+					ble.sendString(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30).then(res => {
+						setTimeout(() => {
 							this.getWarns();
-						},1500);
-					}).catch(()=>{
+						}, 1500);
+					}).catch(() => {
 						this.getWarns();
 					})
 				}
@@ -591,12 +609,12 @@
 						uni.getStorage({
 							key: linkKey,
 							success(res) {
-								console.error("获取到联机数据",res);
+								console.error("获取到联机数据", res);
 								let data = res.data;
 								let fs = data.filter(v => {
 									return !v.read
 								});
-								console.error("未读联机数据",fs);
+								console.error("未读联机数据", fs);
 								succ(fs);
 							},
 							fail(ex) {
@@ -609,12 +627,12 @@
 						let fs = [];
 
 						if (results[0].status == 'fulfilled') {
-							fs=fs.concat(results[0].value);
+							fs = fs.concat(results[0].value);
 						}
 						if (results[1].status == 'fulfilled') {
-							fs=fs.concat(results[1].value);
+							fs = fs.concat(results[1].value);
 						}
-console.error("获取到未读消息",fs);
+						console.error("获取到未读消息", fs);
 						these.$set(these.Status.navbar.icons[0], "math", fs.length);
 					});
 
@@ -961,7 +979,11 @@ console.error("获取到未读消息",fs);
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -994,12 +1016,14 @@ console.error("获取到未读消息",fs);
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				this.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
 						text: '连接成功'
 					});
 				}).catch(ex => {
+					these.formData.bleStatu = 'err';
 					updateLoading(these, {
 						text: ex.msg
 					})
@@ -1031,9 +1055,9 @@ console.error("获取到未读消息",fs);
 				let json = recei.ReceiveData(receive, device, pagePath, recArr);
 
 				console.log("json=", json)
-				setTimeout(()=>{
+				setTimeout(() => {
 					this.getWarns();
-				},500);
+				}, 500);
 
 
 				let active = -1;
@@ -1216,6 +1240,32 @@ console.error("获取到未读消息",fs);
 				return f;
 			},
 
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					this.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 
 			setBleFormData() {
 				ble.data.LinkedList.find((v) => {
diff --git a/pages/4877/BJQ4877.vue b/pages/4877/BJQ4877.vue
index 9036656..0b34338 100644
--- a/pages/4877/BJQ4877.vue
+++ b/pages/4877/BJQ4877.vue
@@ -14,11 +14,11 @@
 						<image class="img" :src="item.src" mode="aspectFit"></image>
 						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
 					</view>
-		
+
 				</view>
-		
+
 			</view>
-		
+
 		</uni-nav-bar>
 		<view class="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
@@ -54,9 +54,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">信道:{{formData.sta_Channel}}</text>
@@ -175,15 +175,15 @@
 					</view>
 					<view class="text">朝右</view>
 				</view>
-				
-				
-				
+
+
+
 
 			</view>
 			<view class="line"></view>
-			
+
 			<view class="modeSetting">
-			
+
 				<view class="arrow" @click.stop="ArrowSet('red_front')"
 					:class="formData.sta_ArrowType=='red_front'?'redactive':''">
 					<view class="outCircle">
@@ -191,7 +191,7 @@
 							<view class="text">红色</view>
 						</view>
 					</view>
-					
+
 				</view>
 				<view class="arrow" @click.stop="ArrowSet('green_back')"
 					:class="formData.sta_ArrowType=='green_back'?'greenactive':''">
@@ -200,10 +200,10 @@
 							<view class="text">绿色</view>
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
-			
+
 		</view>
 
 		<view class="lamp noPadding">
@@ -295,7 +295,9 @@
 		hideLoading,
 		updateLoading
 	} from '@/utils/loading.js'
-import request, { baseURL } from '@/utils/request.js';
+	import request, {
+		baseURL
+	} from '@/utils/request.js';
 	import Common from '@/utils/Common.js';
 	import {
 		colors as groupColors
@@ -323,7 +325,7 @@ import request, { baseURL } from '@/utils/request.js';
 							apiType: 'listA'
 						}],
 						title: 'BJQ4877'
-					
+
 					},
 					ShowEditChannel: false,
 					pageHide: false,
@@ -403,9 +405,9 @@ import request, { baseURL } from '@/utils/request.js';
 					sta_ArrowType: '', //箭头方向
 					warnTime: 0,
 					sta_Channel: 31,
-					sta_ArrowMode:'',
+					sta_ArrowMode: '',
 					groups: [
-					
+
 					]
 				},
 				dic: {
@@ -422,7 +424,7 @@ import request, { baseURL } from '@/utils/request.js';
 							activeImg: '/static/images/4877/fanActive.png'
 						}
 					]
-					
+
 				},
 				device: {
 					id: "",
@@ -480,7 +482,7 @@ import request, { baseURL } from '@/utils/request.js';
 				// console.log("收到父页面的参数：" + JSON.stringify(data));
 				let device = data.data;
 				these.device = device;
-				
+
 				these.Status.apiType = data.apiType;
 				these.Status.navbar.title = device.deviceName;
 				if (data.apiType !== 'listA') {
@@ -492,7 +494,7 @@ import request, { baseURL } from '@/utils/request.js';
 						}
 					});
 				}
-				
+
 				let checkIds = uni.getStorageSync("4877CheckColor_" + data.data.id);
 				if (checkIds && checkIds.length) {
 					let groups = groupColors.filter(v => {
@@ -508,7 +510,7 @@ import request, { baseURL } from '@/utils/request.js';
 					these.formData.groups = groups;
 
 				}
-				
+
 
 				let arr = [{
 						topic: 'C/4877_Groups_' + these.device.id,
@@ -556,6 +558,7 @@ import request, { baseURL } from '@/utils/request.js';
 				these.formData.deviceId = f.deviceId;
 				these.formData.warnTime = null;
 				these.formData.sta_SOSType = 'sos_off';
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -573,9 +576,50 @@ import request, { baseURL } from '@/utils/request.js';
 			this.Status.pageHide = false;
 		},
 		computed: {
-
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
+			}
 		},
 		methods: {
+
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -583,7 +627,7 @@ import request, { baseURL } from '@/utils/request.js';
 					uni.showModal({
 						content: '敬请期待'
 					})
-			
+
 				}
 			},
 			navigatorBack() {
@@ -612,11 +656,11 @@ import request, { baseURL } from '@/utils/request.js';
 
 					let str = rec.receive.payloadString;
 					let json = JSON.parse(str);
-					if('ins_channel' in json){
-						this.formData.sta_Channel=json.ins_channel;
+					if ('ins_channel' in json) {
+						this.formData.sta_Channel = json.ins_channel;
 						these.setBleFormData();
-					}	
-							
+					}
+
 				} catch (err) {
 
 				}
@@ -636,8 +680,8 @@ import request, { baseURL } from '@/utils/request.js';
 						return false;
 					});
 
-					 these.formData.groups = groups;
-					console.error("groups=",these.formData.groups);
+					these.formData.groups = groups;
+					console.error("groups=", these.formData.groups);
 					let checks = groups.map(item => {
 						return item.id
 					});
@@ -655,9 +699,9 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			ShowChannelEdit() {
-				
+
 				if (!this.permissions.includes('55') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -668,7 +712,7 @@ import request, { baseURL } from '@/utils/request.js';
 					})
 					return;
 				}
-				
+
 				this.Status.ShowEditChannel = true;
 				this.showPop({
 					showPop: true, //是否显示弹窗
@@ -736,9 +780,9 @@ import request, { baseURL } from '@/utils/request.js';
 
 			},
 			ArrowModeSet(val) {
-				
+
 				if (!this.permissions.includes('53') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -749,12 +793,12 @@ import request, { baseURL } from '@/utils/request.js';
 					})
 					return;
 				}
-				
+
 				if (this.formData.sta_SOSType === 'sos') {
 					this.showMsg("设备强制报警中,请先关闭报警")
 					return;
 				}
-			
+
 				let f = this.getDevice();
 				if (!f) {
 					this.showBleUnConnect();
@@ -763,7 +807,7 @@ import request, { baseURL } from '@/utils/request.js';
 				if (this.formData.sta_ArrowMode === val) {
 					return;
 				}
-			
+
 				var json = {
 					ins_right_side: val
 				}
@@ -800,8 +844,8 @@ import request, { baseURL } from '@/utils/request.js';
 				});
 			},
 			groupCheck() {
-if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
-				
+				if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -882,9 +926,9 @@ if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
 				// });
 			},
 			groupSetting(item, index) {
-				
+
 				if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -895,7 +939,7 @@ if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
 					})
 					return;
 				}
-				
+
 				if (this.formData.sta_SOSType === 'sos') {
 					this.showMsg("设备强制报警中,请先关闭报警")
 					return;
@@ -942,8 +986,8 @@ if (!this.permissions.includes('54') && this.Status.apiType !== 'listA') {
 			},
 
 			sosSetting(item, index) {
-if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
-				
+				if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -1043,7 +1087,11 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -1076,6 +1124,7 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -1822,22 +1871,23 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		letter-spacing: 0.14rpx;
 
 	}
-	
-	
+
+
 	.modeSetting .arrow .outCircle .text {
-		margin-top:0rpx !important;
-		
-	
+		margin-top: 0rpx !important;
+
+
 	}
 
 
-.arrowContent .line {
-	width:calc(100% - 60rpx);
-	
-	height: 0rpx;
-	border-bottom:1px solid #ffffff30;
-	margin: 30rpx ;
-}
+	.arrowContent .line {
+		width: calc(100% - 60rpx);
+
+		height: 0rpx;
+		border-bottom: 1px solid #ffffff30;
+		margin: 30rpx;
+	}
+
 	.modeSetting .arrow .outCircle {
 		width: 120rpx;
 		height: 120rpx;
@@ -1881,33 +1931,33 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		border-radius: 50%;
 
 	}
-	
-	
+
+
 	.modeSetting .arrow.redactive .outCircle {
 		border: 4rpx solid #EC2A2A;
 		padding: 4rpx;
 	}
-	
+
 	.modeSetting .arrow.redactive .item {
 		background: #EC2A2A;
 		border-radius: 50%;
-	
+
 	}
-	
+
 	.modeSetting .arrow.greenactive .outCircle {
 		border: 4rpx solid #00BD00;
 		padding: 4rpx;
 	}
-	
+
 	.modeSetting .arrow.greenactive .item {
 		background: #00BD00;
 		border-radius: 50%;
-	
+
 	}
-	
+
 	.modeSetting .arrow.redactive .item .text,
-	.modeSetting .arrow.greenactive .item .text{
-		color:#FFFFFFde !important;
+	.modeSetting .arrow.greenactive .item .text {
+		color: #FFFFFFde !important;
 	}
 
 
@@ -2202,29 +2252,29 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		text-align: center;
 
 	}
-	
-	
-	
-	
+
+
+
+
 	.navbarRight {
 		width: 40px;
 		height: 100%;
-	
+
 	}
-	
+
 	.navbarRight .imgContent {
 		width: 36rpx;
 		height: 36rpx;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent:first-child {
-	
+
 		width: 38rpx !important;
 		height: 38rpx !important;
 		margin-top: -2rpx;
 	}
-	
+
 	.navbarRight .imgContent .baber {
 		position: absolute;
 		z-index: 100;
@@ -2240,33 +2290,33 @@ if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 		font-style: Regular;
 		font-size: 20rpx;
 		font-weight: 400;
-	
+
 		text-align: center;
 		overflow: hidden;
 		white-space: nowrap;
-	
+
 	}
-	
+
 	.navbarRight .imgContent .img {
 		width: 100%;
 		height: 100%;
-	
+
 		box-sizing: border-box;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent .img:last-child {
 		padding: 1rpx;
 	}
-	
+
 	.nvbar {
 		top: 0px;
 	}
-	
+
 	/deep/ .uni-navbar--fixed {
 		top: 0px;
 	}
-	
+
 	.uninavebartext {
 		width: 100%;
 		font-size: 32rpx;
diff --git a/pages/4877/BJQ4877V1.vue b/pages/4877/BJQ4877V1.vue
index ee7108c..0c5d03a 100644
--- a/pages/4877/BJQ4877V1.vue
+++ b/pages/4877/BJQ4877V1.vue
@@ -603,7 +603,11 @@ import request, { baseURL } from '@/utils/request.js';
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
diff --git a/pages/6107/BJQ6107.vue b/pages/6107/BJQ6107.vue
index d8995ed..ce0f426 100644
--- a/pages/6107/BJQ6107.vue
+++ b/pages/6107/BJQ6107.vue
@@ -976,7 +976,7 @@
 						buttonBgColor: "#BBE600"
 					},
 					warn: {
-						icoUrl: '/static/images/6170/svg.png',
+						icoUrl: '/static/images/common/warning.png',
 						borderColor: "#FFC84E",
 						buttonBgColor: "#FFC84E",
 					}
diff --git a/pages/6155/BJQ6155.vue b/pages/6155/BJQ6155.vue
index 84e0fbb..96f0a41 100644
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@@ -9,8 +9,8 @@
 			</view>
 			<view slot="right">
 				<view class="navbarRight center">
-					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}" @click.stop="handleRightClick(item,index)"
-						v-for="item,index in Status.navbar.icons">
+					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}"
+						@click.stop="handleRightClick(item,index)" v-for="item,index in Status.navbar.icons">
 						<image class="img" :src="item.src" mode="aspectFit"></image>
 						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
 					</view>
@@ -61,9 +61,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 		</view>
 		<view class="lamp">
@@ -219,7 +219,7 @@
 						icons: [{
 							src: '/static/images/common/shape.png',
 							callback: this.gotoShare,
-							apiType:'listA'
+							apiType: 'listA'
 						}],
 						title: 'BJQ6155'
 
@@ -373,7 +373,7 @@
 				let device = data.data;
 				these.device = device;
 				these.Status.apiType = data.apiType;
-				these.Status.navbar.title=device.deviceName;
+				these.Status.navbar.title = device.deviceName;
 				if (data.apiType !== 'listA') {
 					Common.getdeviceShareId(data.data.id).then(res => {
 						if (res.code == 200) {
@@ -410,7 +410,7 @@
 
 				these.formData.id = device.id;
 				these.formData.deviceId = f.deviceId;
-				these.formData.bleStatu = false;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -433,12 +433,50 @@
 
 		},
 		computed: {
-			cModeItems: function() {
-
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
+				}
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
+				}
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
+				}
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
+				}
+				return '未连接';
 			}
 
 		},
 		methods: {
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -547,7 +585,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -580,6 +622,7 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -656,7 +699,7 @@
 			proParam: function() {
 
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					url: '/pages/common/productDes/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -664,7 +707,7 @@
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -672,7 +715,7 @@
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -1745,7 +1788,7 @@
 
 			},
 			sliderChange: function(evt) {
-				
+
 				if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 
 					this.showPop({
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index 05f5992..2effd5a 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -62,9 +62,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 		</view>
 		<view class="lamp">
@@ -380,7 +380,7 @@
 
 				these.formData.id = device.id;
 				these.formData.deviceId = f.deviceId;
-				these.formData.bleStatu = false;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -403,25 +403,50 @@
 
 		},
 		computed: {
-			RSSIRemark: function() {
-				let remark = '极弱';
-				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
-					remark = '强';
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
 				}
-
-				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
-					remark = '一般';
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
 				}
-				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
-					remark = '弱';
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
 				}
-				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
-					remark = '微弱';
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
 				}
-			},
+				return '未连接';
+			}
 
 		},
 		methods: {
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -541,7 +566,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -574,6 +603,7 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -649,7 +679,7 @@
 			proParam: function() {
 
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					url: '/pages/common/productDes/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -657,7 +687,7 @@
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -665,7 +695,7 @@
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -715,7 +745,7 @@
 					return new Promise((resolve, reject) => {
 						// 创建RGB565格式的像素数据
 						// console.log("pixels=",pixels);
-						const arr = ble.convertToRGB565(pixels, 'bgr');
+						const arr = Common.convertToRGB565(pixels, 'bgr');
 
 						var list = [];
 						let index = 0; // 用于追踪arr的当前位置
@@ -1794,7 +1824,7 @@
 				}
 
 			}
-			
+
 
 
 		}
diff --git a/pages/6331/BJQ6331.vue b/pages/6331/BJQ6331.vue
index 2df7f36..acf8ad9 100644
--- a/pages/6331/BJQ6331.vue
+++ b/pages/6331/BJQ6331.vue
@@ -617,7 +617,11 @@ import request, { baseURL } from '@/utils/request.js';
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
index 54af5db..8f83a20 100644
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@@ -55,9 +55,9 @@
 				<text class="lbl">设备名称</text>
 				<text class="value">{{device.deviceName}}</text>
 			</view>
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">预警级别</text>
@@ -401,6 +401,7 @@ import request, { baseURL } from '@/utils/request.js';
 
 				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
+				these.formData.bleStatu='connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -419,24 +420,49 @@ import request, { baseURL } from '@/utils/request.js';
 			this.Status.pageHide = false;
 		},
 		computed: {
-			RSSIRemark: function() {
-				let remark = '极弱';
-				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
-					remark = '强';
-				}
-
-				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
-					remark = '一般';
-				}
-				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
-					remark = '弱';
-				}
-				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
-					remark = '微弱';
-				}
-			}
+			getbleStatu(){
+						if(this.formData.bleStatu===true){
+							return '已连接';
+						}
+						if(this.formData.bleStatu==='connecting'){
+							return '连接中';
+						}
+						if(this.formData.bleStatu==='dicconnect'){
+							return '正在断开';
+						}
+						if(this.formData.bleStatu==='err'){
+							return '连接异常';
+						}
+						return '未连接';
+					}
 		},
 		methods: {
+			bleStatuToggle(){
+							let f=this.getDevice();
+							if(!f){
+								this.showBleUnConnect();
+								return;
+							}
+							if(this.formData.bleStatu===true){
+								this.formData.bleStatu='dicconnect';
+								ble.disconnectDevice(f.deviceId).finally(r=>{
+									this.formData.bleStatu=false;
+								});
+								return;
+							}
+							
+							if(this.formData.bleStatu===false  || this.formData.bleStatu==='err'){
+								this.formData.bleStatu='connecting';
+								ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+									these.formData.bleStatu = true;
+								}).catch(ex=>{
+									these.formData.bleStatu = 'err';
+								});
+								return;
+							}
+							
+							
+						},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -488,7 +514,11 @@ import request, { baseURL } from '@/utils/request.js';
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -521,6 +551,7 @@ import request, { baseURL } from '@/utils/request.js';
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				this.formData.bleStatu='connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -1029,7 +1060,7 @@ import request, { baseURL } from '@/utils/request.js';
 								});
 
 								these.Status.BottomMenu.show = false;
-								these.rgb565Data = ble.convertToRGB565(data.piexls);
+								these.rgb565Data = Common.convertToRGB565(data.piexls);
 								setTimeout(function() {
 									sendImagePackets().catch(() => {
 
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
index 6ab07f6..6eb3bd0 100644
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@@ -1,8 +1,5 @@
 <template>
 	<view class="content contentBg">
-		<!-- 	<custom-navbar :title="Status.navbar.title" :showBack="Status.navbar.showBack" color="#FFFFFF"
-			:rightIcons="Status.navbar.icons" @icon-click="handleRightClick" backgroundColor="#121212"></custom-navbar>
-		 -->
 		<uni-nav-bar :border="false" @clickLeft="prevPage" fixed="true" statusBar="true" 
 			background-color="#121212" color="#FFFFFF" :title="Status.navbar.title">
 			 <template v-slot:left><view>
@@ -58,9 +55,9 @@
 				<text class="lbl">蓝牙名称</text>
 				<text class="value valueFont">{{device.bluetoothName}}</text>
 			</view>
-			<view class="item">
+			<view class="item"  @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 			<view class="item">
 				<text class="lbl">设备状态</text>
@@ -550,7 +547,8 @@
 					these.formData['imei'] = these.device.deviceImei;
 				}
 				these.getDetail();
-				these.formData.bleStatu = false;
+				
+				these.formData.bleStatu='connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
 				});
@@ -567,9 +565,49 @@
 			ble.removeReceiveCallback(pagePath);
 		},
 		computed: {
-
+	getbleStatu(){
+				if(this.formData.bleStatu===true){
+					return '已连接';
+				}
+				if(this.formData.bleStatu==='connecting'){
+					return '连接中';
+				}
+				if(this.formData.bleStatu==='dicconnect'){
+					return '正在断开';
+				}
+				if(this.formData.bleStatu==='err'){
+					return '连接异常';
+				}
+				return '未连接';
+			}
 		},
 		methods: {
+			bleStatuToggle(){
+							let f=this.getDevice();
+							if(!f){
+								this.showBleUnConnect();
+								return;
+							}
+							if(this.formData.bleStatu===true){
+								this.formData.bleStatu='dicconnect';
+								ble.disconnectDevice(f.deviceId).finally(r=>{
+									this.formData.bleStatu=false;
+								});
+								return;
+							}
+							
+							if(this.formData.bleStatu===false  || this.formData.bleStatu==='err'){
+								this.formData.bleStatu='connecting';
+								ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+									these.formData.bleStatu = true;
+								}).catch(ex=>{
+									these.formData.bleStatu = 'err';
+								});
+								return;
+							}
+							
+							
+						},
 			prevPage() {
 				uni.navigateBack({
 
@@ -596,7 +634,11 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if(res.device){
+						these.formData.bleStatu = 'connecting';
+					}else{
+						this.formData.bleStatu = false;
+					}
 					setTimeout(() => {
 						hideLoading(these, 1000);
 					});
@@ -629,6 +671,7 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				this.formData.bleStatu='connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -1848,7 +1891,7 @@
 
 								these.Status.BottomMenu.show = false;
 								these.picPath = data.picPath;
-								these.rgb565Data = ble.convertToRGB565(data.piexls);
+								these.rgb565Data = Common.convertToRGB565(data.piexls);
 								setTimeout(function() {
 
 									sendImagePackets().catch(() => {
diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue
index 924123d..24d67ff 100644
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@@ -9,16 +9,16 @@
 			</view>
 			<view slot="right">
 				<view class="navbarRight center">
-					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}" @click.stop="handleRightClick(item,index)"
-						v-for="item,index in Status.navbar.icons">
+					<view class="imgContent" :class="{'visibilityHidden':Status.apiType!=item.apiType}"
+						@click.stop="handleRightClick(item,index)" v-for="item,index in Status.navbar.icons">
 						<image class="img" :src="item.src" mode="aspectFit"></image>
 						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
 					</view>
-		
+
 				</view>
-		
+
 			</view>
-		
+
 		</uni-nav-bar>
 		<view class="eq">
 			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
@@ -60,9 +60,9 @@
 			</view>
 
 
-			<view class="item">
+			<view class="item" @click.top="bleStatuToggle">
 				<text class="lbl">蓝牙状态</text>
-				<text class="value" :class="formData.bleStatu?'green':'red'">{{formData.bleStatu?'已连接':'未连接'}}</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
 			</view>
 		</view>
 		<view class="lamp">
@@ -182,7 +182,7 @@
 		updateLoading
 	} from '@/utils/loading.js'
 	import BleReceive from '@/utils/BleReceive';
-import Common from '@/utils/Common.js';
+	import Common from '@/utils/Common.js';
 
 	var ble = null;
 	var these = null;
@@ -201,10 +201,10 @@ import Common from '@/utils/Common.js';
 						icons: [{
 							src: '/static/images/common/shape.png',
 							callback: this.gotoShare,
-							apiType:'listA'
+							apiType: 'listA'
 						}],
 						title: 'BJQ6155'
-					
+
 					},
 					pageHide: false,
 					Pop: {
@@ -320,8 +320,8 @@ import Common from '@/utils/Common.js';
 
 				let device = data.data;
 				these.device = device;
-these.Status.apiType = data.apiType;
-				these.Status.navbar.title=device.deviceName;
+				these.Status.apiType = data.apiType;
+				these.Status.navbar.title = device.deviceName;
 				if (data.apiType !== 'listA') {
 					Common.getdeviceShareId(data.data.id).then(res => {
 						if (res.code == 200) {
@@ -358,7 +358,7 @@ these.Status.apiType = data.apiType;
 
 				these.formData.id = device.id;
 				these.formData.deviceId = f.deviceId;
-				these.formData.bleStatu = false;
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					console.log("连接成功")
 					these.formData.bleStatu = true;
@@ -378,21 +378,20 @@ these.Status.apiType = data.apiType;
 			this.Status.pageHide = false;
 		},
 		computed: {
-			RSSIRemark: function() {
-				let remark = '极弱';
-				if (this.formData.RSSI <= 0 && this.formData.RSSI >= -30) {
-					remark = '强';
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
+					return '已连接';
 				}
-
-				if (this.formData.RSSI < -30 && this.formData.RSSI >= -60) {
-					remark = '一般';
+				if (this.formData.bleStatu === 'connecting') {
+					return '连接中';
 				}
-				if (this.formData.RSSI < -60 && this.formData.RSSI >= -85) {
-					remark = '弱';
+				if (this.formData.bleStatu === 'dicconnect') {
+					return '正在断开';
 				}
-				if (this.formData.RSSI < -85 && this.formData.RSSI >= -100) {
-					remark = '微弱';
+				if (this.formData.bleStatu === 'err') {
+					return '连接异常';
 				}
+				return '未连接';
 			},
 			getMode() {
 				let txt = "关闭";
@@ -425,6 +424,32 @@ these.Status.apiType = data.apiType;
 			}
 		},
 		methods: {
+			bleStatuToggle() {
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+				if (this.formData.bleStatu === true) {
+					this.formData.bleStatu = 'dicconnect';
+					ble.disconnectDevice(f.deviceId).finally(r => {
+						this.formData.bleStatu = false;
+					});
+					return;
+				}
+
+				if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
+					these.formData.bleStatu = 'connecting';
+					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+						these.formData.bleStatu = true;
+					}).catch(ex => {
+						these.formData.bleStatu = 'err';
+					});
+					return;
+				}
+
+
+			},
 			handleRightClick(item, s) {
 				if (item && item.callback) {
 					item.callback(item, s);
@@ -432,7 +457,7 @@ these.Status.apiType = data.apiType;
 					uni.showModal({
 						content: '敬请期待'
 					})
-			
+
 				}
 			},
 			navigatorBack() {
@@ -477,7 +502,12 @@ these.Status.apiType = data.apiType;
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					this.formData.bleStatu = false;
+					if (res.device) {
+						these.formData.bleStatu = 'connecting';
+					} else {
+						this.formData.bleStatu = false;
+					}
+
 					// 断开连接时先将充电状态复位，避免保持旧值
 					this.formData.statu = '未充电';
 					this.setBleFormData();
@@ -513,6 +543,7 @@ these.Status.apiType = data.apiType;
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
@@ -554,9 +585,9 @@ these.Status.apiType = data.apiType;
 				if (this.Status.pageHide) {
 					return;
 				}
-				
+
 				let json = recei.ReceiveData(receive, device, path, recArr);
-				console.log("收到消息:",receive.hexs);
+				console.log("收到消息:", receive.hexs);
 				if (!json) {
 					return;
 				}
@@ -590,7 +621,7 @@ these.Status.apiType = data.apiType;
 			proParam: function() {
 
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.formData.id,
+					url: '/pages/common/productDes/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -598,7 +629,7 @@ these.Status.apiType = data.apiType;
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -606,7 +637,7 @@ these.Status.apiType = data.apiType;
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
 					success(ev) {
 
 					}
@@ -887,7 +918,7 @@ these.Status.apiType = data.apiType;
 			},
 			UploadOpenImg: function() {
 				if (!this.permissions.includes('3') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -898,7 +929,7 @@ these.Status.apiType = data.apiType;
 					})
 					return;
 				}
-				
+
 				//上传开机画面
 				this.Status.BottomMenu.menuItems = [];
 				this.Status.BottomMenu.title = "上传开机画面";
@@ -906,7 +937,7 @@ these.Status.apiType = data.apiType;
 				this.Status.BottomMenu.show = true;
 			},
 			ModeSetting: function(type) {
-if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
+				if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 
 					this.showPop({
 						message: '无操作权限',
@@ -1151,7 +1182,7 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 			},
 			sendUsr() {
 				if (!this.permissions.includes('4') && this.Status.apiType !== 'listA') {
-				
+
 					this.showPop({
 						message: '无操作权限',
 						iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -1366,7 +1397,7 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 				//给蓝牙设备发送信号更新亮度
 				BrighInteval = setTimeout(() => {
 					if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
-					
+
 						this.showPop({
 							message: '无操作权限',
 							iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@@ -1377,7 +1408,7 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 						})
 						return;
 					}
-					
+
 					this.sendBrightness();
 					this.setBleFormData();
 				}, 100);
@@ -1896,27 +1927,27 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 		left: -99999rpx;
 		visibility: hidden;
 	}
-	
-	
+
+
 	.navbarRight {
 		width: 40px;
 		height: 100%;
-	
+
 	}
-	
+
 	.navbarRight .imgContent {
 		width: 36rpx;
 		height: 36rpx;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent:first-child {
-	
+
 		width: 38rpx !important;
 		height: 38rpx !important;
 		margin-top: -2rpx;
 	}
-	
+
 	.navbarRight .imgContent .baber {
 		position: absolute;
 		z-index: 100;
@@ -1932,33 +1963,33 @@ if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
 		font-style: Regular;
 		font-size: 20rpx;
 		font-weight: 400;
-	
+
 		text-align: center;
 		overflow: hidden;
 		white-space: nowrap;
-	
+
 	}
-	
+
 	.navbarRight .imgContent .img {
 		width: 100%;
 		height: 100%;
-	
+
 		box-sizing: border-box;
 		position: relative;
 	}
-	
+
 	.navbarRight .imgContent .img:last-child {
 		padding: 1rpx;
 	}
-	
+
 	.nvbar {
 		top: 0px;
 	}
-	
+
 	/deep/ .uni-navbar--fixed {
 		top: 0px;
 	}
-	
+
 	.uninavebartext {
 		width: 100%;
 		font-size: 32rpx;
diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index 9d89df0..371aca4 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -481,7 +481,10 @@
 					}
 
 					plus.android.requestPermissions(
-						['android.permission.BLUETOOTH','android.permission.BLUETOOTH_ADMIN','android.permission.ACCESS_FINE_LOCATION','android.permission.ACCESS_COARSE_LOCATION'],
+						['android.permission.BLUETOOTH', 'android.permission.BLUETOOTH_ADMIN',
+							'android.permission.ACCESS_FINE_LOCATION',
+							'android.permission.ACCESS_COARSE_LOCATION'
+						],
 						(result) => {
 							if (result.granted && result.granted.length > 0) {
 								console.log('定位权限已授予');
@@ -533,22 +536,24 @@
 						return;
 					}
 				}
-				showLoading(these,{text:'正在刷新'})
+				showLoading(these, {
+					text: '正在刷新'
+				})
 				let time = null;
 				let startSearch = () => {
-					
-					if(time!==null){
-						clearTimeout(time);	
+
+					if (time !== null) {
+						clearTimeout(time);
 					}
-					
+
 					time = setTimeout(() => {
 						these.EquipMents = [];
 						these.PairEquip = [];
 
 						ble.StartSearch().then(result => {
-							console.log("开始搜索成功",result);
-							
-						}).catch(err => {							
+							console.log("开始搜索成功", result);
+
+						}).catch(err => {
 							console.error("开始搜索失败:", err);
 							if (err.code === 10001) {
 								these.showOpenSetting();
@@ -557,9 +562,9 @@
 									title: '提示',
 									content: '出现错误:' + err.msg
 								});
-								
+
 							}
-						}).finally(()=>{
+						}).finally(() => {
 							hideLoading(these);
 						});
 					}, 200);
@@ -905,11 +910,11 @@
 		position: absolute;
 		border-radius: 50%;
 		background-color: #bbe60033;
-		animation: expand 4s infinite ease-out;
+
 		display: inline-block;
 		transform: translate(-50%, -50%);
 		border: 1rpx solid #bbe6003d;
-		animation: expand 5s infinite ease-in-out;
+		animation: expand 4s infinite ease-in-out;
 	}
 
 	.circle:nth-child(2) {
@@ -927,17 +932,16 @@
 			opacity: 0.8;
 		}
 
-		80% {
-			width: 18.75rem;
-			height: 18.75rem;
-			opacity: 0.2;
+		90% {
+			width: 18rem;
+			height: 18rem;
+			opacity: 0;
 		}
 
 		100% {
-
-			width: 0.5rem;
-			height: 0.5rem;
-			opacity: 0.5;
+			width: 0rem;
+			height: 0rem;
+			opacity: 0;
 		}
 	}
 
diff --git a/pages/common/addScan/ScanEquip.vue b/pages/common/addScan/ScanEquip.vue
new file mode 100644
index 0000000..aa323f8
--- /dev/null
+++ b/pages/common/addScan/ScanEquip.vue
@@ -0,0 +1,396 @@
+<template>
+	<view class="maincontent contentBg">
+		<uni-nav-bar class="nvbar" leftIcon="left" @clickLeft="navigatorBack">
+			<view slot="left">
+				<uni-icons type="back" size="23" color="#FFFFFF"></uni-icons>
+			</view>
+			<view slot="default" class="center uninavebartext">
+				{{Status.navbar.title}}
+			</view>
+			<view slot="right">
+				<view class="navbarRight center">
+					<view class="imgContent" @click.stop="handleRightClick(item,index)"
+						v-for="item,index in Status.navbar.icons">
+						<image class="img" :src="item.src" mode="aspectFit"></image>
+						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
+					</view>
+
+				</view>
+
+			</view>
+
+		</uni-nav-bar>
+
+		<view class="scanPanel center">
+			<image @click.stop="scan" class="img" src="/static/images/common/scan.png" mode="aspectFit"></image>
+		</view>
+		<view class="txt">
+			对准二维码进行扫描
+		</view>
+
+		<view class="form">
+
+			<input class="formInput" type="text" v-model="formData.inputCode" placeholder="输入二维码内容"
+				placeholder-class="placeholder-class" cursor-spacing="30" cursor-color="#BBE600" />
+
+			<view class="btnOK" :class="{active:formData.inputCode}" @click.stop="addCode">确定</view>
+		</view>
+
+
+		<MsgBox ref="msgPop" />
+
+		<global-loading ref="loading" />
+	</view>
+</template>
+
+<script>
+	import request from '@/utils/request.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+
+	import {
+		MsgSuccess,
+		MsgError,
+		MsgClose,
+		MsgWarning,
+		showPop
+	} from '@/utils/MsgPops.js'
+	import Common from '@/utils/Common.js';
+	var eventChannel = null;
+	var these = null;
+
+	export default {
+		data() {
+			return {
+				Status: {
+					navbar: {
+						icons: [{
+							src: '/static/images/common/scane.png',
+							callback: this.scan
+						}],
+						title: '扫码'
+
+					},
+				},
+				formData: {
+					inputCode: ''
+				}
+			}
+		},
+		onLoad() {
+
+			these = this;
+			setTimeout(this.scan, 500)
+
+		},
+		methods: {
+			addCode() {
+				debugger;
+				if (!this.formData.inputCode) {
+					MsgWarning("请输入二维码内容","确定", this);
+					return;
+				}
+
+				let macStr = this.formData.inputCode;
+
+				if (macStr.indexOf(':') == -1) {
+					macStr = macStr.replace(/(.{2})/g, '$1:').slice(0, -1);
+				}
+				//通过mac地址查询
+				let p1 = new Promise((resolve, reject) => {
+
+					request({
+						url: '/app/device/getDeviceInfoByDeviceMac',
+						method: 'GET',
+						data: {
+							deviceMac: macStr
+						}
+					}).then(res => {
+
+						console.log("获取设备信息", res);
+						if (res && res.code == 200) {
+							console.log("res=", res);
+							let data = res.data;
+						
+							if (data && data.id) {
+								resolve(data);
+								return;
+							}
+
+						}
+						reject(null);
+					}).catch(() => {
+						reject(null);
+					});
+				});
+
+				p1.then(dev => {
+					//蓝牙产品
+					this.qrCodeResult(macStr, false, 'ble');
+				}).catch(() => {
+					this.qrCodeResult(this.formData.inputCode, false, 'imei');
+				})
+
+			},
+
+
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				} else {
+					uni.showModal({
+						content: '敬请期待'
+					})
+
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+			qrCodeResult(cleanedResult, isConvert, type) { //条码文本，是否尝试解析，已知类型
+
+
+				let url = `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
+				try {
+					if (isConvert) {
+						let json = JSON.parse(cleanedResult);
+						if ('imei' in json) {
+							url =
+								`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
+						} else if ('blue' in json || 'ble' in json) {
+							if (json.ble) {
+								json.blue = json.ble;
+							}
+							if (json.blue) {
+								if (!json.blue.includes(':')) {
+									json.blue = json.blue.replace(
+											/(.{2})/g, '$1:')
+										.slice(0, -1)
+								}
+							}
+
+							url = `/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
+						}
+					} else {
+						if (type === 'imei') {
+							url = `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
+						} else {
+							url = `/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(cleanedResult)}`;
+						}
+					}
+
+				} catch (ex) {
+					console.error("解析条码出现异常,", ex);
+				}
+				// 跳转并传递扫描结果
+				uni.navigateTo({
+					url: url
+				});
+			},
+			scan(item, s) {
+				debugger;
+				let systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.uniPlatform == 'web') {
+					MsgError("Web平台不支持此功能,请手工录入条码", "确定", these);
+					return;
+				}
+
+				uni.scanCode({
+					autoDecodeCharset: true,
+					autoZoom: true,
+					barCodeInput: true,
+					success: (res) => {
+						console.log('条码内容：', res);
+						let cleanedResult = res.result.trim();
+						this.qrCodeResult(cleanedResult, true, null);
+					},
+					fail: (err) => {
+						this.showMsg("扫码失败:" + err.errMsg, MsgType.error);
+					}
+				});
+			},
+
+
+		}
+	}
+</script>
+
+<style scoped>
+	.scanPanel {
+		width: 100%;
+		height: 600rpx;
+	}
+
+	.scanPanel .img {
+		width: 350rpx;
+		height: 350rpx;
+	}
+
+	.txt {
+		width: 100%;
+		text-align: center;
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: 'PingFang SC';
+
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 20px;
+		letter-spacing: 0px;
+
+	}
+
+	.form {
+		width: 100%;
+		height: 250rpx;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-end;
+	}
+
+	.formInput {
+		width: 90%;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 40rpx;
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: "PingFang SC";
+		font-style: Regular;
+		font-size: 28rpx;
+		font-weight: 400;
+		background: rgba(42, 42, 42, 1);
+		letter-spacing: 0px;
+		text-align: left;
+		text-indent: 30rpx;
+		margin-bottom: 30rpx;
+	}
+
+	/deep/.placeholder-class {
+		font-family: "PingFang SC";
+		font-style: Regular;
+		font-size: 26rpx;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 0.6);
+		letter-spacing: 0px;
+		text-align: left;
+	}
+
+	.btnOK {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: 'PingFang SC';
+		font-size: 30rpx;
+		font-weight: 400;
+		letter-spacing: 5rpx;
+	}
+
+	.btnOK.active {
+		color: #AED600;		
+	}
+
+	.navbarRight {
+		width: 40px;
+		height: 100%;
+
+	}
+
+	.navbarRight .imgContent {
+		width: 36rpx;
+		height: 36rpx;
+		position: relative;
+	}
+
+	.navbarRight .imgContent:first-child {
+
+		width: 38rpx !important;
+		height: 38rpx !important;
+		margin-top: -2rpx;
+	}
+
+	.navbarRight .imgContent .baber {
+		position: absolute;
+		z-index: 100;
+		width: 30rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		right: -15rpx;
+		top: -15rpx;
+		border-radius: 50%;
+		background: #f12828;
+		color: #ffffff;
+		font-family: 'PingFang SC';
+		font-style: Regular;
+		font-size: 20rpx;
+		font-weight: 400;
+
+		text-align: center;
+		overflow: hidden;
+		white-space: nowrap;
+
+	}
+
+	.navbarRight .imgContent .img {
+		width: 100%;
+		height: 100%;
+
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.navbarRight .imgContent .img:last-child {
+		padding: 1rpx;
+	}
+
+	.nvbar {
+		top: 0px;
+	}
+
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+
+	.uninavebartext {
+		width: 100%;
+		font-size: 32rpx;
+	}
+
+	.footer {
+		position: fixed;
+		width: 100%;
+		bottom: 0rpx;
+		left: 0rpx;
+	}
+
+	.footer .row {
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		padding: 20rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.inputContent {
+		width: calc(100% - 110rpx);
+	}
+
+	.footer .btn {
+		width: 100rpx;
+		text-align: center;
+		background-color: #09a0f7;
+		color: #fff;
+		border-radius: 16rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/common/allShare/index.vue b/pages/common/allShare/index.vue
index 5da6725..02ff8d3 100644
--- a/pages/common/allShare/index.vue
+++ b/pages/common/allShare/index.vue
@@ -147,7 +147,7 @@
 						// 页面跳转成功后的回调函数
 						res.eventChannel.emit('detailData', {
 							data: item,
-							apiType: 'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
+							apiType:this.activeTab===0?'listA':'listB' // 自定义标识 // 自定义标识，详情哪里根据这个参数不同信息
 						});
 					}
 				})
diff --git a/pages/common/audioManager/AudioList.vue b/pages/common/audioManager/AudioList.vue
index 883141f..1015b47 100644
--- a/pages/common/audioManager/AudioList.vue
+++ b/pages/common/audioManager/AudioList.vue
@@ -91,9 +91,9 @@
 		</MessagePopup>
 
 
-		<view class="displayNone">
+		<!-- <view class="displayNone">
 			<audio :src="cPlay.src" :id="cPlay.Id" :name="cPlay.name" author=""></audio>
-		</view>
+		</view> -->
 		<global-loading ref="loading"></global-loading>
 	</view>
 	
@@ -216,16 +216,16 @@
 					statu: "", //状态,是否公开
 					isApply: "" //是否使用中
 
-				},
-				cPlay: {
-					Id: "", //编号
-					name: "", //名称
-					createTime: "", //创建时间
-					localPath: "", //本地地址
-					webPath: "", //网络地址
-					statu: "", //状态,是否公开
-					isApply: "" //是否使用中
-				}
+				}//,
+				// cPlay: {
+				// 	Id: "", //编号
+				// 	name: "", //名称
+				// 	createTime: "", //创建时间
+				// 	localPath: "", //本地地址
+				// 	webPath: "", //网络地址
+				// 	statu: "", //状态,是否公开
+				// 	isApply: "" //是否使用中
+				// }
 			}
 		},
 		onLoad() {
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index 4db99e0..e44cf0a 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -497,54 +497,57 @@ import BleReceive from '@/utils/BleReceive';
 				switch (item.action) {
 					case 'scan':
 						// 扫一扫
-						uni.scanCode({
-							autoDecodeCharset:true,
-							autoZoom:true,
-							barCodeInput:true,
-							success: (res) => {
-								console.log('条码内容：', res);
-								// 清除之前的数据
-								this.previousScanResult = null;
-								// 处理新的扫码结果
-								const cleanedResult = res.result.trim();
-								console.log('扫码结果：', cleanedResult);
-								let url =
-									`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
-								try {
-									let json = JSON.parse(cleanedResult);
-									if ('imei' in json) {
-										url =
-											`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
-									} else if ('blue' in json || 'ble' in json) {
-										if(json.ble){
-											json.blue=json.ble;
-										}
-										if(json.blue){
-											if (!json.blue.includes(':')) {
-												json.blue = json.blue.replace(
-														/(.{2})/g, '$1:')
-													.slice(0, -1)
-											}
-										}
-										
-										url =`/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
-									}
-								} catch (ex) {
-
-								}
-								// 跳转并传递扫描结果
-								uni.navigateTo({
-									url: url
-								});
-							},
-							fail: (err) => {
-								console.log('扫码失败', err);
-								uni.showToast({
-									title: '扫码失败',
-									icon: 'none'
-								});
-							}
+						uni.navigateTo({
+							url:'/pages/common/addScan/ScanEquip'
 						});
+						// uni.scanCode({
+						// 	autoDecodeCharset:true,
+						// 	autoZoom:true,
+						// 	barCodeInput:true,
+						// 	success: (res) => {
+						// 		console.log('条码内容：', res);
+						// 		// 清除之前的数据
+						// 		this.previousScanResult = null;
+						// 		// 处理新的扫码结果
+						// 		const cleanedResult = res.result.trim();
+						// 		console.log('扫码结果：', cleanedResult);
+						// 		let url =
+						// 			`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
+						// 		try {
+						// 			let json = JSON.parse(cleanedResult);
+						// 			if ('imei' in json) {
+						// 				url =
+						// 					`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
+						// 			} else if ('blue' in json || 'ble' in json) {
+						// 				if(json.ble){
+						// 					json.blue=json.ble;
+						// 				}
+						// 				if(json.blue){
+						// 					if (!json.blue.includes(':')) {
+						// 						json.blue = json.blue.replace(
+						// 								/(.{2})/g, '$1:')
+						// 							.slice(0, -1)
+						// 					}
+						// 				}
+										
+						// 				url =`/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
+						// 			}
+						// 		} catch (ex) {
+
+						// 		}
+						// 		// 跳转并传递扫描结果
+						// 		uni.navigateTo({
+						// 			url: url
+						// 		});
+						// 	},
+						// 	fail: (err) => {
+						// 		console.log('扫码失败', err);
+						// 		uni.showToast({
+						// 			title: '扫码失败',
+						// 			icon: 'none'
+						// 		});
+						// 	}
+						// });
 						break;
 					case 'bluetooth':
 						uni.navigateTo({
diff --git a/pages/common/shareDevices/index.vue b/pages/common/shareDevices/index.vue
index a994a7b..55bbeca 100644
--- a/pages/common/shareDevices/index.vue
+++ b/pages/common/shareDevices/index.vue
@@ -147,6 +147,19 @@
 					});
 					return false;
 				}
+				else{
+					let phone= uni.getStorageSync('phone');
+					if(phone==phoneNumber){
+						uni.showToast({
+							title: '手机号不能是自己账号',
+							icon: 'none',
+							duration: 1000
+						});
+						return false;
+					}
+				}
+				
+				
 				try {
 					await deviceShareCode({
 						phonenumber: this.phone
diff --git a/static/images/common/scan.png b/static/images/common/scan.png
index 93e40fe..591d48f 100644
Binary files a/static/images/common/scan.png and b/static/images/common/scan.png differ
diff --git a/static/images/common/warning.png b/static/images/common/warning.png
new file mode 100644
index 0000000..fd4fce9
Binary files /dev/null and b/static/images/common/warning.png differ
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index 49fcec1..c127d69 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -779,23 +779,23 @@ class BleHelper {
 					str: str,
 					hexs: hexs
 				};
-				 console.log("监听到特征值:" + JSON.stringify(recData));
+				 // console.log("监听到特征值:",recData);
 				if (this.cfg.receivDataCallback) {
 
 					if (this.cfg.receivDataCallback.length > 0) {
 
-						// console.log("有人订阅消息")
+						 // console.log("有人订阅消息")
 						this.cfg.receivDataCallback.forEach((
 							rec) => {
-							// console.log("有人订阅消息111", )
+							 // console.log("有人订阅消息111", )
 							if (rec.callback) {
 								try {
-									// console.log("正在处理订阅消息",rec);
+									 // console.log("正在处理订阅消息",rec);
 									rec.callback(recData, f,
 										rec.key, this.cfg
 										.receivDataCallback
 									);
-									// console.log("处理订阅消息完毕");
+									 // console.log("处理订阅消息完毕");
 								} catch (err) {
 									console.error(
 										"订阅消息出现异常",
@@ -2030,29 +2030,7 @@ class BleHelper {
 
 	}
 
-	//将点阵数据转换成RGB565
-	convertToRGB565(pixels, type) {
-		if (!type) {
-			type = 'rgb';
-		}
-		const result = new Uint16Array(pixels.length / 4);
-		let index = 0;
-		for (let i = 0; i < pixels.length; i += 4) {
-			let r = pixels[i];
-			let g = pixels[i + 1];
-			let b = pixels[i + 2];
-			let a = pixels[i + 3];
-
-			if (type == 'bgr') {
-				result[index++] = ((b & 0xF8) << 8) | ((g & 0xFC) << 3) | (r >> 3);
-			} else {
-				result[index++] = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
-			}
-
-		}
-
-		return result;
-	}
+	
 
 
 
diff --git a/utils/BleReceive.js b/utils/BleReceive.js
index b31a44b..e4a7caf 100644
--- a/utils/BleReceive.js
+++ b/utils/BleReceive.js
@@ -37,6 +37,7 @@ class BleReceive {
 					});
 
 					uni.setStorageSync(this.StorageKey, linkedList);
+					return true;
 				}
 			});
 		}
@@ -49,20 +50,20 @@ class BleReceive {
 			let handler = null;
 			let keys = Object.keys(this.HandlerMap);
 			let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, '').toLowerCase() : '';
-			// console.log("查找handler - detailPageUrl:", f.device.detailPageUrl, "转换后:", devKey);
+		
 			for (let index = 0; index < keys.length; index++) {
 				let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, "").toLowerCase() : '';
 				let key = keys[index].replace(/\//g, '').toLowerCase();
 				if (key == devKey) {
 					handler = this.HandlerMap[keys[index]];
-					// console.log("找到匹配的handler:", keys[index]);
+					
 					break;
 				}
 			}
 
 			if (handler) {
-				let data = handler(receive, f, path, recArr);
-				// console.log("设备"+f.device.deviceName+"收到消息,数据:", data);
+				let data = handler(receive, f, path, recArr);			
+				this.setBleFormData(data, f);
 				return data;
 			} else {
 				console.error("已收到消息,但无指定处理程序, deviceUrl:", f.device.detailPageUrl, "可用handlers:", keys);
@@ -159,7 +160,7 @@ class BleReceive {
 					formData.modeCurr = modeCurr;
 					formData.warnLevel = warn;
 					formData.iswarn = iswarn;
-					this.setBleFormData(formData, f);
+			
 
 					let recCnt = recArr.find(v => {
 						return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
@@ -208,7 +209,7 @@ class BleReceive {
 					if (str.indexOf('mac address:') == 0) {
 						let formData = {};
 						formData.macAddress = str.split(':')[1];
-						this.setBleFormData(formData, f);
+						
 						return formData;
 					} else {
 						let receiveData = {
@@ -327,7 +328,7 @@ class BleReceive {
 					receiveData.fourGStrenth = fourGStrenth;
 					receiveData.SOS = sosTxt;
 					receiveData.qzwarn = sosTxt === 'sg';
-					this.setBleFormData(receiveData, f);
+					
 					console.log("recArr=", recArr);
 					let recCnt = recArr.find(v => {
 						return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
@@ -415,8 +416,7 @@ class BleReceive {
 					console.log('将数据转文本失败', ex);
 				}
 			}
-			// console.log("todo",receiveData);
-			this.setBleFormData(receiveData, f);
+		
 			return receiveData;
 		}
 
@@ -503,8 +503,6 @@ class BleReceive {
 					}
 				}
 
-
-				this.setBleFormData(formData, f);
 				return formData;
 			} catch (error) {
 				console.log('7305数据解析错误:', error);
@@ -605,8 +603,6 @@ class BleReceive {
 					}
 				}
 
-
-				this.setBleFormData(formData, f);
 				return formData;
 			} catch (error) {
 				console.log('7305数据解析错误:', error);
diff --git a/utils/Common.js b/utils/Common.js
index 756a443..3570666 100644
--- a/utils/Common.js
+++ b/utils/Common.js
@@ -462,5 +462,30 @@ export default {
 			url='https://www.pgyer.com/xhwl';
 		}
 		return {os:os,url:url};
+	},
+	
+	
+	//将点阵数据转换成RGB565
+	convertToRGB565(pixels, type) {
+		if (!type) {
+			type = 'rgb';
+		}
+		const result = new Uint16Array(pixels.length / 4);
+		let index = 0;
+		for (let i = 0; i < pixels.length; i += 4) {
+			let r = pixels[i];
+			let g = pixels[i + 1];
+			let b = pixels[i + 2];
+			let a = pixels[i + 3];
+	
+			if (type == 'bgr') {
+				result[index++] = ((b & 0xF8) << 8) | ((g & 0xFC) << 3) | (r >> 3);
+			} else {
+				result[index++] = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+			}
+	
+		}
+	
+		return result;
 	}
 }
\ No newline at end of file
diff --git a/utils/MsgPops.js b/utils/MsgPops.js
new file mode 100644
index 0000000..295ba05
--- /dev/null
+++ b/utils/MsgPops.js
@@ -0,0 +1,162 @@
+var MsgType = {
+	error: "error",
+	succ: "succ",
+	warn: "warn"
+}
+var time = null;
+// 显示成功
+export const MsgSuccess = (msg, btnTxt, ev) => {
+
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.succ);
+
+	createClear(ev);
+	return option;
+}
+//显示失败
+export const MsgError = (msg, btnTxt, ev) => {
+
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+
+	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.error);
+	createClear(ev);
+	return option;
+}
+//显示警告
+export const MsgWarning = (msg, btnTxt, ev, isClear) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.warn);
+	if (isClear === undefined || isClear) {
+		createClear(ev);
+	}
+
+	return option;
+
+
+}
+
+
+// 隐藏loading
+export const MsgClose = (options, ev) => {
+
+
+	if (!ev) {
+
+		return;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return;
+	}
+	if (typeof(options) == 'string') {
+		options = {
+			key: options
+		}
+	}
+	ev.$refs.msgPop.closePop(options);
+
+}
+
+
+
+export const showPop = (options, ev, isClear) => {
+
+
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	let option = ev.$refs.msgPop.showPop(options);
+
+	if (isClear === undefined || isClear) {
+		createClear(ev);
+	}
+
+	return option;
+}
+
+const createClear = (ev) => {
+	let cnt = getPops(ev);
+	if (cnt >= 5) {
+		clearTimeout(time);
+		time = setTimeout(() => {
+			let key = new Date().getTime();
+			showPop({
+				key: key,
+				message: "消息太多, 是否全部关闭",
+				iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+				borderColor: "#e034344d",
+				buttonBgColor: "#E03434",
+				buttonText: '全部关闭',
+				buttonTextColor: '#232323de',
+				showCancel: true,
+				buttonCancelText: "取消",
+				cancelCallback: () => {
+
+					MsgClose(key, ev);
+				},
+				okCallback: function() {
+
+					MsgClear(ev);
+				}
+
+			}, ev, false);
+		}, 500);
+
+
+	}
+}
+
+//获取当前弹窗数量
+export const getPops = (ev) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	return ev.$refs.msgPop.getPops();
+
+}
+
+
+//清空所有弹窗
+export const MsgClear = (ev) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs.msgPop) {
+
+		return null;
+	}
+	return ev.$refs.msgPop.clearPops();
+
+}
\ No newline at end of file