diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 7181f97..95fb682 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,12 +2,12 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-ios"
         },
         {
             "customPlaygroundType" : "local",
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {
@@ -17,6 +17,9 @@
             "default" : {
                 "launchtype" : "local"
             },
+            "h5" : {
+                "launchtype" : "local"
+            },
             "provider" : "aliyun",
             "type" : "uniCloud"
         }
diff --git a/App.vue b/App.vue
index d01ee49..a21853c 100644
--- a/App.vue
+++ b/App.vue
@@ -30,43 +30,41 @@
 			//以上代码仅在开发时使用,否则会出现不可预知的问题。
 
 			// #ifdef APP|APP-PLUS
-			
-			bleTool.getBleTool();
-			
-			var appid = plus.runtime.appid;
-			console.log('应用的 appid 为：' + appid);
-			
+			if (plus.runtime.isAgreePrivacy()) {
+
+
+				bleTool.getBleTool();
 		
-			uni.getPushClientId({
-				success(res) {
-					console.log("推送信息:", res);
-					uni.setStorageSync('push_cid', res.cid);
-				},
-				fail(err) {
-					console.error(err)
+				uni.getPushClientId({
+					success(res) {
+						console.log("推送信息:", res);
+						uni.setStorageSync('push_cid', res.cid);
+					},
+					fail(err) {
+						console.error(err)
+					}
+				});
+				if (!uni.setAppBadgeNumber) { //兼容鸿蒙的写法
+					uni.setAppBadgeNumber = plus.runtime.setBadgeNumber;
 				}
-			});
-			if(!uni.setAppBadgeNumber){//兼容鸿蒙的写法
-				uni.setAppBadgeNumber=plus.runtime.setBadgeNumber;
-			}
-			uni.onPushMessage((res) => {
-				console.log("收到推送消息：", res); //监听推送消息
-				if(res.type=='click'){
-					//将App角标设置为0，清空app在消息中心的所有消息
-					uni.setAppBadgeNumber(0);					
-					plus.push.clear();
-					return;
-				}
-				uni.createPushMessage({
-					title: res.data.title,
-					content: res.data.content,
-					payload:res.data.payload
+				uni.onPushMessage((res) => {
+					console.log("收到推送消息：", res); //监听推送消息
+					if (res.type == 'click') {
+						//将App角标设置为0，清空app在消息中心的所有消息
+						uni.setAppBadgeNumber(0);
+						plus.push.clear();
+						return;
+					}
+					uni.createPushMessage({
+						title: res.data.title,
+						content: res.data.content,
+						payload: res.data.payload
+					});
+
 				});
 
-			});
 
-
-			
+			}
 
 			// #endif
 		},
@@ -74,18 +72,15 @@
 			console.log('App Show');
 
 			//将检查更新换到onshow,因为苹果用户喜欢一直挂着
-			uni.getSystemInfo({
-				success: function(res) {
-					if (res.uniPlatform == 'app') {
-						
-						let appid = plus.runtime.appid;
-						if (appid !== 'HBuilder') {
-							console.log("appid=", appid);
-							upgrade.checkAndUpdateWgt();
-						}
-					}
-				}
-			});
+			// #ifdef APP|APP-PLUS
+
+			let appid = plus.runtime.appid;
+			console.log("appid=", appid);
+			
+			if (appid !== 'HBuilder') {				
+				upgrade.checkAndUpdateWgt();
+			}
+			// #endif
 		},
 		onHide: function() {
 			console.log('App Hide');
diff --git a/androidPrivacy.json b/androidPrivacy.json
index 3e91c29..f0a3045 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -2,7 +2,7 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "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>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://cnxhyc.com/jquan/2026/02/09/80806c4209c74bd0a223415683ec300d.html\">《服务协议》</a>和<a href=\"http://cnxhyc.com/jquan/2026/03/06/d60f8b8cbf5942b8a1b52bb6ea469aa6.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "hrefLoader" : "system",
diff --git a/api/6170/deviceControl.js b/api/6170/deviceControl.js
index c517ee5..3fcb147 100644
--- a/api/6170/deviceControl.js
+++ b/api/6170/deviceControl.js
@@ -63,6 +63,10 @@ export function mapReverseGeocoding(data) {
   })
 }
 
-export function deviceRealTimeStatus(){
-	return Promise.resolve({code:500});
+export function deviceRealTimeStatus(params){
+	return request({
+	  url: `/app/device/realTimeStatus`,
+	  method: 'get',
+		data:params
+	})
 }
\ No newline at end of file
diff --git a/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue b/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
index 22ffa0e..dc38f7b 100644
--- a/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
+++ b/components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue
@@ -15,7 +15,7 @@
 			</view>
 			<view class="menu-items" v-if="config.menuItems && config.menuItems.length>0">
 				<view class="menu-item" v-for="(item, index) in config.menuItems" :key="index" :style="{ 
-					color: config.textColor, 
+				color: config.textColor, 
 				textAlign: config.textAlign,
 				height:config.itemHeight,
 				lineHeight:config.itemHeight,				
@@ -23,7 +23,7 @@
 				paddingRight: config.dividerMargin
 				}" @click="handleItemClick(item, index)">
 
-					<view class="p100" :style="{backgroundColor:config.activeIndex==index?config.itemBgColor:'',
+					<view class="p100" :style="{backgroundColor:(config.activeIndex==index || item[config.valueMember]==config.value) ?config.itemBgColor:'',
 				justifyContent:config.textAlign
 				}">
 						<view class="imgContent" v-if="item.icon" :style="{ 					
@@ -73,6 +73,8 @@
 					maskBgColor: '', //mask的颜色
 					menuItems: [], //菜单项 包含icon text
 					activeIndex: -1, //当前已选中的项编号
+					valueMember:'',
+					value:null,
 					bgColor: '#2a2a2a', //主体背景
 					itemBgColor: '#3a3a3a', //各项被选中后的背景
 					textColor: '#ffffffde', //各项的文字颜色
@@ -91,7 +93,16 @@
 
 
 		},
-
+		created(){
+			if(this.config.value && this.config.valueMember){
+				this.config.menuItems.find((v,i)=>{
+					if(v[this.config.valueMember]==this.config.value){
+						this.config.activeIndex=i;
+						return true;
+					}
+				});
+			}
+		},
 		methods: {
 			closeMenu() {
 
@@ -108,6 +119,16 @@
 				let index = null;
 				if (this.config.activeIndex > -1) {
 					item = this.config.menuItems[this.config.activeIndex];
+				}else{
+					for (let i = 0; i < this.config.menuItems.length; i++) {
+						var element = this.config.menuItems[i];
+						if(element[this.config.valueMember]==this.config.value){
+							item=element;
+							index=i;
+							break;
+						}
+					}
+					
 				}
 				index = this.config.activeIndex;
 				this.$emit('btnClick', item, index);
diff --git a/components/MessagePopup/MessagePopup.vue b/components/MessagePopup/MessagePopup.vue
index 8f3a628..82dfe3e 100644
--- a/components/MessagePopup/MessagePopup.vue
+++ b/components/MessagePopup/MessagePopup.vue
@@ -1,398 +1,373 @@
 <template>
-  <view class="message-popup" v-if="visible">
-    <view class="popup-mask" @click="handleMaskClick"></view>
-    <view 
-      class="popup-content" 
-      :style="{ 
+	<view class="message-popup" v-if="visible">
+		<view class="popup-mask" @click="handleMaskClick"></view>
+		<view class="popup-content" :style="{ 
         backgroundColor: bgColor || getTypeStyle('bgColor'),
         borderColor: borderColor || getTypeStyle('borderColor'),
         color: textColor || getTypeStyle('textColor')
-      }"
-    >
-	<view v-if="showHeader&&headerTxt" class="header"
-	
-	>{{headerTxt}}</view>
-	
-     <view v-if="visibleClose" class="rightClose" 
-	 :style="{color:textColor || getTypeStyle('textColor')}"
-	 @click="closeClick"
-	 >x</view>
-	 
-      <view v-if="!visiblePrompt">
-        <image 
-          v-if="iconUrl" 
-          :src="iconUrl" 
-          mode="aspectFit" 
-          class="popup-icon"
-          :style="{ tintColor: textColor || getTypeStyle('textColor') }"
-        ></image>
-        <view class="popup-message" :class="showSlot?'displayNone':''">{{ message }}</view>
-		<view class="popup-message" :class="showSlot?'':'displayNone'">
-			<slot></slot>
-		</view>
-      </view>
-      
-     
-      <view v-else class="popup-prompt">
-        <text class="popup-prompt-title">{{ promptTitle || '请输入信息' }}</text>
-        <input 
-          class="popup-prompt-input"  
-          :placeholder="promptPlaceholder" 
-          :value="modelValue"
-          @input="handleInput"
-          @confirm="handleButtonClick"
-        />
-      </view>
-      
-	  <view class="popBtnContent" v-show="showCancel || buttonText">
-		  
-		  <view
-		    class="popup-button-cancel" 
-			v-if="showCancel"
-		   :style="{display:showCancel?'block':'none'}"
-		    @click="handleCancelClick"
-		  >{{ buttonCancelText?buttonCancelText:'取消' }}</view>
-		  
-		  <view
-		    class="popup-button" 
-			:class="buttonText?'':'displayNone'"
-		    :style="{ 
+      }">
+			<view v-if="showHeader&&headerTxt" class="header">{{headerTxt}}</view>
+
+			<view v-if="visibleClose" class="rightClose" :style="{color:textColor || getTypeStyle('textColor')}"
+				@click="closeClick">x</view>
+
+			<view v-if="!visiblePrompt">
+				<image v-if="iconUrl" :src="iconUrl" mode="aspectFit" class="popup-icon"
+					:style="{ tintColor: textColor || getTypeStyle('textColor') }"></image>
+				<view class="popup-message" :class="showSlot?'displayNone':''">{{ message }}</view>
+				<view class="popup-message" :class="showSlot?'':'displayNone'">
+					<slot></slot>
+				</view>
+			</view>
+
+
+			<view v-else class="popup-prompt">
+				<text class="popup-prompt-title">{{ promptTitle || '请输入信息' }}</text>
+				<input class="popup-prompt-input" :placeholder="promptPlaceholder" :value="modelValue"
+					@input="handleInput" @confirm="handleButtonClick" />
+			</view>
+
+			<view class="popBtnContent" v-show="showCancel || buttonText">
+
+				<view class="popup-button-cancel" v-if="showCancel" :style="{display:showCancel?'block':'none'}"
+					@click="handleCancelClick">{{ buttonCancelText?buttonCancelText:'取消' }}</view>
+
+				<view class="popup-button" :class="buttonText?'':'displayNone'" :style="{ 
 		      backgroundColor: buttonBgColor || getTypeStyle('buttonBgColor'),
 		      color: buttonTextColor || getTypeStyle('buttonTextColor')
-		    }"
-		    @click="handleButtonClick"
-		  >{{ buttonText }}</view>
-		  
-		  
-	  </view>
-     
-	  
-	  
-    </view>
-  </view>
+		    }" @click="handleButtonClick">{{ buttonText }}</view>
+
+
+			</view>
+
+
+
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  name: 'MessagePopup',
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-	visibleClose:{
-		type:Boolean,
-		default:true
-	},
-    visiblePrompt: {
-      type: Boolean,
-      default: false
-    },
-    promptTitle: String,
-    promptPlaceholder: {
-      type: String,
-      default: "请输入"
-    },
-    modelValue: {
-      type: String,
-      default: ''
-    },
-    type: {
-      type: String,
-      default: 'info',
-      validator: value => ['success', 'error', 'info','custom'].includes(value)
-    },
-    bgColor: String,
-    borderColor: String,
-    textColor: String,
-    buttonBgColor: String,
-    buttonTextColor: String,
-    iconUrl: String,
-    message: {
-      type: String,
-      default: ''
-    },
-    buttonText: {
-      type: String,
-      default: '确定'
-    },
-	buttonCancelText:{
-		type:String,
-		default:'取消'
-	},
-	showCancel:{
-		type:Boolean,
-		default:false
-	},
-	showHeader:{
-		type:Boolean,
-		default:false
-	},
-	headerTxt:{
-		type:String,
-		default:""
-	},
-	showSlot:{
-		type:Boolean,
-		default:false
+	export default {
+		name: 'MessagePopup',
+		props: {
+			visible: {
+				type: Boolean,
+				default: false
+			},
+			visibleClose: {
+				type: Boolean,
+				default: true
+			},
+			visiblePrompt: {
+				type: Boolean,
+				default: false
+			},
+			promptTitle: String,
+			promptPlaceholder: {
+				type: String,
+				default: "请输入"
+			},
+			modelValue: {
+				type: String,
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'info',
+				validator: value => ['success', 'error', 'info', 'custom'].includes(value)
+			},
+			bgColor: String,
+			borderColor: String,
+			textColor: String,
+			buttonBgColor: String,
+			buttonTextColor: String,
+			iconUrl: String,
+			message: {
+				type: String,
+				default: ''
+			},
+			buttonText: {
+				type: String,
+				default: '确定'
+			},
+			buttonCancelText: {
+				type: String,
+				default: '取消'
+			},
+			showCancel: {
+				type: Boolean,
+				default: false
+			},
+			showHeader: {
+				type: Boolean,
+				default: false
+			},
+			headerTxt: {
+				type: String,
+				default: ""
+			},
+			showSlot: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				inputValue: this.modelValue
+			}
+		},
+		watch: {
+			// 监听外部值变化
+			modelValue(newVal) {
+				this.inputValue = newVal
+			},
+			// 监听模式切换
+			visiblePrompt(newVal) {
+				console.log('[MessagePopup] visiblePrompt changed to:', newVal)
+				// 重置输入值
+				if (newVal) {
+					this.inputValue = this.modelValue
+				}
+			}
+		},
+		mounted() {
+
+		},
+		methods: {
+			getTypeStyle(styleType) {
+				const styles = {
+					success: {
+						bgColor: '#f0fff0',
+						borderColor: '#52c41a',
+						textColor: '#389e0d',
+						buttonBgColor: '#52c41a',
+						buttonTextColor: '#FFFFFF'
+					},
+					error: {
+						bgColor: '#fff0f0',
+						borderColor: '#ff4d4f',
+						textColor: '#cf1322',
+						buttonBgColor: '#ff4d4f',
+						buttonTextColor: '#FFFFFF'
+					},
+					info: {
+						bgColor: '#e6f7ff',
+						borderColor: '#1890ff',
+						textColor: '#0050b3',
+						buttonBgColor: '#1890ff',
+						buttonTextColor: '#FFFFFF'
+					}
+				}
+				return styles[this.type][styleType]
+			},
+			handleButtonClick() {
+
+				this.$emit('buttonClick', this.inputValue)
+			},
+			handleMaskClick() {
+
+				this.$emit('maskClick')
+			},
+			closeClick() {
+
+				this.$emit('closePop')
+			},
+			handleCancelClick() {
+
+				this.$emit('cancelPop');
+			},
+			handleInput(e) {
+
+				this.inputValue = e.detail.value
+				this.$emit('update:modelValue', this.inputValue)
+			}
+		}
 	}
-  },
-  data() {
-    return {
-      inputValue: this.modelValue
-    }
-  },
-  watch: {
-    // 监听外部值变化
-    modelValue(newVal) {
-      this.inputValue = newVal
-    },
-    // 监听模式切换
-    visiblePrompt(newVal) {
-      console.log('[MessagePopup] visiblePrompt changed to:', newVal)
-      // 重置输入值
-      if (newVal) {
-        this.inputValue = this.modelValue
-      }
-    }
-  },
-  mounted() {
-    
-  },
-  methods: {
-    getTypeStyle(styleType) {
-      const styles = {
-        success: {
-          bgColor: '#f0fff0',
-          borderColor: '#52c41a',
-          textColor: '#389e0d',
-          buttonBgColor: '#52c41a',
-          buttonTextColor: '#FFFFFF'
-        },
-        error: {
-          bgColor: '#fff0f0',
-          borderColor: '#ff4d4f',
-          textColor: '#cf1322',
-          buttonBgColor: '#ff4d4f',
-          buttonTextColor: '#FFFFFF'
-        },
-        info: {
-          bgColor: '#e6f7ff',
-          borderColor: '#1890ff',
-          textColor: '#0050b3',
-          buttonBgColor: '#1890ff',
-          buttonTextColor: '#FFFFFF'
-        }
-      }
-      return styles[this.type][styleType]
-    },
-    handleButtonClick() {
-      
-      this.$emit('buttonClick', this.inputValue)
-    },
-    handleMaskClick() {
-      
-      this.$emit('maskClick')
-    },
-	closeClick(){
-		 
-		 this.$emit('closePop')
-	},
-	handleCancelClick(){
-		 
-		this.$emit('cancelPop');
-	},
-    handleInput(e) {
-		
-      this.inputValue = e.detail.value
-      this.$emit('update:modelValue', this.inputValue)
-    }
-  }
-}
 </script>
 
 <style>
-	.displayNone{
+	.displayNone {
 		display: none !important
 	}
-.message-popup {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 9999;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
 
-.popup-mask {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.5);
-}
+	.message-popup {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 9999;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 
-.popup-content {
-  position: relative;
-  width: 80%;
-  max-width: 400px;
-  border-radius: 12px;
-  padding: 30rpx;
-  background-color: white;
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-  border-width: 2rpx;
-  border-style: solid;
-  box-sizing: border-box;
-  z-index: 10;
-}
-.header{
-	width:100%;
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-	font-size: 32rpx;
-	font-weight: 600;
-	height: 80rpx;
-	line-height: 80rpx;
-	letter-spacing: 0.07px;
-	text-align: center;
-}
-.rightClose{
-	position: absolute;
-	right: 20rpx;
-	top: 20rpx;
-	color: #FFFFFF;
-	font-size: 36rpx;
-	width: 24rpx;
-	height: 24rpx;
-	line-height: 24rpx;
-}
-.popup-icon {
-  width: 60rpx;
-  height: 60rpx;
-  margin: 20rpx auto;
-  display: block;
-}
+	.popup-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.5);
+	}
 
-.popup-message {
-  font-size: 28rpx;
-  text-align: center;
-  padding: 20rpx 0rpx 30rpx 0rpx;
+	.popup-content {
+		position: relative;
+		width: 80%;
+		max-width: 400px;
+		border-radius: 12px;
+		padding: 30rpx;
+		background-color: white;
+		box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+		border-width: 2rpx;
+		border-style: solid;
+		box-sizing: border-box;
+		z-index: 10;
+	}
 
-  
-  font-weight: 400;
+	.header {
+		width: 100%;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 32rpx;
+		font-weight: 600;
+		height: 80rpx;
+		line-height: 80rpx;
+		letter-spacing: 0.07px;
+		text-align: center;
+	}
 
-  letter-spacing: 0.07px;
-}
+	.rightClose {
+		position: absolute;
+		right: 20rpx;
+		top: 20rpx;
+		color: #FFFFFF;
+		font-size: 36rpx;
+		width: 24rpx;
+		height: 24rpx;
+		line-height: 24rpx;
+	}
 
-.popup-prompt {
-  width: 100%;
-}
+	.popup-icon {
+		width: 60rpx;
+		height: 60rpx;
+		margin: 20rpx auto;
+		display: block;
+	}
 
-.popup-prompt-title {
-  display: block;
-  font-size: 32rpx;
-  text-align: center;
-  margin-bottom: 20rpx;
-  font-weight: 500;
-}
+	.popup-message {
+		font-size: 28rpx;
+		text-align: center;
+		padding: 20rpx 0rpx 30rpx 0rpx;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+		white-space: pre-wrap;
+		word-wrap: break-word;
+		word-break: break-all;
+	}
 
-.popup-prompt-input {
-  width: 100%;
-  height: 80rpx;
-  line-height: 80rpx;
-  border: 1rpx solid #ddd;
-  border-radius: 8rpx;
-  padding: 0 20rpx;
-  margin-bottom: 30rpx;
-  font-size: 28rpx;
-  box-sizing: border-box;
-}
+	.popup-prompt {
+		width: 100%;
+	}
 
-.popBtnContent{
-	width:100%;
-	height: 60rpx;
-	 margin-top: 20rpx;
-	     display: flex
-	 ;
-	     flex-direction: row;
-	     flex-wrap: nowrap;
-	     align-content: center;
-	     justify-content: space-evenly;
-	     align-items: center;
-}
-.popup-button {
-  width: 30%;
-  height: 60rpx;
-  line-height: 60rpx;
-  border-radius: 44rpx;
-  
-  text-align: center;
-  font-size: 24rpx;
-  font-weight: 500;
-  letter-spacing: 4rpx;
-  border: none;
-  outline: none;
-  cursor: pointer;
- 
-}
+	.popup-prompt-title {
+		display: block;
+		font-size: 32rpx;
+		text-align: center;
+		margin-bottom: 20rpx;
+		font-weight: 500;
+	}
 
-.popup-button-cancel{
-	width: 30%;
-	height: 60rpx;
-	line-height: 60rpx;
-	border-radius: 44rpx;
-	
-	text-align: center;
-	font-size: 24rpx;
-	font-weight: 500;
-	letter-spacing: 4rpx;
-	border: none;
-	outline: none;
-	cursor: pointer;
-	 
-	 box-sizing: border-box;
-	 border: 1px solid rgba(255, 255, 255, 0.5);
+	.popup-prompt-input {
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		border: 1rpx solid #ddd;
+		border-radius: 8rpx;
+		padding: 0 20rpx;
+		margin-bottom: 30rpx;
+		font-size: 28rpx;
+		box-sizing: border-box;
+	}
 
-	 background-color: #00000000;
-	
-color: #FFFFFFde;
-}
+	.popBtnContent {
+		width: 100%;
+		height: 60rpx;
+		margin-top: 20rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+		align-items: center;
+	}
 
-.popup-prompt{
-	width: 100%;
-	height: 60rpx;
-	line-height: 60rpx;
-padding-top: 40rpx;	
-}
+	.popup-button {
+		width: 30%;
+		height: 60rpx;
+		line-height: 60rpx;
+		border-radius: 44rpx;
+
+		text-align: center;
+		font-size: 24rpx;
+		font-weight: 500;
+		letter-spacing: 4rpx;
+		border: none;
+		outline: none;
+		cursor: pointer;
+
+	}
+
+	.popup-button-cancel {
+		width: 30%;
+		height: 60rpx;
+		line-height: 60rpx;
+		border-radius: 44rpx;
+
+		text-align: center;
+		font-size: 24rpx;
+		font-weight: 500;
+		letter-spacing: 4rpx;
+		border: none;
+		outline: none;
+		cursor: pointer;
+
+		box-sizing: border-box;
+		border: 1px solid rgba(255, 255, 255, 0.5);
+
+		background-color: #00000000;
+
+		color: #FFFFFFde;
+	}
+
+	.popup-prompt {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding-top: 40rpx;
+	}
 
 
-.popup-prompt-title{
-	color: rgba(255, 255, 255, 0.6);
-	text-align: right;
-	width: 30%;
-	float: left;
-	box-sizing: border-box;
-	white-space:nowrap;
-	padding-right: 10rpx;
-}
-.popup-prompt-input{
-	float: left;
-	width: 70%;
-	height: 60rpx;
-	line-height: 60rpx;
-	color: rgba(255, 255, 255, 0.87) ;
-	
-	box-sizing: border-box;
-	border: 2rpx solid rgba(255, 255, 255, 0.4);
-	border-radius: 8rpx;
-
-}
-
+	.popup-prompt-title {
+		color: rgba(255, 255, 255, 0.6);
+		text-align: right;
+		width: 30%;
+		float: left;
+		box-sizing: border-box;
+		white-space: nowrap;
+		padding-right: 10rpx;
+	}
 
+	.popup-prompt-input {
+		float: left;
+		width: 70%;
+		height: 60rpx;
+		line-height: 60rpx;
+		color: rgba(255, 255, 255, 0.87);
 
+		box-sizing: border-box;
+		border: 2rpx solid rgba(255, 255, 255, 0.4);
+		border-radius: 8rpx;
 
+	}
 </style>
\ No newline at end of file
diff --git a/components/MsgBox/MsgBox.vue b/components/MsgBox/MsgBox.vue
index 77e99f1..8cefd65 100644
--- a/components/MsgBox/MsgBox.vue
+++ b/components/MsgBox/MsgBox.vue
@@ -1,57 +1,66 @@
-<template>
+<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>
+			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel"
+			:showHeader="item.showHeader" :headerTxt="item.headerTxt"
+		
+			@cancelPop="cancelClick(item,index)" />
+	</view>
+</template>
+
+<script>
+	import Common from '@/utils/Common.js'
 	export default {
-		 name: 'MsgBox',
-		data() {
-			return {
-				Msgboxs:[]
-			}
-		},
+		name: 'MsgBox',
+		data() {
+			return {
+				Msgboxs: []
+			}
+		},
 		methods: {
 			//确认按钮事件，如果回调函数返回true,将阻止关闭弹窗
-			okCallback(item,index){
-				let flag=false;
-				if(item.okCallback){
-					flag=item.okCallback(item,index)
+			okCallback(item, index) {
+				let flag = false;
+				if (item.okCallback) {
+					flag = item.okCallback(item, index)
 				}
-				
-				if(flag){
+
+				if (flag) {
 					return;
 				}
 				this.closePop(item);
 			},
 			//取消按钮,如果回调函数返回true，将阻止关闭弹窗
-			cancelClick(item,index){
-				let flag=false;
-				if(item.cancelCallback){
-					flag=item.cancelCallback(item,index)
+			cancelClick(item, index) {
+				let flag = false;
+				if (item.cancelCallback) {
+					flag = item.cancelCallback(item, index)
 				}
-				
-				if(flag){
+
+				if (flag) {
 					return;
 				}
 				this.closePop(item);
-			},
+			},
 			closePop: function(item) {
-			
+				debugger;
 				if (item) {
 					this.Msgboxs.find((v, i) => {
-						if (item.key === v.key) {
-							this.Msgboxs.splice(i, 1);
+						debugger;
+						if (item.key && v.key) {
+							if (item.key === v.key) {
+								this.Msgboxs.splice(i, 1);
+								return true;
+							}
 						}
+
 					});
-			
+
 					if (item.cancelCallback) {
 						item.cancelCallback();
 					}
@@ -59,12 +68,12 @@
 					if (this.Msgboxs.length > 0) {
 						this.Msgboxs.splice(this.Msgboxs.length - 1, 1);
 					}
-			
+
 				}
-			
+
 			},
 			//根据传入的配置，自定义一个弹窗
-			showPop: function(option,isClear) {
+			showPop: function(option, isClear) {
 				let def = {
 					key: '',
 					showPop: true, //是否显示弹窗
@@ -86,41 +95,44 @@
 					showSlot: false,
 					buttonCancelText: '',
 					showCancel: false,
-					cancelCallback: null
+					cancelCallback: null,
+					visible:false,
+					promptPlaceholder:'',
+					type:'custom',
+					showHeader:false,
+					headerTxt:''
 				}
 				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];
-					}
+					Object.assign(json, option);
 				}
-			
+
 				if (!json.borderColor) {
 					json.borderColor = '#BBE600';
 					json.buttonBgColor = '#BBE600';
 				}
 				json.showPop = true;
-				if (!('key' in json)) {
-					json.key = new Date().getTime();
+				
+				
+				if(!json.key){
+					json.key =Common.guid();
 				}
-				
+
 				this.Msgboxs.push(json);
-				
+
 				return json;
 			},
-			//弹出预定好的三种弹窗
-			showMsg(msg,btnTxt, type,okCallback) {
-			
+			//弹出预定好的三种弹窗			
+			showMsg(msg, btnTxt, type, okCallback) {
+
 				let cfg = {
 					error: {
 						icoUrl: '/static/images/6155/DeviceDetail/uploadErr.png',
@@ -138,50 +150,50 @@
 						buttonBgColor: "#FFC84E",
 					}
 				}
-			
+
 				if (!type) {
 					type = 'error';
 				}
 				if (!cfg[type]) {
 					type = 'error';
 				}
-			
-			
-				let guid =  new Date().getTime()+"";
+
+
+				let guid =Common.guid();
 				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
+					buttonText: btnTxt ? btnTxt : '确定',
+					okCallback: okCallback ? okCallback : this.closePop
 				};
 				return this.showPop(options);
-				
-			},					
+
+			},
 			//清除所有弹窗
-			clearPops(){
-				this.Msgboxs=[];
+			clearPops() {
+				this.Msgboxs = [];
 			},
 			//获取当前所有弹窗的数量
-			getPops(){
+			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>
+			}
+		}
+	}
+</script>
+
+<style>
+	.msgBox {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 99999;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/components/TextToHex/TextToHexV2.vue b/components/TextToHex/TextToHexV2.vue
new file mode 100644
index 0000000..ffd27b4
--- /dev/null
+++ b/components/TextToHex/TextToHexV2.vue
@@ -0,0 +1,291 @@
+<template>
+	<view>
+		<canvas type="2d" canvas-id="reusableCanvas" :width="currentCanvasWidth" :height="currentCanvasHeight"
+			class="offscreen-canvas"></canvas>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "TextToHexV2",
+		props: {
+			txts: {
+				type: Array,
+				default: () => [],
+				validator: (value) => value.every(item => typeof item === 'string')
+			},
+			fontSize: {
+				type: Number,
+				default: 12,
+				validator: (value) => value > 0 && value <= 100
+			},
+			bgColor: {
+				type: String,
+				default: "#ffffff"
+			},
+			color: {
+				type: String,
+				default: "#000000"
+			},
+			currentCanvasWidth: {
+				type: Number,
+				default: 80
+			},
+			currentCanvasHeight: {
+				type: Number,
+				default: 12
+			},
+			returnType: { //返回值的进制，默认16进制
+				type: Number,
+				default: 16
+			}
+		},
+		data() {
+			return {
+
+				// Canvas上下文（复用）
+				ctx: null,
+				// 标记是否已经预热过画布
+				canvasWarmed: false
+			};
+		},
+		computed: {
+			validTxts() {
+				return this.txts.filter(line => line.trim() !== '');
+			}
+		},
+		mounted() {
+			// 初始化Canvas上下文（只创建一次）
+			this.ctx = uni.createCanvasContext('reusableCanvas', this);
+		},
+		methods: {
+			/**
+			 * 估算单行文本所需的Canvas宽度
+			 */
+			calcLineWidth(textLine) {
+				return textLine.length * 16;
+			},
+
+			/**
+			 * 清除Canvas内容
+			 */
+			clearCanvas() {
+				this.ctx.setFillStyle(this.bgColor);
+				this.ctx.fillRect(0, 0, this.currentCanvasWidth, this.currentCanvasHeight);
+			},
+
+			/**
+			 * 预热画布，确保画布和字体完全准备好（解决APP重新打开后第一次获取数据不完整的问题）
+			 */
+			async warmupCanvas() {
+				if (this.canvasWarmed) {
+					return;
+				}
+
+				try {
+					// 清空画布
+					this.clearCanvas();
+
+					// 绘制一个测试字符来预热字体和画布
+					this.ctx.setFillStyle(this.color);
+					this.ctx.setFontSize(this.fontSize);
+					this.ctx.font = `${this.fontSize}px "PingFangBold","PingFang SC", Arial, sans-serif`;
+					this.ctx.setTextBaseline('middle');
+					this.ctx.fillText('测', 0, 8);
+
+					// 等待画布绘制完成
+					await new Promise((resolve) => {
+						this.ctx.draw(false, () => {
+							// 获取一次测试数据，确保canvasGetImageData API已准备好
+							setTimeout(() => {
+								uni.canvasGetImageData({
+									canvasId: 'reusableCanvas',
+									x: 0,
+									y: 0,
+									width: 16,
+									height: 16,
+									success: () => {
+										this.canvasWarmed = true;
+										resolve();
+									},
+									fail: () => {
+										this.canvasWarmed = true;
+										resolve();
+									}
+								});
+							}, 100);
+						});
+					});
+
+					// 额外等待确保字体完全加载
+					await new Promise(resolve => setTimeout(resolve, 200));
+				} catch (ex) {
+					console.log("画布预热异常:", ex);
+					this.canvasWarmed = true; // 即使失败也标记为已预热，避免重复尝试
+				}
+			},
+
+			/**
+			 * 复用单个Canvas处理所有文本行
+			 */
+			async drawAndGetPixels() {
+				// 第一次调用时先预热画布（解决APP重新打开后第一次获取数据不完整的问题）
+				await this.warmupCanvas();
+
+				let convertCharToMatrix = (imageData) => {
+
+					try {
+						// console.log("imgData=",imageData.length)
+						let matrix = [];
+						let k = 0;
+						let tmpArr = [];
+						while (k < imageData.length) {
+
+							let r = imageData[k];
+							let g = imageData[k + 1];
+							let b = imageData[k + 2];
+							let a = imageData[k + 3];
+
+
+							// if (r === 255 && a >= 0) {
+							// 	r = 255;
+							// } else {
+							// 	r = 0;
+							// }
+							
+
+							// if (r === 255) {
+							// 	tmpArr.push(1);
+							// } else {
+							// 	tmpArr.push(0);
+							// }
+
+
+							// 黑色像素（R值较低）视为1，白色视为0
+							let isBlack = r < 128;
+
+							let byte1 = 0;
+
+							if (isBlack) {
+								byte1 = 1; // 从左到右设置位
+							}
+
+							 tmpArr.push(byte1);
+
+							if (tmpArr.length == 8) {
+								tmpArr = parseInt(tmpArr.join(''), 2);
+
+								if (this.returnType == 16) {
+									matrix.push('0x' + tmpArr.toString(16).padStart(2, '0').toUpperCase());
+
+								} else if (this.returnType == 10) {
+									matrix.push(tmpArr);
+
+								}
+								if (this.returnType == 2) {
+									matrix.push(tmpArr.toString(2).padStart(8, '0'));
+								}
+
+								tmpArr = [];
+							}
+
+							k += 4;
+						}
+
+						// console.log("matrix=",matrix);
+
+						return matrix;
+					} catch (ex) {
+						console.error("ex=", ex);
+					}
+
+				}
+
+				let drawTxt = async (textLine) => {
+					let result = {};
+					let ctx = this.ctx;
+
+
+
+
+					// 2. 清空Canvas（绘制背景）
+					this.clearCanvas();
+
+					// 3. 设置文字样式
+					ctx.setFillStyle(this.color);
+					ctx.setTextBaseline('middle');
+					// ctx.setTextAlign('center')
+					ctx.setFontSize(this.fontSize);
+					ctx.font = `${this.fontSize}px "PingFangBold", "PingFang SC", Arial, sans-serif`;
+
+					// 4. 绘制当前行文本
+					let currentX = 0;
+					let currentY = this.fontSize / 2;
+					console.log("textLine=", textLine)
+					ctx.fillText(textLine, currentX, currentY);
+					// for (let j = 0; j < textLine.length; j++) {
+					// 	let char = textLine[j];
+					// 	ctx.fillText(char, currentX, currentY);
+					// 	// 按实际字符宽度计算间距
+					// 	let charWidth = ctx.measureText(char).width;
+					// 	currentX += charWidth;
+					// }
+
+					// 5. 异步绘制并获取像素数据（串行处理避免冲突）
+					await new Promise((resolve, reject) => {
+						ctx.draw(false, () => {
+							uni.canvasGetImageData({
+								canvasId: 'reusableCanvas',
+								x: 0,
+								y: 0,
+								width: this.currentCanvasWidth,
+								height: this.currentCanvasHeight,
+								success: res => {
+
+									result = {
+										line: textLine,
+										pixelData: res.data,
+										width: this.currentCanvasWidth,
+										height: this.currentCanvasHeight
+									};
+									resolve();
+								},
+								fail: err => {
+									console.error(`处理第${i+1}行失败:`, err);
+									reject(err)
+								}
+							});
+						});
+					});
+
+					return result;
+				}
+				let arr = [];
+				// 循环处理每行文本
+				for (let i = 0; i < this.validTxts.length; i++) {
+
+					let linePixls = [];
+					let item = this.validTxts[i];
+
+					console.log("item=", item);
+					let result = await drawTxt(item);
+					linePixls.push(convertCharToMatrix(result.pixelData));
+
+
+					arr.push(linePixls);
+				}
+
+				return arr;
+			}
+		}
+	};
+</script>
+
+<style>
+	.offscreen-canvas {
+			position: fixed;
+		left: -9999px;
+		top: -9999px;
+		visibility: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/config/index.js b/config/index.js
index d8101c0..cd10922 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,7 +2,7 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000		
+		BASE_URL: 'http://192.168.110.57: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 c0b6df4..864842f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "星汉物联",
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
-    "versionName" : "1.0.18",
-    "versionCode" : "100",
+    "versionName" : "1.0.19",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -44,7 +44,6 @@
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
@@ -100,8 +99,23 @@
                 },
                 "push" : {
                     "unipush" : {
+                        "offline" : true,
+                        "hms" : {},
+                        "oppo" : {},
+                        "vivo" : {},
+                        "mi" : {},
+                        "honor" : {},
                         "version" : "2",
-                        "offline" : true
+                        "icons" : {
+                            "small" : {
+                                "ldpi" : "unpackage/res/icons/18x18.png",
+                                "mdpi" : "unpackage/res/icons/24x24.png",
+                                "hdpi" : "unpackage/res/icons/36x36.png",
+                                "xhdpi" : "unpackage/res/icons/48x48.png",
+                                "xxhdpi" : "unpackage/res/icons/72x72.png"
+                            }
+                        },
+                        "meizu" : {}
                     }
                 }
             },
@@ -170,7 +184,8 @@
     "fallbackLocale" : "zh-Hans",
     "app-harmony" : {
         "distribute" : {
-            "modules" : {}
+            "modules" : {},
+            "bundleName" : "uni.app.UNIA21EF43.Hommey"
         }
     }
 }
diff --git a/pages.json b/pages.json
index 8002641..64d3058 100644
--- a/pages.json
+++ b/pages.json
@@ -52,8 +52,7 @@
 		{
 			"path": "pages/common/send/index",
 			"style": {
-				"navigationBarTitleText": "发送信息",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "发送信息"
 			}
 		},
 		{
@@ -102,10 +101,9 @@
 			}
 		},
 		{
-			"path": "pages/6170/callPolice/index",
+			"path": "pages/common/callPolice/index",
 			"style": {
-				"navigationBarTitleText": "报警",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "报警"
 			}
 		},
 
@@ -160,14 +158,7 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/6155/ImgCrop",
-			"style": {
-				"navigationBarTitleText": "图像裁剪",
-				"navigationStyle": "custom",
-				"fullscreen": true
-			}
-		},
+	
 		{
 			"path": "pages/6075/BJQ6075",
 			"style": {
@@ -440,6 +431,21 @@
 			"style": {
 				"navigationBarTitleText": "蓝牙添加设备"
 			}
+		},
+		{
+			"path" : "pages/6075J/BJQ6075J",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/common/ImgCrop/ImgCrop",
+			"style": {
+				"navigationBarTitleText": "图像裁剪",
+				"navigationStyle": "custom",
+				"fullscreen": true
+			}
 		}
 
 	],
diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue
index ea99012..b9cdbf4 100644
--- a/pages/100/HBY100.vue
+++ b/pages/100/HBY100.vue
@@ -223,11 +223,11 @@
 
 
 
-		
 
-			
+
+
 		</view>
-		
+
 		<view class="proinfo lamp">
 			<text class="title">产品信息</text>
 			<view class="itemcontent">
@@ -245,18 +245,18 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 弹窗通知 -->
-			<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
-				:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
-				:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
-				:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
-				@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
-				v-model="Status.Pop.modelValue" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
-				:showCancel="Status.Pop.showCancel" @cancelPop="closePop" />
-		
-			<!-- 下方菜单 -->
-			<!-- 		<BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
+		<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
+			:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
+			:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
+			:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
+			@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
+			v-model="Status.Pop.modelValue" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
+			:showCancel="Status.Pop.showCancel" @cancelPop="closePop" />
+
+		<!-- 下方菜单 -->
+		<!-- 		<BottomSlideMenuPlus :config="Status.BottomMenu" @close="closeMenu" @itemClick="handleItemClick"
 			@btnClick="btnClick">
 			<view>
 				<view class="addIco">
@@ -266,8 +266,8 @@
 				</view>
 			</view>
 		</BottomSlideMenuPlus> -->
-		
-			<global-loading ref="loading" />
+
+		<global-loading ref="loading" />
 	</view>
 </template>
 
@@ -336,7 +336,7 @@
 						showHeader: true,
 						menuItems: [{
 							text: '强光',
-							icon: '/static/images/6155/DeviceDetail/qiang.png'
+							icon: '/static/images/lightImg/qiang.png'
 						}],
 						activeIndex: -1,
 						bgColor: '#2a2a2a',
@@ -518,6 +518,11 @@
 			recei = BleReceive.getBleReceive();
 			ble = BleTool.getBleTool();
 
+			this.$watch("formData.sta_battery", (newVal, oldVal) => {
+				if (newVal <= 20 && this.formData.sta_system==2) {
+					this.showMsg("设备电量低");
+				}
+			});
 
 			ble.addReceiveCallback(this.bleValueNotify, pagePath);
 			ble.addStateBreakCallback(this.bleStateBreak, pagePath);
@@ -572,10 +577,10 @@
 
 				these.formData.bleStatu = false;
 				these.formData.deviceId = f.deviceId;
-			these.formData.bleStatu = 'connecting';
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
 					these.formData.bleStatu = true;
-				}).catch(ex=>{
+				}).catch(ex => {
 					these.formData.bleStatu = 'err';
 				});
 				these.setBleFormData();
@@ -592,17 +597,17 @@
 			this.Status.pageHide = false;
 		},
 		computed: {
-			getbleStatu(){
-				if(this.formData.bleStatu===true){
+			getbleStatu() {
+				if (this.formData.bleStatu === true) {
 					return '已连接';
 				}
-				if(this.formData.bleStatu==='connecting'){
+				if (this.formData.bleStatu === 'connecting') {
 					return '连接中';
 				}
-				if(this.formData.bleStatu==='dicconnect'){
+				if (this.formData.bleStatu === 'dicconnect') {
 					return '正在断开';
 				}
-				if(this.formData.bleStatu==='err'){
+				if (this.formData.bleStatu === 'err') {
 					return '连接异常';
 				}
 				return '未连接';
@@ -1196,9 +1201,9 @@
 					return;
 				}
 				if (res.deviceId == these.formData.deviceId) {
-					if(res.device){
+					if (res.device) {
 						these.formData.bleStatu = 'connecting';
-					}else{
+					} else {
 						this.formData.bleStatu = false;
 					}
 					setTimeout(() => {
@@ -1233,14 +1238,14 @@
 				showLoading(this, {
 					text: "蓝牙恢复可用,正在连接设备"
 				});
-				these.formData.bleStatu='connecting';
+				these.formData.bleStatu = 'connecting';
 				ble.LinkBlue(these.formData.deviceId).then(() => {
 					these.formData.bleStatu = true;
 					updateLoading(these, {
 						text: '连接成功'
 					});
 				}).catch(ex => {
-					these.formData.bleStatu='err';
+					these.formData.bleStatu = 'err';
 					updateLoading(these, {
 						text: ex.msg
 					})
@@ -1313,9 +1318,10 @@
 					}
 				});
 
-				if (this.formData.sta_battery <= 20) {
-					this.showMsg("设备电量低");
-				}
+
+
+
+
 			},
 			getDevice: function() {
 
@@ -1327,32 +1333,32 @@
 
 				return f;
 			},
-			
-			bleStatuToggle(){
-				let f=this.getDevice();
-				if(!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;
+				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';
+
+				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=>{
+					}).catch(ex => {
 						these.formData.bleStatu = 'err';
 					});
 					return;
 				}
-				
-				
+
+
 			},
 
 
diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue
index 25d16bc..fa76ad2 100644
--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@@ -273,7 +273,7 @@
 						showHeader: true,
 						menuItems: [{
 							text: '强光',
-							icon: '/static/images/6155/DeviceDetail/qiang.png'
+							icon: '/static/images/lightImg/qiang.png'
 						}],
 						activeIndex: -1,
 						bgColor: '#2a2a2a',
diff --git a/pages/4877/BJQ4877.vue b/pages/4877/BJQ4877.vue
index 0b34338..d1de357 100644
--- a/pages/4877/BJQ4877.vue
+++ b/pages/4877/BJQ4877.vue
@@ -355,15 +355,15 @@
 						showHeader: true,
 						menuItems: [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							}
 						],
 						activeIndex: -1,
diff --git a/pages/4877/BJQ4877V1.vue b/pages/4877/BJQ4877V1.vue
index 0c5d03a..ab6d45c 100644
--- a/pages/4877/BJQ4877V1.vue
+++ b/pages/4877/BJQ4877V1.vue
@@ -279,15 +279,15 @@ import request, { baseURL } from '@/utils/request.js';
 						showHeader: true,
 						menuItems: [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							}
 						],
 						activeIndex: -1,
diff --git a/pages/6075/BJQ6075.vue b/pages/6075/BJQ6075.vue
index a61429b..3e4d8dc 100644
--- a/pages/6075/BJQ6075.vue
+++ b/pages/6075/BJQ6075.vue
@@ -679,7 +679,7 @@
 						}
 						let that = this;
 						uni.navigateTo({
-							url: "/pages/6155/ImgCrop",
+							url: "/pages/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOverPath: function(data) {
 									that.selectedImage = data.picPath;
diff --git a/pages/6075J/BJQ6075J.vue b/pages/6075J/BJQ6075J.vue
new file mode 100644
index 0000000..8115957
--- /dev/null
+++ b/pages/6075J/BJQ6075J.vue
@@ -0,0 +1,2908 @@
+<template>
+	<view class="maincontent contentBg">
+
+		<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>
+					<uni-icons type="left" size="24" color="#FFFFFF"></uni-icons>
+				</view>
+			</template>
+			<block slot="right">
+				<view class="navbarRight center">
+					<image @click.stop="handleRightClick(index,item)" v-for="item,index in Status.navbar.icons"
+						class="img" :src="item.src" mode="aspectFit"></image>
+				</view>
+
+			</block>
+		</uni-nav-bar>
+
+		<view class="eq" :style="{marginTop:Status.navbar.height+'px'}">
+			<view class="leftImg" @click.stop="previewImg(device.devicePic?device.devicePic:formData.img)">
+				<image class="img" :src="device.devicePic?device.devicePic:formData.img" mode="aspectFit"></image>
+			</view>
+			<view class="rightTxt">
+				<view class="row">
+					<image class="img" src="/static/images/6155/DeviceDetail/battry.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{formData.sta_PowerPercent}}%</view>
+						<view class="smallTxt">电量</view>
+					</view>
+				</view>
+				<view class="row">
+					<image class="img" src="/static/images/6155/DeviceDetail/time.png" mode="aspectFit"></image>
+					<view class="txt">
+						<view class="bigTxt">{{battery}}</view>
+						<view class="smallTxt">续航时间</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="warnnig" :class="formData.sta_ShakeBit!==0 && formData.showShakeBit ?'':'displayNone'">
+			<view>{{formData.sta_ShakeBit==1?'设备疑似受到外力碰撞':'设备声光报警中'}}！</view>
+			<view @click.stop="SOSToggle()">
+				<uni-icons type="closeempty" color="#FFFFFFde" size="16"></uni-icons>
+			</view>
+			
+			
+		</view>
+
+
+
+		<view class="eqinfo">
+			<view class="item">
+				<text class="lbl">设备名称</text>
+				<text class="value valueFont">{{device.deviceName}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备IMEI</text>
+				<text class="value valueFont">{{device.deviceImei}}</text>
+			</view>
+
+			<view class="item">
+				<text class="lbl">Mac地址</text>
+				<text class="value">{{device.deviceMac}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">蓝牙名称</text>
+				<text class="value valueFont">{{device.bluetoothName}}</text>
+			</view>
+			<view class="item" @click.top="bleStatuToggle">
+				<text class="lbl">蓝牙状态</text>
+				<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
+			</view>
+			<view class="item">
+				<text class="lbl">设备状态</text>
+				<text class="value valueFont">{{sta_system}}</text>
+			</view>
+
+			<view class="item">
+				<text class="lbl">定位信息</text>
+				<view class="multiValue" @click.stop="gotoMap()">
+					<view class="valueItem valueFont">
+						{{formData.sta_longitude}}
+
+					</view>
+					<view class="valueItem valueFont">
+
+						{{formData.sta_latitude}}
+
+					</view>
+					<view class="valueItem">
+
+						<view style="width:80%;float: right;text-align: right;" class="valueFont">
+							<uni-icons type="location" size="17" color="rgba(255, 255, 255, 0.8)"
+								style="vertical-align: bottom;" />
+							{{formData.address}}
+						</view>
+						<view class="clear"></view>
+					</view>
+				</view>
+
+
+			</view>
+		</view>
+
+		<view class="eqinfo">
+			<view class="item">
+				<view>
+					<text class="lbl">海拔高度</text>
+					<view class="value valueFont leftIndent">{{formData.sta_height}}m</view>
+				</view>
+				<view>
+					<text class="lbl">相对高度</text>
+					<view class="value valueFont leftIndent">{{formData.sta_releaHeight}}m</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="lamp">
+			<view class="title">
+				<text>灯光亮度</text>
+				<text>{{formData.sta_brightness}}%</text>
+			</view>
+
+			<view class="slider-container">
+				<slider min="10" max="100" step="10" :disabled="false" :value="formData.sta_brightness"
+					activeColor="#bbe600" backgroundColor="#00000000" block-size="20" block-color="#ffffffde"
+					@change="sliderChange" @changing="sliderChanging" class="custom-slider" />
+
+			</view>
+		</view>
+		<view class="lampMode">
+			<view class="mode " v-on:click.stop="showAction('main')">
+				<view class="leftImg">
+					<image class="img" src="/static/images/6155/DeviceDetail/mainLamp.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">主灯模式</text>
+					<text class="smallTxt">{{MainLight}}</text>
+				</view>
+			</view>
+			<view class="mode  " v-on:click.stop="showAction('fu')">
+				<view class="leftImg">
+					<image class="img" src="/static/images/6155/DeviceDetail/fuLamp.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">辅灯模式</text>
+					<text class="smallTxt">{{FuLight}}</text>
+				</view>
+			</view>
+			<view class="mode  " :class="{active:formData.sta_laser===1}" v-on:click.stop="laserToggle">
+				<view class="leftImg">
+
+					<image class="img" src="/static/images/common/jig.png" v-show="formData.sta_laser!==1"
+						mode="aspectFit"></image>
+					<image class="img" src="/static/images/common/jigA.png" v-show="formData.sta_laser===1"
+						mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">激光模式</text>
+				</view>
+			</view>
+			<view class="mode  " :class="{active:formData.sta_ShakeBit!==0}" v-on:click.stop="SOSToggle">
+				<view class="leftImg">
+					<image class="img" src="/static/images/common/sg.png" v-show="formData.sta_ShakeBit===0"
+						mode="aspectFit"></image>
+					<image class="img" src="/static/images/common/sgActive.png" v-show="formData.sta_ShakeBit!==0"
+						mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">声光报警</text>
+
+				</view>
+			</view>
+			<view class="mode  " v-on:click.stop="showUploadMedia">
+				<view class="leftImg">
+					<image class="img" src="/static/images/6155/DeviceDetail/open.png" mode="aspectFit"></image>
+				</view>
+				<view class="rightTxt">
+					<text class="bigTxt">开机画面</text>
+					<text class="smallTxt">上传</text>
+				</view>
+			</view>
+
+
+		</view>
+
+		<view class="usrinfo">
+			<view @click="Status.usrToggle=!Status.usrToggle">
+				<text class="usrtitle fleft">人员信息登记</text>
+				<view class="image fright" :style="{transform:Status.usrToggle?'rotate(0deg)':'rotate(180deg)' }">
+
+					<image class="img" src="/static/images/6155/DeviceDetail/slideToggle.png" mode="aspectFit"></image>
+
+				</view>
+
+				<view class="clear"></view>
+			</view>
+			<view :class="Status.usrToggle?'':'displayNone'">
+				<view style="margin: 20rpx 0rpx;">
+
+					<view class="btnSend fright" v-on:click.stop="sendUsr(null)">发送</view>
+
+					<TextToHexV1 class="TextToHex" ref="textToHex" :txts="formData.textLines" :bgColor="'#FFFFFF'"
+						:color="'#000000'" :fontSize="16" />
+
+					<view class="clear"></view>
+				</view>
+				<view class="item">
+					<text class="lbl">单位：</text>
+					<input class="value" v-model="formData.company" placeholder="请输入单位" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">姓名：</text>
+					<input class="value" v-model="formData.usrname" placeholder="请输入姓名" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">职位：</text>
+					<input class="value" v-model="formData.job" placeholder="请输入职位" placeholder-class="usrplace" />
+				</view>
+				<view class="item">
+					<text class="lbl">ID号：</text>
+					<input class="value" v-model="formData.usrid" placeholder="请输入ID" placeholder-class="usrplace" />
+				</view>
+			</view>
+		</view>
+
+		<view class="usrinfo">
+			<view>
+				<text class="usrtitle fleft">发送信息</text>
+				<view class="btnSend fright" v-on:click.stop="sendMsg(null)">发送</view>
+				<view class="clear"></view>
+			</view>
+			<view>
+
+				<view class="item">
+					<input maxlength="16" class="value" style="text-indent: 20rpx;" v-model="formData.msgTxt"
+						placeholder="请输入文字" placeholder-class="usrplace" />
+				</view>
+
+			</view>
+		</view>
+
+		<view class="proinfo lamp">
+			<text class="title">产品信息</text>
+			<view class="itemcontent">
+				<view class="item" @click="proDetail('productDes')">
+					<image class="img" src="/static/images/6155/DeviceDetail/param.png" mode="aspectFit"></image>
+					<text class="txt">产品参数</text>
+				</view>
+				<view class="item" @click="proDetail('operatingInstruct')">
+					<image class="img" src="/static/images/6155/DeviceDetail/remark.png" mode="aspectFit"></image>
+					<text class="txt">操作说明</text>
+				</view>
+				<view class="item" @click="proDetail('operationVideo')">
+					<image class="img" src="/static/images/6155/DeviceDetail/video.png" mode="aspectFit"></image>
+					<text class="txt">操作视频</text>
+				</view>
+			</view>
+		</view>
+
+		<MsgBox ref="msgPop" />
+		<global-loading ref="loading" />
+		<BottomSlideMenuPlus v-for="item,index in dic.actionSheets" :config="item" @close="item.closeMenu"
+			@itemClick="item.handleItemClick" @btnClick="item.btnClick">
+		</BottomSlideMenuPlus>
+	</view>
+</template>
+
+<script>
+	import api from '@/api/670/HBY670.js';
+	import TextToHexV1 from '@/components/TextToHex/TextToHexV1.vue';
+	import request, {
+		baseURL
+	} 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';
+	import BleTool from '@/utils/BleHelper.js'
+	import BleReceive from '@/utils/BleReceive';
+	import MqttClient from '@/utils/mqtt.js';
+	import lnglatConvert from '@/utils/wgs84_to_gcj02.js'
+	var eventChannel = null;
+	var these = null;
+	var ble = null;
+	var rec = null;
+	var mq = null;
+	var pagePath = "pages/6075J/BJQ6075J";
+	var brightnessTimer = null;
+	export default {
+		components: {
+			TextToHexV1
+		},	
+		data() {
+			return {
+				Status: {
+					
+					
+					pageHide: false,
+					apiType: "listA",
+					navbar: {
+						icons: [
+							// {
+							// 	src: '/static/images/common/msg.png'
+							// },
+							{
+								src: '/static/images/common/shape.png'
+							}
+						],
+						title: 'BJQ6075',
+						showBack: true,
+						height: 90
+					},
+					usrToggle: true,
+					
+				},
+				formData: {
+					img: '/static/images/common/BJQ6075.png',
+					sta_PowerPercent: "", //电量
+					sta_PowerTime: "", //续航
+					sta_imei: "", //sta_imei
+					sta_longitude: "", //经度
+					sta_latitude: "", //纬度 
+					address:'',
+
+					textLines: [],
+					company: "湖北星汉文化", //单位
+					usrname: "有限公司", //姓名 
+					job: "工程师", //职位
+					usrid: "11223344", //id
+					sendMsg: "",
+
+					deviceId: "",
+					sta_system: "", //设备状态，0关机，1仅充电，2开机未充电,3，开机且充电
+					bleStatu: false,
+
+					sta_LightGrade: "", //主灯档位
+					sta_LightGrade: "", //副灯档位
+					sta_ShakeBit: "1", //报警状态
+					sta_4gSinal: "", //4G信号强度
+					sta_laser: "", //激光状态
+					sta_brightness: 100, //亮度
+					sta_SOSGrade: "1", //强制报警状态
+					
+					showSosGrade:false,
+					showShakeBit:false,
+					sta_height:'',//海拔
+					sta_releaHeight:'',
+					sta_BreakNews:'',
+					deviceId:''
+				},
+				device: {
+					id: "",
+					deviceName: "",
+					deviceImei: "",
+					deviceMac: "",
+					communicationMode: 0,
+					devicePic: "",
+					typeName: "",
+					bluetoothName: null,
+					deviceStatus: null,
+					bindingTime: "",
+					onlineStatus: 0,
+					battery: "0",
+					latitude: null,
+					longitude: null,
+					alarmStatus: null,
+					detailPageUrl: "/pages/670/HBY670",
+					showConfirm: false
+				},
+
+				permissions: [],
+
+				dic: {
+					actionSheets: [
+
+
+					]
+				},
+				detailData: {
+					deviceId: null,
+					deviceName: null,
+					deviceImei: null,
+					deviceMac: null,
+					communicationMode: null,
+					devicePic: null,
+					typeName: null,
+					bluetoothName: null,
+					deviceStatus: null,
+					personnelInfo: null,
+					onlineStatus: null,
+					longitude: null,
+					latitude: null,
+					address: null,
+					staDetectGrade: null,
+					staLightGrade: null,
+					staSOSGrade: null,
+					staPowerTime: null,
+					staPowerPercent: null,
+					staDetectResult: null
+				},
+				inteval:50
+			}
+		},
+		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 '未连接';
+			},
+			MainLight() {
+				return this.getLightMode('main');
+			},
+			FuLight() {
+				return this.getLightMode('fu');
+			},
+			sta_system() {
+				let state = '关机';
+				if (this.formData.sta_system == 3) {
+					state = '开机充电中';
+				} else if (this.formData.sta_system == 2) {
+					state = '开机未充电';
+				} else if (this.formData.sta_system == 1) {
+					state = "仅充电";
+				}
+				return state;
+			},
+			battery(){
+				let hours = Math.floor(this.formData.sta_PowerTime / 60);
+				let remainingMinutes = this.formData.sta_PowerTime % 60;
+								
+				let xuhang = '0分';
+				// 处理不同情况的显示
+				if (hours === 0) {
+					xuhang = `${remainingMinutes}分`;
+				} else if (remainingMinutes === 0) {
+					xuhang = `${hours}小时`;
+				} else {
+					xuhang = `${hours}小时${remainingMinutes}分`;
+				}
+				return xuhang;
+			}
+		},
+		created() {
+			this.Status.navbar.height = uni.getSystemInfoSync().statusBarHeight + 20;
+		},
+		onUnload() {
+			console.log("页面卸载,释放资源");
+			let statusTopic = `A/${this.formData.sta_imei?this.formData.sta_imei:this.device.deviceImei}`;
+
+			if (ble) {
+				ble.removeAllCallback(pagePath);
+				ble.removeReceiveCallback(pagePath);
+			}
+
+			if (mq) {
+				mq.unsubscribe(statusTopic);
+				mq.disconnect();
+				mq = null;
+			}
+			clearTimeout(brightnessTimer);
+		},
+		onShow() {
+			this.Status.pageHide = false;
+		},
+		onHide: function() {
+			this.Status.pageHide = true;
+		},
+
+		onLoad() {
+
+			these = this;
+			this.initActionData();
+
+			this.initWatch();
+			
+
+
+			rec = BleReceive.getBleReceive();
+			ble = BleTool.getBleTool();
+
+
+			ble.addReceiveCallback(these.bleValueNotify, pagePath);
+			ble.addStateBreakCallback(these.bleStateBreak, pagePath);
+			ble.addStateRecoveryCallback(these.bleStateRecovry, pagePath);
+			ble.addDisposeCallback(these.deviceDispose, pagePath);
+			ble.addRecoveryCallback(these.deviceRecovry, pagePath);
+
+			let eventChannel = this.getOpenerEventChannel();
+
+			eventChannel.on('detailData', (data) => {
+				debugger;
+				console.log("收到父页面的参数：" + JSON.stringify(data));
+				var device = data.data;
+				these.Status.apiType = data.apiType;
+				these.device = device;
+
+				these.formData.sta_imei = device.deviceImei;
+				if (these.formData.sta_imei) {
+					these.initMQ();
+				}
+
+				these.formData.usrid = device.deviceImei;
+				if (data.apiType !== 'listA') {
+					Common.getdeviceShareId(data.data.id).then(res => {
+						if (res.code == 200) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+				}
+
+				let f = these.getDevice();
+				if (!f) {
+					these.showBleUnConnect();
+					these.getDetail();
+					return;
+				}
+				let form = f.formData;
+				if (form) {
+					let keys = Object.keys(form);
+					for (var i = keys.length; i >= 0; i--) {
+						let key = keys[i];
+						these.formData[key] = form[key];
+					}
+				}
+				these.formData.bleStatu = 'connecting';
+				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
+					these.formData.bleStatu = true;
+				});
+			});
+
+
+		},
+		methods: {
+			getDetail() {
+				
+				api.getDetail(this.device.id).then(res => {
+			
+					if (res && res.code == 200) {
+						res = res.data;
+						let json = res;
+						this.detailData = json;
+						console.log("res=", res);
+						this.formData.sta_longitude = res.longitude;
+						this.formData.sta_latitude = res.latitude;
+						this.formData.address = res.address;
+						let personnelInfo = res.personnelInfo;
+						if (personnelInfo) {
+							this.formData.company = personnelInfo.unitName;
+							this.formData.usrname = personnelInfo.name;
+							this.formData.job = personnelInfo.position;
+							this.formData.usrid = personnelInfo.code
+						}
+						
+						
+			
+						this.formData.sta_PowerPercent = json.staPowerPercent
+			
+			
+					
+						
+			
+						this.formData.sta_PowerTime = json.staPowerTime;
+			
+						
+						this.formData.sta_SOSGrade = json.staSOSGrade;
+			
+			
+					}
+				});
+			},
+			initWatch(){
+				this.$watch("formData.sta_SOSGrade", (newVal, oldVal) => {
+					console.log("报警状态发生变化");
+					if (newVal == 1) {
+						this.formData.showSosGrade = true;
+					}
+				});
+				
+				this.$watch("formData.sta_ShakeBit", (newVal, oldVal) => {
+					console.log("碰撞状态发生变化");
+					if (newVal != 0) {
+						this.formData.showShakeBit = true;
+					}
+				});
+				
+	
+				
+				this.$watch("formData.sta_BreakNews",(newVal,oldVal)=>{
+					if(newVal){
+						MsgSuccess("用户已确认收到紧急通知","确定",these);
+						setTimeout(()=>{
+							these.formData.sta_BreakNews="";
+						},10);
+					}					
+				});
+				
+				this.$watch("formData.sta_PowerPercent", (newVal, oldVal) => {
+					console.log("电量发生变化");
+					if (newVal <=20 && this.formData.sta_system===2 || this.formData.sta_system===0) {
+						//电量在20%及以及下，且是未充电状态提醒
+						showPop({
+							message: "设备电量低于20%,请充电",
+							borderColor: "#e034344d",
+							buttonBgColor: "#E03434",
+							buttonText: '确定',
+							buttonTextColor: '#232323de',
+							showCancel: false,
+							showHeader: false,
+							visibleClose: true,							
+							textColor: '#E03434',
+							iconUrl:'/static/images/common/path.png'							
+						},this);
+					}
+				});
+								
+			},
+			checkSendVideo() {
+
+				if (!this.permissions.includes('3') && this.Status.apiType !== 'listA') {
+
+					MsgError('无操作权限', '确定', these);
+					return;
+				}
+
+				let f = this.getDevice();
+
+				let timeDelayCloseLoading = () => {
+					setTimeout(() => {
+						hideLoading(these);
+					}, 1500);
+				}
+
+
+				let sendVideoPackets = (ReSendNo) => {
+					console.log("开始发送分片数据");
+					return new Promise((resolve, reject) => {
+						if (f) {
+							// 总数据包数
+							var totalPackets = 1536; //36;
+
+							let currentPacket = 1;
+							console.log("发送数据准备中,总共" + totalPackets);
+							if (ReSendNo) {
+								totalPackets = ReSendNo;
+								currentPacket = ReSendNo;
+							}
+							this.totalPackets = totalPackets;
+							// 发送单个数据包
+							const sendNextVideoPacket = () => {
+								// console.log("准备发送一段数据");
+								if (currentPacket > totalPackets) {
+									if (!ReSendNo) {
+										setTimeout(() => {
+
+											ble.sendString(f.deviceId, "transmit complete", f
+													.writeServiceId, f.wirteCharactId, 20)
+												.then(
+													() => {
+														console.log("全部发送完毕")
+													}).catch((ex) => {
+													console.log("出现异常", ex);
+												});
+										}, 500);
+
+									}
+
+									hideLoading(these);
+									showPop({
+										showPop: true,
+										message: "上传成功",
+										iconUrl: "/static/images/common/success.png"
+									}, these);
+									these.videoHexArray = null;
+									resolve();
+
+									return;
+								}
+
+								// 计算当前包的数据
+								let packetSize = 500;
+
+
+								// 创建数据包
+								const startIndex = (currentPacket - 1) * packetSize;
+								const endIndex = Math.min(startIndex + packetSize, these.videoHexArray
+									.length);
+								if (startIndex > endIndex) {
+									resolve();
+									return;
+								}
+								////console.log("111111");
+								const packetData = these.videoHexArray.slice(startIndex, endIndex);
+
+								// 构建数据包
+								////console.log("packetData.length"+packetData.length);
+								const bufferSize = 504; // 头部5字节 + 数据部分
+								const buffer = new ArrayBuffer(bufferSize);
+								const dataView = new DataView(buffer);
+
+								let sortNo = currentPacket.toString(16).padStart(4, '0');
+
+								// 填充头部
+								dataView.setUint8(0, 0x55); // 帧头
+								dataView.setUint8(1, 0x04); // 帧类型：开机画面
+								dataView.setUint8(2, '0x' + sortNo.substring(0, 2)); // 包序号
+								dataView.setUint8(3, '0x' + sortNo.substring(2, 4)); // 包序号
+
+								// dataView.setUint8(4, 0x01);
+								// dataView.setUint8(5, 0xF4);
+
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint8(4 + i, '0x' + packetData[i]);
+								}
+
+								let inteval = 40;
+
+								ble.sendData(f.deviceId, buffer, f.writeServiceId, f
+									.wirteCharactId, 10).then(() => {
+
+									updateLoading(these, {
+										text: "正在发送:" + currentPacket + "/" +
+											totalPackets
+									})
+
+									currentPacket++;
+
+									// console.log("发送一段成功,发送下一段");
+									setTimeout(sendNextVideoPacket, inteval);
+								}).catch(err => {
+									console.log("发送失败了", err);
+									if (err.code == '10007') { //遇到这个错误自动重新发送
+										console.log(err.errMsg + ",发送失败了,正在补偿：" +
+											currentPacket);
+										setTimeout(sendNextVideoPacket, inteval);
+									} else {
+
+										hideLoading(these);
+
+										showPop({
+											showPop: true,
+											message: err.msg + ",发送失败了",
+											borderColor: "#e034344d",
+											buttonBgColor: "#E03434",
+											buttonText: "确定",
+											iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png"
+										}, these);
+										reject(err);
+										these.videoHexArray = null;
+										return;
+									}
+
+								});
+							};
+
+
+							sendNextVideoPacket();
+
+
+						} else {
+							console.log("Fail.......")
+						}
+					});
+				}
+
+				var sendVideo = (videoPath) => {
+					let uploadVideo = () => {
+
+						these.videoHexArray = [];
+						console.log("开始处理,正在上传");
+
+						showLoading(these, {
+							text: "上传中"
+						});
+						let p1 = new Promise((resolve, reject) => {
+
+							ble.sendString(f.deviceId, "video transmit start", f
+								.writeServiceId, f.wirteCharactId).then(res => {
+
+								setTimeout(() => {
+									console.log("握手成功了");
+									resolve(true);
+								}, 2200)
+							}).catch(ex => {
+								reject(ex);
+							});
+						});
+
+
+						let p2 = new Promise((succ, err) => {
+
+							const token = uni.getStorageSync('token');
+							const clientid = uni.getStorageSync('clientID');
+							if (!token) {
+								err({
+									code: 401,
+									msg: "请先登陆后再试"
+								});
+								hideLoading(these);
+								return;
+							}
+							console.log("baseURL=", baseURL);
+							console.log("token", token);
+							console.log("clientID", clientid);
+							uni.uploadFile({
+								// url: 'http://114.55.111.217/video/upload',
+								url: baseURL + "/app/video/upload",
+								filePath: videoPath,
+								name: 'file',
+								header: {
+									"Method": "POST",
+									"Content-Type": "multipart/form-data",
+									"Authorization": 'Bearer ' + token,
+									"clientid": clientid
+								},
+								timeout: 600000,
+								fail: (ex) => {
+									console.log("上传视频失败" + JSON.stringify(ex));
+
+									err(ex);
+								},
+								success: (res) => {
+
+									console.log("上传完成，向蓝牙设备发送");
+									succ(res);
+								}
+
+							});
+						});
+
+						Promise.all([p1, p2]).then((arr) => {
+
+							if (arr[0].status == 'rejected') {
+								showPop({
+									message: "设备准备未就绪",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								}, these);
+								return;
+							}
+							let res = arr[1];
+							// console.log("11111111111111111111111",res);
+							res = JSON.parse(res.data);
+							// console.log("22222222222222222222");
+							if (res.data) {
+								these.videoHexArray = res.data;
+								updateLoading(these, {
+									text: "正在发送:0/1536"
+								});
+
+
+
+								shotVideoClick(res.data);
+
+
+							} else {
+								console.log("服务器未返回正确的数据");
+
+
+								showPop({
+									message: "与服务器连接出现异常,请检查网络设置",
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								}, these);
+							}
+
+						}).catch((ex) => {
+							console.log("出现异常,", ex)
+							hideLoading(these);
+							showPop({
+								message: "出现异常," + ex.msg,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							}, these);
+						})
+					}
+
+
+
+
+					let shotVideoClick = () => {
+						console.log("正在开始发送");
+						sendVideoPackets().then(() => {
+							console.log("发送完成");
+
+						}).catch((ex1) => {
+							//console.log("出现了异常", ex1)
+						}).finally(() => {
+							hideLoading(these);
+						});
+					}
+
+
+					uploadVideo();
+
+				}
+
+				uni.chooseVideo({
+					sourceType: ['album'],
+					compressed: false, // 关闭视频压缩，确保上传原始文件
+					success: function(res) {
+						console.log("res=", res);
+						let path = res.tempFilePath;
+						// iOS可能返回浮点数，需要转换为整数进行比较
+						let width = Math.round(res.width);
+						let height = Math.round(res.height);
+						let duration = res.duration;
+
+						// 获取平台信息
+						const systemInfo = uni.getSystemInfoSync();
+						const platform = systemInfo.platform;
+						const isIOS = platform === 'ios';
+
+						console.log("平台:", platform, "uni.chooseVideo返回 - 宽度:", width, "高度:", height,
+							"时长:", duration);
+
+						// iOS特殊处理：如果返回的是80*40，很可能是160*80的一半（iOS的bug）
+						if (isIOS && width === 80 && height === 40) {
+							console.log("检测到iOS特殊情况：返回80*40，实际应该是160*80，进行修正");
+							width = 160;
+							height = 80;
+						}
+
+						// 检查分辨率是否符合要求
+						let checkResolution = (w, h) => {
+							// 使用容差比较，允许1像素的误差
+							return Math.abs(w - 160) <= 1 && Math.abs(h - 80) <= 1;
+						};
+
+						let err = [];
+						if (duration < 2) {
+							err.push("视频时长至少2秒");
+						}
+
+						if (!checkResolution(width, height)) {
+							err.push("视频宽高必须是160*80，当前分辨率：" + width + "*" + height);
+						}
+
+						if (err.length > 0) {
+							err = err.join(";");
+							showPop({
+								message: err,
+								iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+								borderColor: "#e034344d",
+								buttonBgColor: "#E03434",
+							}, these);
+							return;
+						}
+
+						showLoading(these, {
+							text: '正在上传'
+						});
+						setTimeout(() => {
+							sendVideo(path);
+						}, 0);
+
+					}
+				});
+
+			},
+			sendImg() {
+				if (!this.permissions.includes('3') && this.Status.apiType !== 'listA') {
+
+					MsgError('无操作权限', '确定', these);
+					return;
+				}
+
+				let f = this.getDevice();
+				
+				
+				var sendImagePackets = function(ReSendNo) {
+				
+					return new Promise((resolve, reject) => {
+				
+						// 总数据包数
+						let totalPackets = 52;
+						let currentPacket = 1;
+				
+						if (ReSendNo) {
+							totalPackets = ReSendNo;
+							currentPacket = ReSendNo;
+						}
+				
+						if (f) {
+							// 发送单个数据包
+							const sendNextPacket = () => {
+								if (currentPacket > totalPackets) {
+									hideLoading(these);
+									these.closeAction();
+									these.showPop({
+										showPop: true,
+										message: "上传成功",
+										iconUrl: "/static/images/common/success.png",
+									});
+									
+									setTimeout(()=>{
+										ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f
+										.wirteCharactId);
+									},1000);
+									
+									these.rgb565Data = null;
+									resolve();
+									return;
+								}
+				
+								// 计算当前包的数据
+								let packetSize = 250;
+								// if (currentPacket <= 51) {
+								// 	packetSize = 250; // 前51个包每个500字节
+								// } else {
+								// 	packetSize = 50; // 最后一个包100字节
+								// }
+				
+								// 创建数据包
+								const startIndex = (currentPacket - 1) * packetSize;
+								const endIndex = Math.min(startIndex + packetSize, these.rgb565Data
+									.length);
+								if (startIndex > endIndex) {
+									return;
+								}
+								const packetData = these.rgb565Data.slice(startIndex,
+									endIndex);
+								// 构建数据包
+								const bufferSize = 505; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
+								const buffer = new ArrayBuffer(bufferSize);
+								const dataView = new DataView(buffer);
+				
+								// 填充头部
+								dataView.setUint8(0, 0x55); // 帧头
+								dataView.setUint8(1, 0x02); // 帧类型：开机画面
+								dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
+									'0')); // 包序号
+				
+				
+								if (packetData.length == 250) {
+									dataView.setUint8(3, 0x01);
+									dataView.setUint8(4, 0xF4);
+								} else {
+									dataView.setUint8(3, 0x00);
+									dataView.setUint8(4, 0x64);
+								}
+				
+								// 填充数据（每个RGB565值占2字节）
+								for (let i = 0; i < packetData.length; i++) {
+									dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+								}
+				
+								if (currentPacket > 51) { //第52包补FF
+									for (var i = 105; i < bufferSize; i++) {
+										dataView.setUint8(i, 0xFF);
+									}
+								}
+				
+				
+				
+								//发送数据包
+								ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId,
+										10)
+									.then(() => {
+				
+				
+										updateLoading(these, {
+											text: "正在发送:" + currentPacket + "/" +
+												totalPackets
+										})
+										currentPacket++;
+				
+										setTimeout(sendNextPacket, these.inteval);
+									}).catch(err => {
+										console.log("发送数据包失败了" + JSON.stringify(err));
+										if (err.code == '10007') {
+											setTimeout(sendNextPacket, these.inteval);
+											return;
+										}
+										these.closeAction();
+										these.showPop({
+											message: err.msg,
+											iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+											borderColor: "#e034344d",
+											buttonBgColor: "#E03434",
+										});
+										hideLoading(these);
+										these.rgb565Data = null;
+										reject(err);
+									});
+							}
+				
+							if (ReSendNo) {
+								sendNextPacket(ReSendNo);
+								return;
+							}
+							// 开始牵手
+							ble.sendString(f.deviceId, "picture transmit start", f.writeServiceId,
+								f.wirteCharactId).then(() => {
+								setTimeout(sendNextPacket, 120);
+				
+							}).catch((err) => {
+								console.log("握手没有成功");
+								these.showPop({
+									message: err.msg,
+									iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+									borderColor: "#e034344d",
+									buttonBgColor: "#E03434",
+								});
+								hideLoading(these);
+								reject(err);
+							});
+						}
+					});
+				}
+
+
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album'],
+					success: function(res) {
+						uni.navigateTo({
+							url: "/pages/ImgCrop/ImgCrop",
+							events: {
+								ImgCutOver: function(data) {
+
+									showLoading(these, {
+										text: "正在发送0/52"
+									});
+
+
+									these.rgb565Data = Common.convertToRGB565(data.piexls);
+									
+									setTimeout(function() {
+										sendImagePackets().catch(() => {
+									
+										});
+									}, 0)
+
+								}
+							},
+							success(ev) {
+								ev.eventChannel.emit('checkImg', {
+									data: res.tempFiles[0].path
+								})
+							},
+							fail(ex) {
+								console.log("跳转页面失败" + JSON.stringify(ex));
+							}
+						});
+
+					}
+				});
+
+			},
+			sliderChanging(e) {
+				this.formData.sta_brightness = e.detail.value;
+			},
+			sliderChange(e) {
+				this.formData.sta_brightness = e.detail.value;
+
+				// 清除之前的定时器
+				if (brightnessTimer) {
+					clearTimeout(brightnessTimer);
+				}
+
+				// 设置新的定时器，控制发送频率
+				brightnessTimer = setTimeout(() => {
+
+					let json = {
+						ins_brightness: e.detail.value
+					}
+
+					this.sendData(json, null, 'string').then(res=>{
+						this.setBleFormData();
+					}).catch(ex => {
+
+					});
+				}, 200);
+			},
+
+			showUploadMedia() {
+
+
+				this.showAction('media')
+			},
+			getLightMode(type) {
+				let item = null;
+				let index = null;
+				if (type === 'main') {
+					index = 0;
+					item = this.dic.actionSheets[0];
+
+				} else {
+					index = 1;
+					item = this.dic.actionSheets[1];
+				}
+
+				let f = item.menuItems.find(v => {
+					if (v.value == this.dic.actionSheets[index].value) {
+						return true;
+					}
+				});
+				if (!f) {
+					return "关闭";
+				}
+				return f.text;
+
+			},
+			initActionData() { //初始化ActionSheet菜单
+
+				let json = {
+					name: '',
+					show: false,
+					showHeader: true,
+					menuItems: [],
+					activeIndex: -1,
+					bgColor: '#2a2a2a',
+					itemBgColor: '#3a3a3a',
+					textColor: '#ffffffde',
+					textAlign: 'flex-start',
+					title: '请选择',
+					value: '',
+					valueMember: 'value',
+					showDivider: false,
+					dividerColor: '#00000000',
+					dividerThickness: '0rpx',
+					dividerMargin: '10rpx',
+					itemHeight: '80rpx',
+					type: '',
+					showBtn: true,
+					btnBgColor: "#bbe600",
+					btnText: "确定",
+					btnTextColor: "#232323de",
+					showMask: true,
+					maskBgColor: '#00000066',
+					showClose: false,
+
+					closeMenu: these.closeAction,
+					btnClick: (li, i) => {
+						debugger;
+					},
+					handleItemClick: (li, i) => {
+						debugger;
+					}
+
+				};
+
+				let item = Object.assign({}, json);
+				item.name = 'main';
+				item.title = '主灯模式'
+				item.menuItems = [{
+						text: '强光',
+						icon: '/static/images/lightImg/qiang.png',
+						value: '1',
+						key: 'ins_LightGrade'
+					},
+					{
+						text: '工作光',
+						icon: '/static/images/lightImg/work.png',
+						value: '2',
+						key: 'ins_LightGrade'
+					},
+					{
+						text: '节能光',
+						icon: '/static/images/lightImg/jieN.png',
+						value: '3',
+						key: 'ins_LightGrade'
+					},
+					{
+						text: '爆闪',
+						icon: '/static/images/lightImg/shan.png',
+						value: '4',
+						key: 'ins_LightGrade'
+					},
+					{
+						text: 'SOS',
+						icon: '/static/images/lightImg/sos.png',
+						value: '5',
+						key: 'ins_LightGrade'
+					},
+					{
+						text: '关闭',
+						icon: '/static/images/lightImg/closeLight.png',
+						value: '6',
+						key: 'ins_LightGrade'
+					}
+				];
+
+
+
+				let item1 = Object.assign({}, json);
+				item1.name = 'fu';
+				item1.title = '辅光模式';
+				item1.menuItems = [{
+						text: '泛光',
+						icon: '/static/images/lightImg/fan.png',
+						value: '2',
+						key: 'ins_Side_Light'
+					},
+					{
+						text: '泛光爆闪',
+						icon: '/static/images/lightImg/fan.png',
+						value: '3',
+						key: 'ins_Side_Light'
+					},
+					{
+						text: '警示灯',
+						icon: '/static/images/lightImg/warn.png',
+						value: '1',
+						key: 'ins_Side_Light'
+					},
+					{
+						text: '警示灯/泛光',
+						icon: '/static/images/lightImg/warn.png',
+						value: '4',
+						key: 'ins_Side_Light'
+					},
+					{
+						text: '关闭',
+						icon: '/static/images/lightImg/closeLight.png',
+						value: '5',
+						key: 'ins_Side_Light'
+					}
+				];
+
+				let item3 = Object.assign({}, json);
+				item3.name = 'media';
+				item3.title = '选择媒体';
+				item3.menuItems = [{
+						text: '照片',
+						icon: '/static/images/lightImg/qiang.png',
+						value: 'img',
+						key: 'media'
+					},
+					{
+						text: '动画',
+						icon: '/static/images/lightImg/qiang.png',
+						value: 'flash',
+						key: 'media'
+					}
+				];
+
+
+				item.handleItemClick = (li, i) => {
+					this.$set(this.dic.actionSheets[0], 'value', li.value);
+
+				};
+				item.btnClick = (li, i) => {
+					this.lightSettiong(li, i);
+					this.$set(this.dic.actionSheets[0], 'show', false);
+				}
+
+				item1.handleItemClick = (li, i) => {
+					this.$set(this.dic.actionSheets[1], 'value', li.value);
+				}
+				item1.btnClick = (li, i) => {
+					this.lightSettiong(li, i);
+					this.$set(this.dic.actionSheets[1], 'show', false);
+				}
+
+				item3.handleItemClick = (li, i) => {
+					this.$set(this.dic.actionSheets[2], 'value', li.value);
+				};
+				item3.btnClick = (li, i) => {
+					this.$set(this.dic.actionSheets[2], 'show', false);
+
+					let f = this.getDevice();
+					if (!f) {
+						this.showBleUnConnect();
+						return;
+					}
+
+					if (li.value == 'img') {
+						//照片
+						these.sendImg();
+					} else {
+						//视频
+						these.checkSendVideo();
+					}
+
+				}
+
+				this.dic.actionSheets = [item, item1, item3];
+			},
+			SOSToggle() {
+				if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
+
+					MsgError('无操作权限', '确定', these);
+					return;
+				}
+				let val = 1;
+				if (this.formData.sta_ShakeBit === 1) {
+					val = 0;
+				}
+
+				let send = () => {
+					let json = {
+						ins_ShakeBit: val
+					};
+					this.sendData(json, null, 'string').then(res => {
+						this.formData.sta_ShakeBit = val;
+					}).catch(ex => {
+						console.error("出现错误", ex)
+					});
+				}
+				let msg=val==1?'确定开启声光报警':'确定关闭声光报警';
+				
+					showPop({
+						message: msg,
+						iconUrl: "/static/images/670/sgActive.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						buttonText: '确定',
+						buttonTextColor: '#232323de',
+						showCancel: true,
+						buttonCancelText: '取消',
+						okCallback: send
+					}, these);
+				
+					
+				
+			},
+			laserToggle() {
+				if (!this.permissions.includes('2') && this.Status.apiType !== 'listA') {
+
+					MsgError('无操作权限', '确定', these);
+					return;
+				}
+				let val = 1;
+				if (this.formData.sta_laser === 1) {
+					val = 0;
+				}
+				let json = {
+					ins_laser: val
+				};
+				let sendLaser = () => {
+					this.sendData(json, null, 'string').then(res => {
+						this.formData.sta_laser = val;
+						this.setBleFormData();
+					}).catch(ex => {
+						console.error("出现错误", ex)
+					});
+				}
+
+				if (val === 1) {
+					showPop({
+						message: "注意事项\n1.禁止直视光源或反向面！   \n2.避免直射人或易燃物！        \n3.需佩戴相应专业防护眼镜！",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+						buttonText: '确定',
+						buttonTextColor: '#232323de',
+						showCancel: true,
+						showHeader: true,
+						visibleClose: false,
+						headerTxt: "确定开启激光模式？",
+						textColor: '#E03434',
+						okCallback: sendLaser,
+					}, this);
+				} else {
+					sendLaser();
+				}
+
+			},
+			lightSettiong(li, index) {
+				if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
+
+					MsgError('无操作权限', '确定', these);
+					return;
+				}
+				let json = {};
+				json[li.key] = li.value;
+				this.sendData(json, null, 'string').then((res) => {
+					let key = li.key.replace(/ins_/g, 'sta_');
+					this.formData[key] = li.value;
+					this.setBleFormData();
+				}).catch((ex) => {
+					console.error("出现错误", ex)
+				});
+			},
+			sendUsr() {
+
+				if (!this.permissions.includes('4') && this.Status.apiType !== 'listA') {
+
+					MsgError('无操作权限', '确定', these);
+					return;
+				}
+
+				let f = this.getDevice();
+				if (!f) {
+					this.showBleUnConnect();
+					return;
+				}
+
+
+				let toByteValue = (value) => {
+					if (typeof value === 'number') {
+						return value;
+					}
+					if (typeof value === 'string') {
+						if (value.startsWith('0x') || value.startsWith('0X')) {
+							return parseInt(value, 16);
+						}
+						return parseInt(`0x${value}`, 16);
+					}
+					return 0;
+				}
+
+
+				this.formData.textLines = [this.formData.company, this.formData.usrname, this.formData.job, this.formData
+					.usrid
+				];
+				console.log("data=", this.formData.textLines);
+				showLoading(these, {
+					text: "发送中"
+				});
+				//握手
+				let holdHand = (hexs, time) => {
+					return new Promise((resolve, reject) => {
+
+
+						this.sendData(hexs, 'ble', "string").then(res => {
+							setTimeout(() => {
+								resolve(res)
+							}, time);
+
+						}).catch(ex => {
+							reject(ex)
+						});
+
+					});
+				}
+				//画图
+				let drawText = () => {
+					return new Promise((resolve, reject) => {
+						this.$refs.textToHex.drawAndGetPixels().then(allPixels => {
+							if (!allPixels) {
+								reject("文本初始化失败");
+								return;
+							}
+							console.log("画图成功");
+							resolve(allPixels);
+						}).catch(compEx => {
+							reject(compEx);
+						});
+
+					});
+				}
+				//发送3个分包的数据
+				let task = (allPixels) => {
+					try {
+						let combinedData = [];
+						for (let i = 0; i < 4; i++) {
+							let linePixels = (allPixels[i] || []).flat(Infinity).map(item =>
+								typeof item === 'string' ? toByteValue(item) : item
+							);
+
+							for (var j = linePixels.length; j < 256; j++) {
+								linePixels.push(0x00);
+							}
+							linePixels = [0xFA, 0x06, 0x03, i + 1].concat(linePixels);
+
+							linePixels.push(0xFF)
+
+							combinedData.push(linePixels);
+						}
+
+
+						let curr = 1;
+						let len = combinedData.length;
+
+
+
+						//分包发送
+						let sendPacket = () => {
+
+							if (combinedData.length === curr - 1) {
+								holdHand('transmit complete', 200).then(res => {
+									MsgSuccess("人员信息发送成功", "确定", these);
+									hideLoading(these);
+									this.setBleFormData();
+								});
+								hideLoading();
+								return;
+							}
+
+							let array = combinedData[curr - 1];
+
+
+							console.log("array=", array);
+							ble.sendHexs(f.deviceId, array, null, null, 15).then(
+								res => {
+									curr++;
+									console.log("发送成功", curr);
+									updateLoading(these, {
+										text: '发送中,' + (curr - 1) + '/' + 4
+									})
+									setTimeout(sendPacket, 250);
+								}).catch(err => {
+								console.err("发送失败", err);
+								if (err.code == '10007') {
+									setTimeout(sendPacket, 250);
+								} else {
+									console.log("err:", err);
+									MsgError('发送失败' + (err.msg || err.code), '确定', these);
+									hideLoading();
+								}
+
+							});
+						}
+
+						setTimeout(sendPacket, 0);
+						// 5. 发送成功处理
+
+
+					} catch (ex) {
+						MsgError('发送失败' + (ex.msg || ex.code), '确定', these);
+					}
+
+
+				}
+
+				setTimeout(() => {
+					Promise.allSettled([holdHand('word transmit start', 2200), drawText()]).then(results => {
+						if (results[0].status == 'rejected') {
+
+							setTimeout(() => {
+								hideLoading(these)
+							}, 500);
+							return;
+						}
+						if (results[1].status == 'rejected') {
+
+							return;
+						}
+
+						task(results[1].value);
+					})
+
+				}, 0);
+			},
+			sendMsg() {
+				if (!this.permissions.includes('4') && this.Status.apiType !== 'listA') {
+					MsgError('无操作权限', '确定', these);
+
+					return;
+				}
+				this.formData.sendMsg.padStart(16, ' ');
+
+				this.formData.textLines = [this.formData.sendMsg.slice(0, 8), this.formData.sendMsg.slice(8, 16)];
+
+
+
+				showLoading(this, {
+					text: "发送中"
+				});
+				//握手
+				let holdHand = (hexs, time) => {
+					return new Promise((resolve, reject) => {
+						setTimeout(() => {
+							resolve(true)
+						}, time);
+					});
+				}
+				//画图
+				let drawText = () => {
+					return new Promise((resolve, reject) => {
+						this.$refs.textToHex.drawAndGetPixels().then(allPixels => {
+							if (!allPixels) {
+								reject("文本初始化失败");
+								return;
+							}
+							console.log("画图成功");
+							resolve(allPixels);
+						}).catch(compEx => {
+							reject(compEx);
+						});
+
+					});
+				}
+				//发送3个分包的数据
+				let task = (allPixels) => {
+					try {
+						let combinedData = [];
+						for (let i = 0; i < 2; i++) {
+							let linePixels = (allPixels[i] || []).flat(Infinity).map(item =>
+
+								item.replace('0x', '')
+							);
+
+							for (var j = linePixels.length; j < 256; j++) {
+								linePixels.push("00");
+
+							}
+
+
+							combinedData.push(['0' + (i + 1), '01'].concat(linePixels.slice(0, 128)));
+							combinedData.push(['0' + (i + 1), '02'].concat(linePixels.slice(128, 256)));
+						}
+
+
+						let curr = 1;
+						let len = combinedData.length;
+
+
+						console.log("包数量", len)
+						//分包发送
+						let sendPacket = () => {
+
+							if (combinedData.length === curr - 1) {
+
+
+								holdHand('transmit complete', 200).then(res => {
+
+									MsgSuccess("消息发送成功", "确定", these);
+								});
+								hideLoading(these);
+								return;
+							}
+
+							let array = combinedData[curr - 1];
+
+							let json = {
+								ins_msg: array.join("")
+							}
+
+							this.sendData(json, '4g', 'string').then(
+								res => {
+									curr++;
+									console.log("发送成功", curr)
+									setTimeout(sendPacket, 500);
+								}).catch(err => {
+								if (err.code == '10007') {
+
+									setTimeout(sendPacket, 500);
+								} else {
+									console.log("err:", err);
+									MsgError('发送失败' + (err.msg || err.code), '确定', these);
+								}
+
+							});
+						}
+
+						setTimeout(sendPacket, 0);
+						// 5. 发送成功处理
+
+
+					} catch (ex) {
+						uni.showModal({
+							title: '提示',
+							content: '发送失败' + (ex.msg || ex.code)
+						})
+					}
+
+
+				}
+
+				setTimeout(() => {
+					Promise.allSettled([holdHand('word transmit start', 2200), drawText()]).then(results => {
+						console.log("PromiseAll=", results);
+						if (results[0].status == 'rejected') {
+
+							setTimeout(() => {
+								hideLoading(these)
+							}, 500);
+							return;
+						}
+						if (results[1].status == 'rejected') {
+							console.log("任务1失败了", results[1].reason);
+							return;
+						}
+						console.log("开始发送数据包");
+						task(results[1].value);
+					})
+
+				}, 0);
+			},
+			sendData(json, sendType, dataType) {
+
+				return new Promise((resolve, reject) => {
+					if (json instanceof Object) {
+						json = JSON.stringify(json)
+					}
+					let fourGSend = () => {
+						return new Promise((succ, err) => {
+							let flag = mq.publish("B/" + this.formData.sta_imei, json);
+							if (flag) {
+								succ();
+							} else {
+								err({
+									code: 500,
+									msg: "操作失败,请检查网络连接"
+								});
+							}
+						});
+
+					}
+					let bleSend = () => {
+						return new Promise((succ, err) => {
+							let f = these.getDevice();
+
+							if (f) {
+								if (dataType == 'string') {
+									ble.sendString(f.deviceId, json).then(res => {
+
+										succ(res);
+									}).catch(ex => {
+
+										err(ex);
+									});
+								} else if (dataType == 'hex') {
+									ble.sendHexs(f.deviceId, json).then(res => {
+
+										succ(res);
+									}).catch(ex => {
+
+										err(ex);
+									});
+
+								} else {
+									ble.sendData(f.deviceId, json).then(res => {
+
+										succ(res);
+									}).catch(ex => {
+
+										err(ex);
+									});
+								}
+
+							} else {
+								these.showBleUnConnect();
+								err({
+									code: 0,
+									msg: '蓝牙未连接'
+								});
+							}
+						});
+
+					}
+					if (sendType === '4g') {
+						fourGSend().then(res => {
+							resolve(res);
+						}).catch(ex => {
+							console.error("ex=", ex);
+							reject(ex)
+						});
+						return;
+					}
+					if (sendType === 'ble') {
+						bleSend().then(res => {
+							resolve(res);
+						}).catch((ex) => {
+							console.error("ex=", ex);
+							reject(ex);
+						});
+						return;
+					}
+
+
+					bleSend().then(res => {
+						resolve(res);
+					}).catch((err) => {
+						fourGSend().then((res) => {
+							resolve(res);
+						}).catch(ex => {
+							console.error("ex=", ex);
+							reject(ex);
+						})
+					});
+				});
+
+
+			},
+			getDevice: function() {
+
+				console.log("LinkedList=", ble.data.LinkedList);
+				console.log("this.device=", this.device);
+				let f = ble.data.LinkedList.find((v) => {
+					if(v.macAddress == these.device.deviceMac){
+						if(!this.formData.deviceId){this.formData.deviceId=v.deviceId};
+						return true;
+					}
+				});
+
+				return f;
+			},
+			showBleUnConnect() {
+
+				showPop({
+					message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+					iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+					borderColor: "#e034344d",
+					buttonBgColor: "#E03434",
+					buttonText: '去连接',
+					buttonTextColor: '#232323de',
+					showCancel: true,
+					okCallback: function() {
+						console.log("1111");
+						uni.navigateTo({
+							url: "/pages/common/addBLE/addEquip",
+							events: {
+								BindOver: function(data) {
+									console.log(data)
+									these.formData.bleStatu = true;
+								}
+							},
+							success: function(res) {
+								// 通过eventChannel向被打开页面传送数据
+								res.eventChannel.emit('detailData', {
+									data: these.device
+								})
+							}
+						})
+					}
+				}, these);
+			},
+			initMQ() {
+
+
+				return new Promise((resolve, reject) => {
+					if (mq) {
+
+						resolve();
+						return;
+					}
+					console.log("正在初始化MQtt")
+					mq = new MqttClient();
+					mq.connect(() => {
+						console.log("MQTT连接成功，开始订阅消息")
+						// 订阅来自设备的状态更新
+						const statusTopic =
+							`A/${this.formData.sta_imei?this.formData.sta_imei:this.device.deviceImei}`;
+						mq.subscribe(statusTopic, (payload, receive) => {
+							console.log("mq收到消息", payload)
+							let json = JSON.parse(payload);
+							this.receivData(json);
+						});
+						resolve();
+					});
+				});
+
+			},
+			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
+				let data = recei.ReceiveData(receive, device, pagePath, recArr);
+				console.log("蓝牙收到消息", data)
+				this.receivData(data);
+			},
+			receivData(data) { //处理蓝牙/MQ的数据
+				let keys = Object.keys(data);
+				keys.forEach(key => {
+					this.formData[key] = data[key];
+				});
+				this.setBleFormData();
+			},
+			
+			setBleFormData() {
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.deviceId == these.formData.deviceId) {
+						v.formData = these.formData;
+
+						return true;
+					}
+					return false;
+				});
+				if (f) {
+					uni.setStorageSync(ble.StorageKey, ble.data.LinkedList);
+				}
+
+			},
+			deviceRecovry(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					this.formData.bleStatu = true;
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'success',
+						title: '蓝牙连接成功'
+					});
+				}
+
+			},
+			deviceDispose(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					if (res.device) {
+						these.formData.bleStatu = 'connecting';
+					} else {
+						this.formData.bleStatu = false;
+					}
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'fail',
+						title: '蓝牙连接已断开'
+					});
+				}
+
+			},
+			bleStateBreak() {
+				if (this.Status.pageHide) {
+					return;
+				}
+				//蓝牙适配器不可用
+				this.formData.bleStatu = false;
+				uni.showToast({
+					icon: 'fail',
+					title: '蓝牙已不可用'
+				})
+				hideLoading(this);
+			},
+			bleStateRecovry() {
+				console.log("蓝牙可用");
+				if (this.Status.pageHide) {
+					return;
+				}
+				console.log("蓝牙可用");
+				//蓝牙适配器再次可用,尝试恢复连接
+				showLoading(this, {
+					text: "蓝牙恢复可用,正在连接设备"
+				});
+				this.formData.bleStatu = 'connecting';
+				ble.LinkBlue(these.formData.deviceId).then(() => {
+					these.formData.bleStatu = true;
+					updateLoading(these, {
+						text: '连接成功'
+					});
+				}).catch(ex => {
+					updateLoading(these, {
+						text: ex.msg
+					})
+				}).finally(() => {
+					setTimeout(() => {
+						hideLoading(these);
+					}, 1000);
+
+				});
+			},
+			gotoMap() {
+				let promise = lnglatConvert.wgs84_to_gcj02(this.formData.sta_longitude, this.formData.sta_latitude);
+				promise.then(lnglat => {
+			
+					this.detailData.longitude = lnglat[0];
+					this.detailData.latitude = lnglat[1];
+					uni.navigateTo({
+						url: '/pages/common/map/index',
+						events: {
+							ack: function(data) {}
+						},
+						success: (res) => {
+							res.eventChannel.emit('Map', {
+								data: this.detailData
+							});
+						}
+					})
+				});
+			
+			},
+			proDetail: function(pgetpe) {
+
+
+				let url = '/pages/common/' + pgetpe + '/index?id=' + (this.device.id ? this.device.id : 0);
+
+				uni.navigateTo({
+					url: url,
+					fail(ex) {
+						console.error(ex);
+					}
+				});
+			},
+			prevPage() {
+				uni.navigateBack({
+
+				});
+			},
+			handleRightClick: function(s, e) {
+
+				if (s === 0) {
+
+					return;
+				} else if (s === 1) {
+					console.log("分享");
+					uni.navigateTo({
+						url: '/pages/common/share/index',
+						events: {
+							ack: function(data) {}
+						},
+						success: (res) => {
+							let json = {
+								persissonType: '6075'
+							};
+							Object.assign(json, this.device);
+							res.eventChannel.emit('share', {
+								data: json
+							});
+						}
+					})
+				}
+			},
+			closeAction() {
+				for (let index = 0; index < this.dic.actionSheets.length; index++) {
+					let menu = this.dic.actionSheets[index];
+					if (menu.show) {
+						this.$set(this.dic.actionSheets[index], 'show', false);
+						break;
+					}
+				}
+			},
+			showAction(name) {
+
+				for (let index = 0; index < this.dic.actionSheets.length; index++) {
+					let menu = this.dic.actionSheets[index];
+					if (menu.name == name) {
+						this.$set(this.dic.actionSheets[index], 'show', true);
+						if (index == 2) {
+							this.$set(this.dic.actionSheets[index], 'value', '');
+							this.$set(this.dic.actionSheets[index], 'activeIndex', -1);
+						}
+					} else {
+						this.$set(this.dic.actionSheets[index], 'show', false);
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.eq {
+		width: 100%;
+		height: 250rpx;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
+
+	.eq .leftImg {
+		box-sizing: border-box;
+		padding: 36rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 0.5);
+	}
+
+	.eq .leftImg,
+	.eq .rightTxt {
+		width: 50%;
+		height: 100%;
+	}
+
+	.eq .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: space-evenly;
+		align-items: flex-start;
+	}
+
+	.eq .leftImg .img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.eq .rightTxt .img {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.eq .rightTxt .row {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+		box-sizing: border-box;
+		padding-left: 50rpx;
+	}
+
+	.eq .rightTxt .row .txt {
+		padding-left: 20rpx;
+	}
+
+	.eq .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
+
+	.eq .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+
+
+	.eqinfo {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 14rpx 0rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.eqinfo .item {
+		width: 100%;
+		min-height: 60rpx;
+		height: auto;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.eqinfo .lbl {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		width: 140rpx;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.eqinfo .value {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: 'PingFang SC';
+		font-size: 28rpx !important;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+
+	.eqinfo .valueFont {
+		font-family: 'PingFang SC';
+		font-size: 28rpx !important;
+		font-weight: 400;
+		color: rgba(255, 255, 255, 0.6);
+	}
+
+	.eqinfo .multiValue {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: wrap;
+		align-content: flex-end;
+		align-items: flex-end;
+		justify-content: flex-start;
+		width: calc(100% - 140rpx)
+	}
+
+	.eqinfo .valueItem {
+		height: auto;
+		line-height: 40rpx;
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 14px;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+	}
+
+	.lamp {
+		margin-top: 24rpx;
+	}
+
+	.lamp .title {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 28rpx;
+	}
+
+	.lampMode {
+		padding: 30rpx 0rpx;
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		align-content: space-around;
+		justify-content: space-between;
+		align-items: center;
+		justify-items: stretch;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+
+	.lampMode .mode {
+		width: calc(calc(100% - 34rpx) / 2);
+		border-radius: 8px;
+		margin-top: 20rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
+
+	.lampMode .mode.active {
+
+		border: 1px solid rgba(174, 214, 0, 1);
+	}
+
+	.lampMode .mode.active .bigTxt {
+
+		color: rgba(174, 214, 0, 1) !important;
+	}
+
+	.mode.marginLeft {
+		margin-left: 34rpx !important;
+	}
+
+	.mode .leftImg .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.mode .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: center;
+		align-items: flex-start;
+		padding-left: 20rpx;
+	}
+
+	.mode .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.mode .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		background: rgba(26, 26, 26, 1);
+		margin-bottom: 20rpx;
+	}
+
+	.usrtitle {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		height: 40rpx;
+		line-height: 40rpx;
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .btnSend {
+		line-height: 65rpx;
+		border-radius: 8px;
+		width: 120rpx;
+		height: 65rpx;
+		color: rgba(35, 35, 35, 0.87);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 0.15rpx;
+		text-align: center;
+		background-color: #BBE600;
+	}
+
+	.usrinfo .item {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		line-height: 90rpx;
+		height: 90rpx;
+		background: rgba(42, 42, 42, 1);
+		margin-top: 24rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.usrinfo .lbl {
+		width: 120rpx;
+		height: 100%;
+		padding-left: 24rpx;
+		box-sizing: border-box;
+
+		text-align: right;
+
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .value {
+		width: calc(100% - 120rpx);
+		height: 100%;
+
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+
+	}
+
+	.usrinfo .value .uni-input-input {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+
+	}
+
+
+	.usrplace {
+		color: rgba(255, 255, 255, 0.4);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.proinfo .itemcontent {
+		display: flex;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+	}
+
+	.proinfo .item {
+		width: 180rpx;
+		height: 180rpx;
+		box-sizing: border-box;
+		padding: 40rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.proinfo .item .img {
+		width: 50rpx;
+		height: 50rpx;
+
+
+	}
+
+	.proinfo .item .txt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		margin-top: 20rpx;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+
+	.slider-container {
+		padding: 0px;
+	}
+
+
+
+
+	.addIco {
+		width: 100%;
+		height: 360rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.icoContent {
+		width: 240rpx;
+		height: 240rpx;
+		border-radius: 8rpx;
+
+
+		background: rgba(58, 58, 58, 1);
+	}
+
+	.icoContent .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.modeSetting {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-around;
+		align-items: center;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 30rpx 0rpx;
+	}
+
+	.modeSetting .item {
+		width: 120rpx;
+		height: 120rpx;
+		background: rgba(42, 42, 42, 1);
+		border-radius: 50%;
+
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 0px;
+
+		box-sizing: border-box;
+	}
+
+	.modeSetting .item.active {
+		border: 4rpx solid rgba(174, 214, 0, 1);
+		background: rgba(26, 26, 26, 1);
+		padding: 6rpx;
+		color: rgba(26, 26, 26, 0.87);
+	}
+
+	.modeSetting .item.active .p100 {
+		background: rgba(174, 214, 0, 1);
+		border-radius: 50%;
+
+	}
+
+
+	.usrinfo .image {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.usrinfo .img {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.content {
+
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+	}
+
+	.contentBg {
+		background-color: #121212;
+		color: #ffffffde;
+	}
+
+	.fleft {
+		float: left;
+	}
+
+	.fright {
+		float: right;
+	}
+
+	.clear {
+		clear: both;
+	}
+
+	.displayNone {
+		display: none !important;
+	}
+
+	.p100 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.center {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.centerLeft {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin: 20rpx 0rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.optTitle {
+		color: rgba(255, 255, 255, 0.87);
+
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.14rpx;
+		text-align: left;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 30rpx 0rpx 10rpx 30rpx;
+	}
+
+	.sosContent {
+		width: 100%;
+		height: 130rpx;
+
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.sosContent .item {
+		width: calc(calc(100% - 80rpx) / 2);
+		height: 100%;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.14rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.sosContent .item.active {
+		border: 1px solid rgba(224, 52, 52, 1);
+		color: rgba(224, 52, 52, 1);
+	}
+
+	.sosContent .imgContent {
+		width: 55rpx;
+		height: 55rpx;
+		background-color: #232323;
+		border-radius: 4rpx;
+		margin-right: 30rpx;
+	}
+
+	.sosContent .imgContent .img {
+		width: 70%;
+		height: 70%;
+
+	}
+
+	.sosContent .item.active .imgContent {
+		background-color: #E034340F;
+	}
+
+	.lightMode {
+		width: 100%;
+		height: 180rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		margin-bottom: 30rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+
+	.lightMode .item {
+		width: calc(calc(100% - 90rpx) / 3);
+		height: 100%;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.14rpx;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+		align-items: center;
+	}
+
+	.lightMode .item.active {
+
+		color: #AED600;
+	}
+
+	.lightMode .imgContent {
+		width: 80rpx;
+		height: 100rpx;
+	}
+
+	.lightMode .imgContent .img {
+		width: 100%;
+		height: 100%;
+
+	}
+
+	.picVideo .btnImg {
+		width: 100%;
+		height: 100rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 1);
+	}
+
+	.picVideo .btnImg .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+
+	.netContent {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: flex-end;
+		justify-content: space-around;
+		align-items: flex-end;
+		width: 50rpx;
+	}
+
+	.net {
+		width: 7rpx;
+		background: rgba(255, 255, 255, 0.3);
+	}
+
+	.net.netone {
+		height: 11rpx;
+	}
+
+	.net.nettwo {
+		height: 17rpx;
+	}
+
+	.net.netsiri {
+		height: 23rpx;
+	}
+
+	.net.netfour {
+		height: 29rpx;
+	}
+
+	.net.netfive {
+		height: 35rpx;
+	}
+
+	.net.active {
+		background: #FFFFFF !important;
+	}
+
+	.navbarRight .img {
+		width: 35rpx;
+		height: 35rpx;
+		margin-right: 20rpx;
+	}
+
+	.uni-navbar--fixed {
+		top: 0rpx;
+	}
+
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+
+	/deep/ .uni-navbar__placeholder {
+		display: none !important;
+	}
+
+	.TextToHex {
+		position: fixed;
+		top: -99999rpx;
+		left: -99999rpx;
+		visibility: hidden;
+	}
+
+	.leftIndent {
+		text-indent: 10rpx;
+		display: inline-block;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/6155/BJQ6155.vue b/pages/6155/BJQ6155.vue
index 96f0a41..72f80b0 100644
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@@ -312,20 +312,20 @@
 				dic: {
 					menuItems: [{
 							text: '强光',
-							icon: '/static/images/6155/DeviceDetail/qiang.png',
+							icon: '/static/images/lightImg/qiang.png',
 							math: 100,
 							type: 'main'
 						},
 
 						{
 							text: '弱光',
-							icon: '/static/images/6155/DeviceDetail/ruo.png',
+							icon: '/static/images/lightImg/ruo.png',
 							math: 50,
 							type: 'main'
 						},
 						{
 							text: '爆闪',
-							icon: '/static/images/6155/DeviceDetail/shan.png',
+							icon: '/static/images/lightImg/shan.png',
 							math: 30,
 							type: 'main'
 						},
@@ -337,13 +337,13 @@
 						},
 						{
 							text: '泛光',
-							icon: '/static/images/6155/DeviceDetail/fan.png',
+							icon: '/static/images/lightImg/fan.png',
 							math: 100,
 							type: 'fu'
 						},
 						{
 							text: '强+泛光',
-							icon: '/static/images/6155/DeviceDetail/fan.png',
+							icon: '/static/images/lightImg/fan.png',
 							math: 70,
 							type: 'fu'
 						}
@@ -785,9 +785,12 @@
 										message: "上传成功",
 										iconUrl: "/static/images/common/success.png",
 									});
-
-									ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f
+									
+									setTimeout(()=>{
+										ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f
 										.wirteCharactId);
+									},1000);
+									
 									these.rgb565Data = null;
 									resolve();
 									return;
@@ -906,7 +909,7 @@
 					sourceType: ['album'],
 					success: function(res) {
 						uni.navigateTo({
-							url: "/pages/6155/ImgCrop",
+							url: "/pages/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 
@@ -915,7 +918,7 @@
 									});
 									console.log("data=", data);
 									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/6155/ImgCrop.vue b/pages/6155/ImgCrop.vue
index c6209ea..e69de29 100644
--- a/pages/6155/ImgCrop.vue
+++ b/pages/6155/ImgCrop.vue
@@ -1,100 +0,0 @@
-<template>
-	<view>
-		<canvas  id="splashCanvas" canvas-id="splashCanvas" :style="{'width':width+'px','height':height+'px'}"  style=" z-index: 9999;position: fixed; visibility: hidden;"></canvas>
-
-
-			<qf-image-cropper :src="src" :showAngle="false" :width="cropWidth" :height="cropHeight" fileType="jpg"
-				@crop="handleCrop" :areaScale="0.1" :minScale="0.1" :gpu="true">
-			</qf-image-cropper>
-	</view>
-</template>
-
-<script>
-	import QfImageCropper from '@/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue';
-	export default {
-		components: {
-			QfImageCropper
-		},
-		data() {
-			return {
-				src: "",
-				Statu: false,
-				width:160,
-				height:80,
-				times:10
-			}
-		},
-		computed:{
-			cropWidth(){
-				return this.width*this.times;
-			}
-			,
-			cropHeight(){
-				return this.height*this.times;
-			}
-		},
-		onLoad: function(option) {
-			const eventChannel = this.getOpenerEventChannel();
-			var these = this;
-			eventChannel.on('checkImg', (rec)=> {
-				console.log("我收到你的消息了，消息内容是：" + JSON.stringify(rec));
-				this.src = rec.data;
-				this.width=rec.width?rec.width:160;
-				this.height=rec.height?rec.height:80;
-				this.times=rec.times?rec.times:10;
-			})
-		},
-		methods: {
-			handleCrop(e) {
-				
-				var these = this;
-				const eventChannel = these.getOpenerEventChannel();
-				this.Statu = true;
-				console.log("裁剪完成");
-				console.log(e.tempFilePath);
-				eventChannel.emit('ImgCutOver_Path',e.tempFilePath);
-				const ctx = uni.createCanvasContext('splashCanvas', this);
-				ctx.drawImage(
-					e.tempFilePath,
-					0,0,these.width,these.height
-				);
-				setTimeout(() => {
-					ctx.draw(false, ()=>{
-						console.log("abcdefg")
-						uni.canvasGetImageData({
-							canvasId: 'splashCanvas',
-							x: 0,
-							y: 0,
-							width: these.width,
-							height: these.height,
-							success: (res) => {
-								// 处理像素数据并发送
-								
-								console.log("res.data.length="+res.data.length);
-								eventChannel.emit('ImgCutOverPath', {
-									picPath: e.tempFilePath
-								});
-								 
-								 eventChannel.emit('ImgCutOver',{piexls:res.data,picPath:e.tempFilePath});
-								
-								 uni.navigateBack();
-							},
-							fail: (err) => {
-								reject(`获取canvas数据失败: ${err.errMsg}`);
-							}
-						});
-					});
-				}, 500);
-
-			}
-
-		}
-	}
-</script>
-
-<style>
-	.canvas {
-	
-		border: 1px solid #ccc;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue
index 2effd5a..1170edb 100644
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@@ -250,15 +250,15 @@
 						showHeader: true,
 						menuItems: [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							}
 						],
 						activeIndex: -1,
@@ -926,7 +926,7 @@
 					sourceType: ['album'],
 					success: function(res) {
 						uni.navigateTo({
-							url: "/pages/6155/ImgCrop",
+							url: "/pages/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 
@@ -1378,19 +1378,19 @@
 						title = '主灯模式';
 						items = [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							// {
 							// 	text: '工作光',
-							// 	icon: '/static/images/6155/DeviceDetail/fan.png'
+							// 	icon: '/static/images/lightImg/fan.png'
 							// },
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							},
 							{
 								text: '关闭',
@@ -1402,11 +1402,11 @@
 						title = '辅灯模式';
 						items = [{
 								text: '泛光',
-								icon: '/static/images/6155/DeviceDetail/fan.png'
+								icon: '/static/images/lightImg/fan.png'
 							},
 							{
 								text: '强+泛光',
-								icon: '/static/images/6155/DeviceDetail/fan.png'
+								icon: '/static/images/lightImg/fan.png'
 							},
 						];
 						break;
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 0c2ab74..c18438c 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -49,7 +49,13 @@
 					<view class="info-row">
 						<text class="info-label">设备状态</text>
 						<text class="info-value status-running">
-						{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus === 2 ? '故障' : '在线' }}
+							{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus === 2 ? '故障' : '在线' }}
+						</text>
+					</view>
+					<view class="info-row" v-if="itemInfo.deviceMac">
+						<text class="info-label">蓝牙状态</text>
+						<text class="info-value status-running">
+							{{getbleStatu}}
 						</text>
 					</view>
 					<view class="info-row">
@@ -123,6 +129,9 @@
 
 				<!-- 人员信息登记 -->
 				<view class="form-section" v-if="hasPermission('4')">
+					<TextToHexV2 class="TextToHex" ref="textToHex" :txts="formData.textLines" :bgColor="'#FFFFFF'"
+						:color="'#000000'" :fontSize="12" :returnType="10" />
+
 					<view class="mode-buttons">
 						<view class="section-title">人员信息登记</view>
 						<view class="right-icons">
@@ -266,11 +275,33 @@
 				popupBorder="1rpx solid rgba(224, 52, 52, 0.3)" :message="popupMessage"
 				icon="/static/images/6170/svg.png" :confirm-text="popupConfirmText" :show-cancel="false"
 				@confirm="onPopupConfirmPolice" confirmBtnBg="rgba(224, 52, 52, 1)" confirmBtnColor="#fff" />
+
+			<MsgBox ref="msgPop" />
+			<global-loading ref="loading" />
 		</view>
 	</view>
 </template>
 
 <script>
+	import TextToHexV2 from '@/components/TextToHex/TextToHexV2.vue';
+	import BleTool from '@/utils/BleHelper.js'
+	import BleReceive from '@/utils/BleReceive';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+
+	import {
+		MsgSuccess,
+		MsgError,
+		MsgClose,
+		MsgWarning,
+		showPop
+	} from '@/utils/MsgPops.js';
+	import Common from '@/utils/Common.js';
+
+
 	import MqttClient from '@/utils/mqtt.js';
 	import {
 		generateShortId,
@@ -285,16 +316,27 @@
 		laserModeSettings, //激光模式设置
 		lightBrightnessSettings, //灯光亮度设置
 		deviceRealTimeStatus //设备状态
-	} from '@/api/6170/deviceControl.js'
+	} from '@/api/6170/deviceControl.js';
 	import {
 		baseURL,
 		getToken,
 		clientid
-	} from '@/utils/request'
+	} from '@/utils/request';
 	import {
 		deviceSendAlarmMessage
-	} from '@/api/6170/callPolice.js'
+	} from '@/api/6170/callPolice.js';
+
+
+	var these = null;
+	var ble = null;
+	var rec = null;
+
+	var pagePath = "pages/6170/BJQ6170";
+
 	export default {
+		components: {
+			TextToHexV2
+		},
 		data() {
 			return {
 				isCardSliding: false,
@@ -312,7 +354,25 @@
 				pendingMainMode: null, // 选中的索引
 				isFormExpanded: true, // 默认展开
 				deviceID: '',
-				itemInfo: {},
+				itemInfo: {
+					id: "",
+					deviceName: "",
+					deviceImei: "",
+					deviceMac: "",
+					communicationMode: 0,
+					devicePic: "",
+					typeName: "",
+					bluetoothName: null,
+					deviceStatus: null,
+					bindingTime: "",
+					onlineStatus: 0,
+					battery: "0",
+					latitude: null,
+					longitude: null,
+					alarmStatus: null,
+					detailPageUrl: "",
+					showConfirm: false
+				},
 				mqttClient: null,
 				messageToSend: '',
 				personnelInfo: {
@@ -330,12 +390,21 @@
 				popupConfirmText: '确认',
 				showUploadPopup: false,
 				selectedImage: null, // 添加这个变量来存储选择的图片
+				rgb565Data: null,
 				selectedItemIndex: 0,
 				popupType: 'person', //弹框类型
 				isLaserOn: false,
 				isSending: false,
 				isProcessing: false,
-				isPolling: false // 轮询状态
+				isPolling: false, // 轮询状态
+				formData: {
+					deviceId: '',
+					bleStatu: '',
+					textLines: []
+				},
+				Status: {
+					pageHide: null
+				}
 			}
 		},
 		computed: {
@@ -344,9 +413,170 @@
 			},
 			popupTitle() {
 				return this.modeType === 'main' ? '灯光模式' : '激光模式';
+			},
+			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: {
+			getDevice: function() {
+
+				console.log("LinkedList=", ble.data.LinkedList);
+				console.log("this.device=", this.device);
+				let f = ble.data.LinkedList.find((v) => {
+					if (v.macAddress == this.itemInfo.deviceMac) {
+						if (!this.formData.deviceId) {
+							this.formData.deviceId = v.deviceId
+						};
+						return true;
+					}
+				});
+
+				return f;
+			},
+			initBle() {
+				if (this.itemInfo.deviceMac) {
+
+					let f = this.getDevice();
+
+
+					ble.addReceiveCallback(these.bleValueNotify, pagePath);
+					ble.addStateBreakCallback(these.bleStateBreak, pagePath);
+					ble.addStateRecoveryCallback(these.bleStateRecovry, pagePath);
+					ble.addDisposeCallback(these.deviceDispose, pagePath);
+					ble.addRecoveryCallback(these.deviceRecovry, pagePath);
+
+					if (!f) {
+						this.showBleUnConnect();
+					}
+				}
+			},
+			showBleUnConnect() {
+
+				showPop({
+					message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
+					iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+					borderColor: "#e034344d",
+					buttonBgColor: "#E03434",
+					buttonText: '去连接',
+					buttonTextColor: '#232323de',
+					showCancel: true,
+					okCallback: function() {
+						console.log("1111");
+						uni.navigateTo({
+							url: "/pages/common/addBLE/addEquip",
+							events: {
+								BindOver: function(data) {
+									console.log(data)
+									these.formData.bleStatu = true;
+								}
+							},
+							success: function(res) {
+								// 通过eventChannel向被打开页面传送数据
+								res.eventChannel.emit('detailData', {
+									data: these.itemInfo
+								})
+							}
+						})
+					}
+				}, these);
+			},
+			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
+				let data = recei.ReceiveData(receive, device, pagePath, recArr);
+				console.log("蓝牙收到消息", data)
+				this.receivData(data);
+			},
+			bleStateBreak() {
+				if (this.Status.pageHide) {
+					return;
+				}
+				//蓝牙适配器不可用
+				this.formData.bleStatu = false;
+				uni.showToast({
+					icon: 'fail',
+					title: '蓝牙已不可用'
+				})
+				hideLoading(this);
+			},
+			bleStateRecovry() {
+				console.log("蓝牙可用");
+				if (this.Status.pageHide) {
+					return;
+				}
+				console.log("蓝牙可用");
+				//蓝牙适配器再次可用,尝试恢复连接
+				showLoading(this, {
+					text: "蓝牙恢复可用,正在连接设备"
+				});
+				this.formData.bleStatu = 'connecting';
+				ble.LinkBlue(these.formData.deviceId).then(() => {
+					these.formData.bleStatu = true;
+					updateLoading(these, {
+						text: '连接成功'
+					});
+				}).catch(ex => {
+					updateLoading(these, {
+						text: ex.msg
+					})
+				}).finally(() => {
+					setTimeout(() => {
+						hideLoading(these);
+					}, 1000);
+
+				});
+			},
+			deviceDispose(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					if (res.device) {
+						these.formData.bleStatu = 'connecting';
+					} else {
+						this.formData.bleStatu = false;
+					}
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'fail',
+						title: '蓝牙连接已断开'
+					});
+				}
+
+			},
+			deviceRecovry(res) {
+				if (this.Status.pageHide) {
+					return;
+				}
+				if (res.deviceId == these.formData.deviceId) {
+					this.formData.bleStatu = true;
+					setTimeout(() => {
+						hideLoading(these, 1000);
+					});
+					uni.showToast({
+						icon: 'success',
+						title: '蓝牙连接成功'
+					});
+				}
+
+			},
 			// 点击弹框外的区域关闭
 			closePopup() {
 				this.lightModeA = false;
@@ -430,10 +660,64 @@
 				// 使用节流防止指令发送过于频繁
 				if (now - this.lastBrightnessTime > 200) { // 200毫秒节流
 					this.lastBrightnessTime = now;
-					// 增加轻微的震动反馈，提升手感
-					uni.vibrateShort({
-						type: 'light'
-					});
+
+					let mqSend = () => {
+
+						// 增加轻微的震动反馈，提升手感
+						uni.vibrateShort({
+							type: 'light'
+						});
+
+						let data = {
+							deviceId: this.computedDeviceId,
+							instructValue: this.sliderValue + '.00',
+							deviceImei: this.itemInfo.deviceImei,
+						}
+						lightBrightnessSettings(data).then((res) => {
+							if (res.code !== 200) {
+								// 可以在这里处理错误，但滑动中不建议用toast
+							}
+						})
+					}
+
+					if (ble && this.itemInfo.deviceMac) {
+						let f = this.getDevice();
+						if (f) {
+							let json = {
+								instruct: [5, 0, 0, 0, 0]
+							};
+							json.instruct[1] = parseInt(this.sliderValue);
+
+							ble.sendString(f.deviceId, json).then(res => {
+
+							}).catch(ex => {
+								mqSend();
+							});
+						} else {
+							mqSend();
+						}
+						return;
+					} else {
+						mqSend();
+					}
+				}
+			},
+			onSliderChangeEnd(e) {
+
+				let value = e.detail.value;
+				if (value < 10) {
+					value = 10;
+				}
+				this.sliderValue = value;
+
+				let mqSend = () => {
+					if (this.deviceInfo.onlineStatus !== 1) {
+						uni.showToast({
+							title: '设备已离线',
+							icon: 'none'
+						});
+						return;
+					}
 
 					let data = {
 						deviceId: this.computedDeviceId,
@@ -441,40 +725,39 @@
 						deviceImei: this.itemInfo.deviceImei,
 					}
 					lightBrightnessSettings(data).then((res) => {
-						if (res.code !== 200) {
-							// 可以在这里处理错误，但滑动中不建议用toast
+						if (res.code == 200) {
+							// 可以在此处理成功反馈
+						} else {
+							uni.showToast({
+								icon: 'none',
+								title: res.msg
+							})
 						}
 					})
+
 				}
-			},
-			onSliderChangeEnd(e) {
-				if (this.deviceInfo.onlineStatus !== 1) {
-					uni.showToast({
-						title: '设备已离线',
-						icon: 'none'
-					});
-					return;
-				}
-				let value = e.detail.value;
-				if (value < 10) {
-					value = 10;
-				}
-				this.sliderValue = value;
-				let data = {
-					deviceId: this.computedDeviceId,
-					instructValue: this.sliderValue + '.00',
-					deviceImei: this.itemInfo.deviceImei,
-				}
-				lightBrightnessSettings(data).then((res) => {
-					if (res.code == 200) {
-						// 可以在此处理成功反馈
+
+
+				if (ble && this.itemInfo.deviceMac) {
+					let f = this.getDevice();
+					if (f) {
+						let json = {
+							instruct: [5, 0, 0, 0, 0]
+						};
+						json.instruct[1] = parseInt(this.sliderValue);
+
+						ble.sendString(f.deviceId, json).then(res => {
+
+						}).catch(ex => {
+							mqSend();
+						});
 					} else {
-						uni.showToast({
-							icon: 'none',
-							title: res.msg
-						})
+						mqSend();
 					}
-				})
+					return;
+				} else {
+					mqSend();
+				}
 			},
 			selectMode(type) {
 				this.modeType = type;
@@ -536,78 +819,138 @@
 			},
 			// 灯光模式的确认
 			handleSumbit() {
-				
-				if (this.deviceInfo.onlineStatus !== 1) {
-					uni.showToast({
-						title: '设备已离线',
-						icon: 'none'
-					});
-					return;
-				}
+
+
 				if (this.selectedItemIndex === null) return;
 				const selectedItem = this.items[this.selectedItemIndex];
-				let data = {
-					deviceId: this.computedDeviceId,
-					instructValue: selectedItem.instructValue,
-					deviceImei: this.itemInfo.deviceImei,
-					typeName: this.itemInfo.typeName,
-				};
-				lightModeSettings(data).then((res) => {
-					if (res.code == 200) {
-						this.currentMainMode = this.pendingMainMode;
-						this.selectedItemIndex = selectedItem;
+
+				let mqSend = () => {
+					if (this.deviceInfo.onlineStatus !== 1) {
 						uni.showToast({
-							title: res.msg,
+							title: '设备已离线',
 							icon: 'none'
-						})
-						uni.hideLoading();
-						this.lightModeA = false;
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-						uni.hideLoading();
+						});
+						return;
 					}
-				})
+
+					let data = {
+						deviceId: this.computedDeviceId,
+						instructValue: selectedItem.instructValue,
+						deviceImei: this.itemInfo.deviceImei,
+						typeName: this.itemInfo.typeName,
+					};
+					lightModeSettings(data).then((res) => {
+						if (res.code == 200) {
+							this.currentMainMode = this.pendingMainMode;
+							this.selectedItemIndex = selectedItem;
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							})
+							uni.hideLoading();
+							this.lightModeA = false;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							})
+							uni.hideLoading();
+						}
+					});
+				}
+
+				if (ble && this.itemInfo.deviceMac) {
+					let f = this.getDevice();
+					if (f) {
+						let json = {
+							instruct: [1, 0, 0, 0, 0]
+						};
+						json.instruct[1] = parseInt(selectedItem.instructValue);
+
+						ble.sendString(f.deviceId, json).then(res => {
+
+						}).catch(ex => {
+							mqSend();
+						});
+					} else {
+						mqSend();
+					}
+					return;
+				} else {
+					mqSend();
+				}
+
 			},
 			// 激光模式
 			lasermode() {
+
 				this.lightModeC = true
+
+
 			},
 			// 激光确认框提交
 			handleBtn() {
-				if (this.deviceInfo.onlineStatus !== 1) {
-					uni.showToast({
-						title: '设备已离线',
-						icon: 'none'
-					});
-					return;
-				}
+
 				const instructValue = this.isLaserOn ? 0 : 1;
-				let data = {
-					deviceId: this.computedDeviceId,
-					instructValue: instructValue,
-					deviceImei: this.itemInfo.deviceImei,
-					typeName: this.itemInfo.typeName,
-				};
-				laserModeSettings(data).then((res) => {
-					if (res.code == 200) {
+
+				let mqSend = () => {
+					if (this.deviceInfo.onlineStatus !== 1) {
 						uni.showToast({
-							icon: 'none',
-							title: res.msg
-						});
-						// 更新状态
-						this.isLaserOn = !this.isLaserOn;
-						this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
-						this.lightModeC = false;
-					} else {
-						uni.showToast({
-							title: res.msg,
+							title: '设备已离线',
 							icon: 'none'
 						});
+						return;
 					}
-				})
+
+					let data = {
+						deviceId: this.computedDeviceId,
+						instructValue: instructValue,
+						deviceImei: this.itemInfo.deviceImei,
+						typeName: this.itemInfo.typeName,
+					};
+					laserModeSettings(data).then((res) => {
+						if (res.code == 200) {
+							uni.showToast({
+								icon: 'none',
+								title: res.msg
+							});
+							// 更新状态
+							this.isLaserOn = !this.isLaserOn;
+							this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
+							this.lightModeC = false;
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					}).finally(() => {
+						this.lightModeC = false;
+					})
+				}
+
+				if (ble && this.itemInfo.deviceMac) {
+					let f = this.getDevice();
+					if (f) {
+						let json = {
+							instruct: [4, 0, 0, 0, 0]
+						};
+						json.instruct[1] = parseInt(instructValue);
+
+						ble.sendString(f.deviceId, json).then(res => {
+							this.lightModeC = false;
+							this.isLaserOn = !this.isLaserOn;
+							this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
+						}).catch(ex => {
+							mqSend();
+						});
+					} else {
+						mqSend();
+					}
+					return;
+				} else {
+					mqSend();
+				}
 			},
 			//激光取消
 			handleDisagree() {
@@ -636,10 +979,11 @@
 						}
 						let that = this;
 						uni.navigateTo({
-							url: "/pages/6155/ImgCrop",
+							url: "/pages/ImgCrop/ImgCrop",
 							events: {
-								ImgCutOverPath :function (data) {
+								ImgCutOver: function(data) {
 									that.selectedImage = data.picPath;
+									these.rgb565Data = Common.convertToRGB565(data.piexls);
 								}
 							},
 							success(ev) {
@@ -653,7 +997,7 @@
 			},
 			// 上传开机画面确认按键
 			handleupload() {
-				let loadingShown = false;
+
 				if (!this.selectedImage) {
 					uni.showToast({
 						title: '请上传一张图片',
@@ -661,92 +1005,264 @@
 					});
 					return;
 				}
-				if (this.deviceInfo.onlineStatus !== 1) {
-					uni.showToast({
-						title: '设备已离线',
-						icon: 'none'
+
+				let mqSend = () => {
+					if (this.deviceInfo.onlineStatus !== 1) {
+						uni.showToast({
+							title: '设备已离线',
+							icon: 'none'
+						});
+						return;
+					}
+
+					let loadingShown = false;
+					// 显示上传加载状态
+					uni.showLoading({
+						title: '图片上传中...',
+						mask: true
 					});
-					return;
-				}
-				// 显示上传加载状态
-				uni.showLoading({
-					title: '图片上传中...',
-					mask: true
-				});
-				loadingShown = true;
-				this.isPolling = true; // 标记开始轮询
-				uni.uploadFile({
-					url: baseURL + '/app/bjq/device/uploadLogo',
-					filePath: this.selectedImage,
-					name: 'file',
-					formData: {
-						deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
-						deviceImei: this.itemInfo.deviceImei,
-						typeName: this.itemInfo.typeName,
-					},
-					header: {
-						'Authorization': 'Bearer ' + getToken(),
-						'clientid': clientid(),
-					},
-					complete: async (res) => {
-						try {
-							uni.hideLoading(); // 首先关闭“
-							const responseData = JSON.parse(res.data);
-							if (responseData.code === 200) {
-								uni.showLoading({
-									title: '等待设备响应...',
-									mask: true
-								});
-								try {
-									// 获取设备状态
-									// 4. 获取设备状态
-									let deviceImei = this.itemInfo.deviceImei
-									//let typeName = this.itemInfo.typeName
-									let batchId = ''
-									const statusRes = await getdeviceSTatus({
-											functionMode: 1,
-											batchId,
-											typeName: 'FunctionAccessStatusRule',
-											deviceImei,
-											interval: 800
-										},
-										deviceRealTimeStatus
-									);
-									if (statusRes.data.functionAccess === 'OK') {
+					loadingShown = true;
+					this.isPolling = true; // 标记开始轮询
+					uni.uploadFile({
+						url: baseURL + '/app/bjq/device/uploadLogo',
+						filePath: this.selectedImage,
+						name: 'file',
+						formData: {
+							deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
+							deviceImei: this.itemInfo.deviceImei,
+							typeName: this.itemInfo.typeName,
+						},
+						header: {
+							'Authorization': 'Bearer ' + getToken(),
+							'clientid': clientid(),
+						},
+						complete: async (res) => {
+							try {
+								uni.hideLoading(); // 首先关闭“
+								const responseData = JSON.parse(res.data);
+								if (responseData.code === 200) {
+									uni.showLoading({
+										title: '等待设备响应...',
+										mask: true
+									});
+									try {
+										// 获取设备状态
+										// 4. 获取设备状态
+										let deviceImei = this.itemInfo.deviceImei
+										//let typeName = this.itemInfo.typeName
+										let batchId = ''
+										const statusRes = await getdeviceSTatus({
+												functionMode: 1,
+												batchId,
+												typeName: 'FunctionAccessStatusRule',
+												deviceImei,
+												interval: 800
+											},
+											deviceRealTimeStatus
+										);
+										if (statusRes.data.functionAccess === 'OK') {
+											uni.hideLoading();
+											this.selectedImage = '';
+											this.file = null;
+											this.popupType = 'logo';
+											this.showPopupFlag = true;
+											this.popupMessage = '上传成功';
+											this.lightModeB = false;
+										}
+									} catch (error) {
+										this.isPolling = false; // 标记轮询结束
 										uni.hideLoading();
-										this.selectedImage = '';
-										this.file = null;
-										this.popupType = 'logo';
-										this.showPopupFlag = true;
-										this.popupMessage = '上传成功';
-										this.lightModeB = false;
+										uni.showToast({
+											title: error.message,
+											icon: 'none'
+										});
 									}
-								} catch (error) {
+								} else {
 									this.isPolling = false; // 标记轮询结束
 									uni.hideLoading();
 									uni.showToast({
-										title: error.message,
+										title: responseData.msg,
 										icon: 'none'
 									});
 								}
-							} else {
+							} catch (e) {
 								this.isPolling = false; // 标记轮询结束
 								uni.hideLoading();
 								uni.showToast({
-									title: responseData.msg,
+									title: e.message,
 									icon: 'none'
 								});
 							}
-						} catch (e) {
-							this.isPolling = false; // 标记轮询结束
-							uni.hideLoading();
-							uni.showToast({
-								title: e.message,
-								icon: 'none'
-							});
 						}
+					});
+				}
+
+				let bleSend = () => {
+					let f = this.getDevice();
+					if (!f) {
+						this.showBleUnConnect();
+						return;
 					}
-				});
+
+					var sendImagePackets = (ReSendNo) => {
+
+						return new Promise((resolve, reject) => {
+
+							// 总数据包数
+							let totalPackets = 52;
+							let currentPacket = 1;
+
+							if (ReSendNo) {
+								totalPackets = ReSendNo;
+								currentPacket = ReSendNo;
+							}
+
+							if (f) {
+								// 发送单个数据包
+								const sendNextPacket = () => {
+									if (currentPacket > totalPackets) {
+										hideLoading(these);
+
+										showPop({
+											showPop: true,
+											message: "上传成功",
+											iconUrl: "/static/images/common/success.png",
+										}, these);
+
+										setTimeout(() => {
+											ble.sendString(f.deviceId, "transmit complete", f
+												.writeServiceId, f
+												.wirteCharactId);
+										}, 1000);
+
+										these.rgb565Data = null;
+										resolve();
+										return;
+									}
+
+									// 计算当前包的数据
+									let packetSize = 250;
+									// if (currentPacket <= 51) {
+									// 	packetSize = 250; // 前51个包每个500字节
+									// } else {
+									// 	packetSize = 50; // 最后一个包100字节
+									// }
+
+									// 创建数据包
+									const startIndex = (currentPacket - 1) * packetSize;
+									const endIndex = Math.min(startIndex + packetSize, these.rgb565Data
+										.length);
+									if (startIndex > endIndex) {
+										return;
+									}
+									const packetData = these.rgb565Data.slice(startIndex,
+										endIndex);
+									// 构建数据包
+									const bufferSize =
+										505; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
+									const buffer = new ArrayBuffer(bufferSize);
+									const dataView = new DataView(buffer);
+
+									// 填充头部
+									dataView.setUint8(0, 0x55); // 帧头
+									dataView.setUint8(1, 0x02); // 帧类型：开机画面
+									dataView.setUint8(2, currentPacket); // 包序号
+
+
+									if (packetData.length == 250) {
+										dataView.setUint8(3, 0x01);
+										dataView.setUint8(4, 0xF4);
+									} else {
+										dataView.setUint8(3, 0x00);
+										dataView.setUint8(4, 0x64);
+									}
+
+									// 填充数据（每个RGB565值占2字节）
+									for (let i = 0; i < packetData.length; i++) {
+										dataView.setUint16(5 + i * 2, packetData[i], false); // 大端字节序
+									}
+
+									if (currentPacket > 51) { //第52包补FF
+										for (var i = 105; i < bufferSize; i++) {
+											dataView.setUint8(i, 0xFF);
+										}
+									}
+
+
+
+									//发送数据包
+									ble.sendData(f.deviceId, buffer, f.writeServiceId, f
+											.wirteCharactId,
+											10)
+										.then(() => {
+
+
+											updateLoading(these, {
+												text: "正在发送:" + currentPacket + "/" +
+													totalPackets
+											})
+											currentPacket++;
+
+											setTimeout(sendNextPacket, these.inteval);
+										}).catch(err => {
+											console.log("发送数据包失败了" + JSON.stringify(err));
+											if (err.code == '10007') {
+												setTimeout(sendNextPacket, these.inteval);
+												return;
+											}
+
+											showPop({
+												message: err.msg,
+												iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+												borderColor: "#e034344d",
+												buttonBgColor: "#E03434",
+											}, these);
+											hideLoading(these);
+											these.rgb565Data = null;
+											reject(err);
+										});
+								}
+
+								if (ReSendNo) {
+									sendNextPacket(ReSendNo);
+									return;
+								}
+								// 开始牵手
+								ble.sendString(f.deviceId, "picture transmit start", f.writeServiceId,
+									f.wirteCharactId).then(() => {
+									setTimeout(sendNextPacket, 120);
+
+								}).catch((err) => {
+									console.log("握手没有成功");
+									showPop({
+										message: err.msg,
+										iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
+										borderColor: "#e034344d",
+										buttonBgColor: "#E03434",
+									}, these);
+									hideLoading(these);
+									reject(err);
+								});
+							}
+						});
+					}
+
+					setTimeout(function() {
+						sendImagePackets().catch(() => {
+
+						});
+					}, 0)
+				}
+				if (ble && this.itemInfo.deviceMac) {
+					let f = this.getDevice();
+					if (f) {
+						bleSend();
+					} else {
+						mqSend();
+					}
+				} else {
+					mqSend();
+				}
 			},
 			// 分享
 			shareUp() {
@@ -763,81 +1279,236 @@
 				})
 			},
 			// 发送人员信息
-			async sendPersonnelInfo() {
-				if (this.isSending) return;
-				const requiredFields = [{
-						field: 'unitName',
-						message: '单位名称不能为空'
-					},
-					{
-						field: 'name',
-						message: '姓名不能为空'
-					},
-					{
-						field: 'position',
-						message: '职位不能为空'
-					},
-					{
-						field: 'code',
-						message: 'ID不能为空'
+			sendPersonnelInfo() {
+				let mqSend = async () => {
+					if (this.isSending) return;
+					const requiredFields = [{
+							field: 'unitName',
+							message: '单位名称不能为空'
+						},
+						{
+							field: 'name',
+							message: '姓名不能为空'
+						},
+						{
+							field: 'position',
+							message: '职位不能为空'
+						},
+						{
+							field: 'code',
+							message: 'ID不能为空'
+						}
+					];
+					for (const {
+							field,
+							message
+						}
+						of requiredFields) {
+						if (!this.personnelInfo[field]) {
+							uni.showToast({
+								title: message,
+								icon: 'none'
+							});
+							return;
+						}
 					}
-				];
-				for (const {
-						field,
-						message
-					}
-					of requiredFields) {
-					if (!this.personnelInfo[field]) {
+					if (this.deviceInfo.onlineStatus !== 1) {
 						uni.showToast({
-							title: message,
+							title: '设备已离线',
 							icon: 'none'
 						});
 						return;
 					}
-				}
-				if (this.deviceInfo.onlineStatus !== 1) {
-					uni.showToast({
-						title: '设备已离线',
-						icon: 'none'
-					});
-					return;
-				}
-				this.isSending = true;
-				let loadingShown = false;
-				try {
-					uni.showLoading({
-						title: '发送中...',
-						mask: true
-					});
-					loadingShown = true;
-					// 2. 准备请求数据
-					const data = {
-						code: this.personnelInfo.code,
-						name: this.personnelInfo.name,
-						position: this.personnelInfo.position,
-						unitName: this.personnelInfo.unitName,
-						deviceId: this.computedDeviceId,
-						deviceImei: this.itemInfo.deviceImei
-					};
-					const registerRes = await registerPersonInfo(data);
-					if (registerRes.code == 200) {
-						this.popupType = 'person';
-						this.showPopupFlag = true;
-						this.popupMessage = '人员信息发送成功';
-					} else {
+					this.isSending = true;
+					let loadingShown = false;
+					try {
+						uni.showLoading({
+							title: '发送中...',
+							mask: true
+						});
+						loadingShown = true;
+						// 2. 准备请求数据
+						const data = {
+							code: this.personnelInfo.code,
+							name: this.personnelInfo.name,
+							position: this.personnelInfo.position,
+							unitName: this.personnelInfo.unitName,
+							deviceId: this.computedDeviceId,
+							deviceImei: this.itemInfo.deviceImei
+						};
+						const registerRes = await registerPersonInfo(data);
+						if (registerRes.code == 200) {
+							this.popupType = 'person';
+							this.showPopupFlag = true;
+							this.popupMessage = '人员信息发送成功';
+						} else {
+							uni.showToast({
+								title: registerRes.msg,
+								icon: 'none'
+							});
+						}
+					} catch (error) {
 						uni.showToast({
-							title: registerRes.msg,
+							title: error.msg,
 							icon: 'none'
 						});
+					} finally {
+						uni.hideLoading();
+						this.isSending = false;
 					}
-				} catch (error) {
-					uni.showToast({
-						title: error.msg,
-						icon: 'none'
-					});
-				} finally {
-					uni.hideLoading();
-					this.isSending = false;
+				}
+				let bleSend = () => {
+					let f = this.getDevice();
+					if (!f) {
+						this.showBleUnConnect();
+						return;
+					}
+
+
+
+
+
+					this.formData.textLines = [this.personnelInfo.unitName, this.personnelInfo.name, this.personnelInfo
+						.position, this.personnelInfo.code
+					];
+					console.log("data=", this.formData.textLines);
+					showLoading(these, {
+						text: '发送中'
+					})
+					//握手
+					let holdHand = (hexs, time) => {
+						return new Promise((resolve, reject) => {
+
+							ble.sendString(f.deviceId, hexs).then(res => {
+								setTimeout(() => {
+									resolve(res)
+								}, time);
+
+							}).catch(ex => {
+								reject(ex)
+							});
+
+						});
+					}
+					//画图
+					let drawText = () => {
+						return new Promise((resolve, reject) => {
+							this.$refs.textToHex.drawAndGetPixels().then(allPixels => {
+								if (!allPixels) {
+									reject("文本初始化失败");
+									return;
+								}
+								console.log("画图成功", JSON.stringify(allPixels));
+								resolve(allPixels);
+							}).catch(compEx => {
+								console.error("失败了", compEx);
+								reject(compEx);
+							});
+
+						});
+					}
+					//发送3个分包的数据
+					let task = (allPixels) => {
+						try {
+							let combinedData = [];
+							for (let i = 0; i < 4; i++) {
+								let linePixels = (allPixels[i] || []).flat(Infinity).map(item =>
+									typeof item === 'string' ? parseInt(item) : item
+								);
+
+
+								combinedData.push(linePixels);
+							}
+
+
+
+							let curr = 1;
+							let len = combinedData.length;
+
+
+
+							//分包发送
+							let sendPacket = () => {
+
+								if (combinedData.length === curr - 1) {
+									holdHand('transmit complete', 200).then(res => {
+										MsgSuccess("人员信息发送成功", "确定", these);
+										hideLoading(these);
+										this.setBleFormData();
+									});
+									hideLoading();
+									return;
+								}
+
+								let array = {
+									instruct: [2, curr].concat(combinedData[curr - 1])
+								};
+
+
+								console.log("array=", array);
+								ble.sendString(f.deviceId, array, null, null, 15).then(
+									res => {
+										curr++;
+										console.log("发送成功", curr);
+										updateLoading(these, {
+											text: '发送中,' + (curr - 1) + '/' + 4
+										})
+										setTimeout(sendPacket, 250);
+									}).catch(err => {
+									console.err("发送失败", err);
+									if (err.code == '10007') {
+										setTimeout(sendPacket, 250);
+									} else {
+										console.log("err:", err);
+										MsgError('发送失败' + (err.msg || err.code), '确定', these);
+										hideLoading();
+									}
+
+								});
+							}
+
+							setTimeout(sendPacket, 0);
+							// 5. 发送成功处理
+
+
+						} catch (ex) {
+							MsgError('发送失败' + (ex.msg || ex.code), '确定', these);
+						}
+
+
+					}
+
+					setTimeout(() => {
+						Promise.allSettled([holdHand('word transmit start', 2200), drawText()]).then(
+							results => {
+								if (results[0].status == 'rejected') {
+
+									setTimeout(() => {
+										hideLoading(these)
+									}, 500);
+									return;
+								}
+								if (results[1].status == 'rejected') {
+
+									return;
+								}
+
+								task(results[1].value);
+							})
+
+					}, 0);
+				}
+
+				if (ble && this.itemInfo.deviceMac) {
+					let f = this.getDevice();
+					if (f) {
+						bleSend();
+					} else {
+						mqSend();
+					}
+					return;
+				} else {
+					mqSend();
 				}
 			},
 			// 所有弹框，确定关闭按钮
@@ -1124,6 +1795,9 @@
 
 		},
 		onLoad(options) {
+			these = this;
+
+
 			const eventChannel = this.getOpenerEventChannel();
 			// 监听 'detailData' 事件，获取传过来的数据
 			uni.showLoading({
@@ -1132,11 +1806,16 @@
 			eventChannel.on('detailData', (data) => {
 				console.log(data, 'data');
 				this.itemInfo = data.data;
+
+
 				this.deviceID = data.data.id;
 				this.navTitle = data.data.deviceName;
 				this.apiType = data.apiType
+
 				// 根据 apiType 设置右图标的显示状态
 				this.isRightIconVisible = this.apiType === 'listA';
+
+				this.initBle();
 				// 初始化并连接MQTT
 				this.mqttClient = new MqttClient();
 				this.mqttClient.connect(() => {
@@ -1212,6 +1891,31 @@
 					this.fetchSharedDeviceDetail(data.data.id)
 				}
 
+
+				if (this.itemInfo.deviceMac) {
+					rec = BleReceive.getBleReceive();
+					ble = BleTool.getBleTool();
+
+					let f = ble.data.LinkedList.find((v) => {
+						if (v.macAddress == this.itemInfo.deviceMac) {
+							console.log("找到设备了", v);
+							these.formData.deviceId = v.deviceId;
+							return true;
+						}
+						return false;
+					});
+
+					if (f) {
+						these.formData.bleStatu = 'connecting';
+						ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(
+						res => {
+							these.formData.bleStatu = true;
+						});
+					}
+				}
+
+
+
 			});
 			eventChannel.emit('ack', {
 
@@ -1768,4 +2472,11 @@
 		margin-top: 60rpx;
 		position: relative;
 	}
+
+	.TextToHex {
+		position: fixed;
+		top: -99999rpx;
+		left: -99999rpx;
+		visibility: hidden;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/6331/BJQ6331.vue b/pages/6331/BJQ6331.vue
index acf8ad9..68e2abb 100644
--- a/pages/6331/BJQ6331.vue
+++ b/pages/6331/BJQ6331.vue
@@ -71,7 +71,7 @@
 			<view class="item" @click="lightSetting('jieN')" :class="formData.lightCurr=='jieN'?'active':''">
 				<view class="imgContent center">
 					<image class="img"
-						:src="formData.lightCurr=='jieN'?'/static/images/6331/jieNActive.png':'/static/images/6331/jieN.png'"
+						:src="formData.lightCurr=='jieN'?'/static/images/lightImg/jieNActive.png':'/static/images/lightImg/jieN.png'"
 						mode="aspectFit"></image>
 				</view>
 				<view class="txt">节能光</view>
@@ -275,15 +275,15 @@ import request, { baseURL } from '@/utils/request.js';
 						showHeader: true,
 						menuItems: [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							}
 						],
 						activeIndex: -1,
diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue
index 8f83a20..6742974 100644
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@@ -257,15 +257,15 @@ import request, { baseURL } from '@/utils/request.js';
 						showHeader: true,
 						menuItems: [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							}
 						],
 						activeIndex: -1,
@@ -1051,7 +1051,7 @@ import request, { baseURL } from '@/utils/request.js';
 				var gotoCutImg = (imgPath) => {
 
 					uni.navigateTo({
-						url: "/pages/6155/ImgCrop",
+						url: "/pages/ImgCrop/ImgCrop",
 						events: {
 							ImgCutOver: function(data) {
 								// console.log("我收到裁剪后的图片了，感谢老铁," + data)
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
index 6eb3bd0..91addfe 100644
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@@ -177,7 +177,7 @@
 			<view class="item" @click="lightSetting('close')" :class="formData.lightCurr=='close'?'active':''">
 				<view class="imgContent center">
 					<image class="img"
-						:src="formData.lightCurr=='close'?'/static/images/670/jieNActive.png':'/static/images/670/jieN.png'"
+						:src="formData.lightCurr=='close'?'/static/images/lightImg/jieNActive.png':'/static/images/lightImg/jieN.png'"
 						mode="aspectFit"></image>
 				</view>
 				<view class="txt">关闭</view>
@@ -363,15 +363,15 @@
 						showHeader: true,
 						menuItems: [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							}
 						],
 						activeIndex: -1,
@@ -486,10 +486,14 @@
 		},
 		onLoad: function() {
 
-
 			these = this;
 			recei = BleReceive.getBleReceive();
 			ble = BleTool.getBleTool();
+			this.$watch("formData.battary", (newVal, oldVal) => {
+				if (newVal <= 20 && this.formData.sta_system==2) {
+					this.showMsg("设备电量低");
+				}
+			});
 
 
 			ble.addReceiveCallback(these.bleValueNotify, pagePath);
@@ -928,30 +932,16 @@
 								// 	console.log("收到文本回复", payload);
 								// 	// this.SendTxtMQ(json);
 								// } 
-								if (keys.indexOf('sta_BreakNews') > -
-									1) { //紧急通知																					
-									if (json.sta_BreakNews ===
-										'I get it'
-										) // && this.Status.msgOkTime && this.Status.msgOkIntval){
-									{
-										these.showPop({
-											showPop: true,
-											message: "用户已确认收到紧急通知",
-											iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
-										});
-
-										// this.Status.msgOkTime=null
-										// clearInterval(this.Status.msgOkIntval);
-
-									}
-
-
-								}
-								// else {
-								// 	console.log("收到不能处理的数据", payload);
-								// }
-
-
+								if (keys.indexOf('sta_BreakNews') > -1) { //紧急通知																					
+										if(json.sta_BreakNews=='I get it'){
+											these.showPop({
+												showPop: true,
+												message: "用户已确认收到紧急通知",
+												iconUrl: "/static/images/6155/DeviceDetail/uploadSuccess.png"
+											});
+										}
+										
+								}						
 							} catch (error) {
 								console.error("无法解析此消息", payload);
 							}
@@ -1881,7 +1871,7 @@
 				var gotoCutImg = (imgPath) => {
 
 					uni.navigateTo({
-						url: "/pages/6155/ImgCrop",
+						url: "/pages/ImgCrop/ImgCrop",
 						events: {
 							ImgCutOver: function(data) {
 								// console.log("我收到裁剪后的图片了，感谢老铁," + data)
diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue
index 24d67ff..0daf510 100644
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@@ -230,20 +230,20 @@
 						showHeader: true,
 						menuItems: [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							}
 						],
 						activeIndex: -1,
 						bgColor: '#2a2a2a',
-						itemBgColor: '#3a3a3a',
+						itemBgColor: '#00000000',
 						textColor: '#ffffffde',
 						textAlign: 'flex-start',
 						title: '主灯模式',
@@ -783,7 +783,7 @@
 					sourceType: ['album'],
 					success: function(res) {
 						uni.navigateTo({
-							url: "/pages/6155/ImgCrop",
+							url: "/pages/ImgCrop/ImgCrop",
 							events: {
 								ImgCutOver: function(data) {
 									//将8位的二进制数组转换成16进制数据
@@ -957,19 +957,19 @@
 						title = '主灯模式';
 						items = [{
 								text: '强光',
-								icon: '/static/images/6155/DeviceDetail/qiang.png'
+								icon: '/static/images/lightImg/qiang.png'
 							},
 							// {
 							// 	text: '工作光',
-							// 	icon: '/static/images/6155/DeviceDetail/fan.png'
+							// 	icon: '/static/images/lightImg/fan.png'
 							// },
 							{
 								text: '弱光',
-								icon: '/static/images/6155/DeviceDetail/ruo.png'
+								icon: '/static/images/lightImg/ruo.png'
 							},
 							{
 								text: '爆闪',
-								icon: '/static/images/6155/DeviceDetail/shan.png'
+								icon: '/static/images/lightImg/shan.png'
 							},
 							{
 								text: '关闭',
@@ -981,7 +981,7 @@
 						title = '辅灯模式';
 						items = [{
 							text: '泛光',
-							icon: '/static/images/6155/DeviceDetail/fan.png'
+							icon: '/static/images/lightImg/fan.png'
 						}];
 						break;
 				}
@@ -1089,14 +1089,7 @@
 			},
 			handleItemClick(item, index) {
 
-				switch (this.Status.BottomMenu.type) {
-					case "main":
-
-						break;
-					case "fu":
-
-						break;
-				}
+			
 				this.Status.BottomMenu.activeIndex = index;
 
 			},
diff --git a/pages/common/ImgCrop/ImgCrop.vue b/pages/common/ImgCrop/ImgCrop.vue
new file mode 100644
index 0000000..0f68d84
--- /dev/null
+++ b/pages/common/ImgCrop/ImgCrop.vue
@@ -0,0 +1,100 @@
+<template>
+	<view>
+		<canvas  id="splashCanvas" canvas-id="splashCanvas" :style="{'width':width+'px','height':height+'px'}"  style=" z-index: 9999;position: fixed; visibility: hidden;"></canvas>
+
+
+			<qf-image-cropper :src="src" :showAngle="false" :width="cropWidth" :height="cropHeight" fileType="jpg"
+				@crop="handleCrop" :areaScale="0.1" :minScale="0.1" :gpu="true">
+			</qf-image-cropper>
+	</view>
+</template>
+
+<script>
+	import QfImageCropper from '@/uni_modules/qf-image-cropper/components/qf-image-cropper/qf-image-cropper.vue';
+	export default {
+		components: {
+			QfImageCropper
+		},
+		data() {
+			return {
+				src: "",
+				Statu: false,
+				width:160,
+				height:80,
+				times:10
+			}
+		},
+		computed:{
+			cropWidth(){
+				return this.width*this.times;
+			}
+			,
+			cropHeight(){
+				return this.height*this.times;
+			}
+		},
+		onLoad: function(option) {
+			const eventChannel = this.getOpenerEventChannel();
+			var these = this;
+			eventChannel.on('checkImg', (rec)=> {
+				console.log("我收到你的消息了，消息内容是：" + JSON.stringify(rec));
+				this.src = rec.data;
+				this.width=rec.width?rec.width:160;
+				this.height=rec.height?rec.height:80;
+				this.times=rec.times?rec.times:10;
+			})
+		},
+		methods: {
+			handleCrop(e) {
+				
+				var these = this;
+				const eventChannel = these.getOpenerEventChannel();
+				this.Statu = true;
+				console.log("裁剪完成");
+				console.log(e.tempFilePath);
+				eventChannel.emit('ImgCutOver_Path',e.tempFilePath);
+				const ctx = uni.createCanvasContext('splashCanvas', this);
+				ctx.drawImage(
+					e.tempFilePath,
+					0,0,these.width,these.height
+				);
+				setTimeout(() => {
+					ctx.draw(false, ()=>{
+						console.log("abcdefg")
+						uni.canvasGetImageData({
+							canvasId: 'splashCanvas',
+							x: 0,
+							y: 0,
+							width: these.width,
+							height: these.height,
+							success: (res) => {
+								// 处理像素数据并发送
+								
+								console.log("res.data.length="+res.data.length);
+								eventChannel.emit('ImgCutOverPath', {
+									picPath: e.tempFilePath
+								});
+								 
+								 eventChannel.emit('ImgCutOver',{piexls:res.data,picPath:e.tempFilePath});
+								
+								 uni.navigateBack();
+							},
+							fail: (err) => {
+								reject(`获取canvas数据失败: ${err.errMsg}`);
+							}
+						});
+					});
+				}, 500);
+
+			}
+
+		}
+	}
+</script>
+
+<style>
+	.canvas {
+	
+		border: 1px solid #ccc;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/common/addScan/ScanEquip.vue b/pages/common/addScan/ScanEquip.vue
index aa323f8..dc6bb27 100644
--- a/pages/common/addScan/ScanEquip.vue
+++ b/pages/common/addScan/ScanEquip.vue
@@ -72,7 +72,6 @@
 							callback: this.scan
 						}],
 						title: '扫码'
-
 					},
 				},
 				formData: {
@@ -208,7 +207,7 @@
 						this.qrCodeResult(cleanedResult, true, null);
 					},
 					fail: (err) => {
-						this.showMsg("扫码失败:" + err.errMsg, MsgType.error);
+						MsgError("扫码失败:" + err.errMsg,"确定",these);						
 					}
 				});
 			},
diff --git a/pages/6170/callPolice/index.vue b/pages/common/callPolice/index.vue
similarity index 59%
rename from pages/6170/callPolice/index.vue
rename to pages/common/callPolice/index.vue
index 0f3dec1..920a09a 100644
--- a/pages/6170/callPolice/index.vue
+++ b/pages/common/callPolice/index.vue
@@ -1,497 +1,661 @@
-<template>
-	<view class="container">
-		<!-- 设备列表 -->
-		<view class="allSelect" @click="selectAll"> 全选</view>
-		<scroll-view class="device-list" scroll-y>
-			<view class="device-card" v-for="(item, index) in deviceList" :key="index"
-				@click="item.onlineStatus === 1 ? toggleSelect(index) : null">
-				<!-- 复选框 -->
-				<view class="checkbox" :class="{ checked: item.checked, disabled: item.onlineStatus !== 1 }">
-					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
-				</view>
-				<!-- 设备信息 -->
-				<view class="device-content">
-					<view class="device-header">
-						<view class="deviceIMG">
-							<image :src="item.devicePic" class="IMG" mode="aspectFit"></image>
-						</view>
-						<view class="device-name">
-							<view>设备:{{ item.deviceName }}</view>
-							<view class="ID">
-								<view class="ID">ID:{{ item.deviceImei }}</view>
-								<view class="onlines" v-if="item.onlineStatus == 1">在线</view>
-								<!-- 离线状态 -->
-								<view class="unlines" v-if="item.onlineStatus == 0">离线</view>
-								<view>电量：{{ item.battery || '0' }}%</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="editInfmation">
-				<button class="login-btn qz" @click="forceAlarm">强制报警</button>
-				<button class="login-btn jc" @click="cancelAlarm">解除报警</button>
-			</view>
-		</scroll-view>
-		<!-- 强制报警提示弹框 -->
-		<CustomPopup v-if="popupType === 'force'" :show="showPopupFlag" popupBorder="1rpx solid rgba(224, 52, 52, 0.3)"
-			:message="popupMessage" icon="/static/images/6170/bj.png" :confirm-text="popupConfirmText"
-			:show-cancel="false" @close="onclosePopup" @confirm="onPopupConfirm" confirmBtnBg="rgba(224, 52, 52, 1)"
-			confirmBtnColor="#fff" />
-		<!-- 解除报警 -->
-		<CustomPopup v-if="popupType === 'cancel'" :show="showPopupFlag" popupBorder="1rpx solid rgba(224, 52, 52, 0.3)"
-			:message="popupMessage" icon="/static/images/6170/svg.png" :confirm-text="popupConfirmText"
-			:show-cancel="false" @close="onclosePopup" @confirm="onPopupConfirm" confirmBtnBg="rgba(224, 52, 52, 1)"
-			confirmBtnColor="#fff" />
-	</view>
-</template>
-
-<script>
-	import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
-	import {
-		generateShortId,
-		getdeviceSTatus
-	} from '@/utils/function.js';
-	import {
-		deviceInfo,
-	} from '@/api/common/index.js'
-	// 1. 导入所有需要的报警接口
-	import {
-		deviceSendAlarmMessage, //6170对应类型接口
-		deviceDefaultAlarm
-	} from '@/api/6170/callPolice.js'
-	import {
-		deviceForceAlarmActivation
-	} from '@/api/100J/HBY100-J.js'
-	// BJQ100J 对应的接口
-	import {
-		deviceRealTimeStatus //设备状态
-	} from '@/api/6170/deviceControl.js'
-
-	export default {
-		components: {
-			CustomPopup
-		},
-		data() {
-			return {
-				deviceList: [],
-				showPopupFlag: false,
-				popupTitle: '',
-				popupMessage: '确认要对所选设备开启强制报警?',
-				popupConfirmText: '确认',
-				popupType: 'force', // 'force' or 'cancel'
-				pendingAlarmAction: '',
-				sendInfo: '',
-				// 2. 核心：typeName 与接口的映射表
-				alarmApiMapping: {
-					'HBY100-J': { //100J类型
-						sendApi: deviceForceAlarmActivation,
-						statusTypeName: 'FunctionAccessBatchStatusRule_BJQ100J'
-					},
-					'BJQ6170': { //6170类型
-						sendApi: deviceSendAlarmMessage,
-						statusTypeName: 'FunctionAccessBatchStatusRule_BJQ200J'
-					}
-				},
-				loading: false,
-				total: 0
-			}
-		},
-		computed: {
-			selectedDeviceIds() {
-				return this.deviceList.filter(item => item.checked).map(item => item.id);
-			},
-			// 自动匹配当前typeName对应的接口配置
-			currentApiConfig() {
-				const currentTypeName = this.sendInfo.typeName || '';
-				// 匹配到则用对应配置，匹配不到用默认配置
-				return this.alarmApiMapping[currentTypeName] || {
-					sendApi: deviceDefaultAlarm,
-					statusTypeName: 'FunctionAccessBatchStatusRule_Default'
-				};
-			}
-		},
-		methods: {
-			onclosePopup() {
-				this.showPopupFlag = false
-			},
-			toggleSelect(index) {
-				this.deviceList[index].checked = !this.deviceList[index].checked
-				this.$forceUpdate()
-			},
-			// 全选/取消全选
-			selectAll() {
-				console.log('123');
-				// 仅对在线设备进行全选/取消
-				const allSelected = this.deviceList.every(item => item.onlineStatus === 1 && item.checked);
-				this.deviceList.forEach(item => {
-					// 离线设备不修改checked状态
-					if (item.onlineStatus === 1) {
-						item.checked = !allSelected;
-					}
-				});
-				this.$forceUpdate();
-			},
-			// 获取设备列表
-			getData(deviceType) {
-				console.log(deviceType, 'deviceTypedeviceType');
-				this.loading = true;
-				let data = {
-					pageNum: 1,
-					pageSize: 50,
-					deviceType: deviceType
-				}
-				deviceInfo(data).then((res) => {
-					if (res.code == 200) {
-						const newDevices = res.rows.map(device => ({
-							...device,
-							showConfirm: false,
-							checked: false
-						}));
-						this.total = res.total;
-						this.deviceList = newDevices
-					}
-				}).finally(() => {
-					this.loading = false;
-				});
-			},
-			// 强制报警
-			forceAlarm() {
-				const selectedDevices = this.deviceList.filter(item => item.checked)
-				if (selectedDevices.length === 0) {
-					uni.showToast({
-						title: '请选择一个在线设备',
-						icon: 'none'
-					});
-					return;
-				}
-				this.popupType = 'force';
-				this.popupMessage = '确认要对所选设备开启强制报警?';
-				this.showPopupFlag = true;
-				this.pendingAlarmAction = 1
-			},
-			// 解除报警
-			cancelAlarm() {
-				const selectedDevices = this.deviceList.filter(item => item.checked);
-				if (selectedDevices.length === 0) {
-					uni.showToast({
-						title: '请选择一个在线设备',
-						icon: 'none'
-					});
-					return;
-				}
-				this.popupType = 'cancel';
-				this.popupMessage = '确认要解除所选设备的报警状态?';
-				this.showPopupFlag = true;
-				this.pendingAlarmAction = 0
-			},
-			//动态调用对应接口
-			async sendAlarmCommand() {
-				const selectedDevices = this.deviceList.filter(item => item.checked);
-				const deviceIds = selectedDevices.map(item => item.id);
-				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
-				const isAlarming = this.pendingAlarmAction == 1;
-				if (selectedDevices.length === 0) {
-					uni.showToast({
-						title: '请选择在线设备',
-						icon: 'none'
-					});
-					return;
-				}
-				try {
-					uni.showLoading({
-						title: isAlarming ? '设备报警中...' : '解除报警中...',
-						mask: true
-					});
-					// 获取当前typeName对应的接口和参数配置
-					const {
-						sendApi,
-						statusTypeName
-					} = this.currentApiConfig;
-					// 准备请求数据
-					// const batchId = generateShortId();
-					const requestData = {
-						deviceIds: deviceIds,   
-						typeName: this.sendInfo.typeName,
-						deviceImeiList: deviceImeiList,
-						// batchId: batchId,
-						voiceStrobeAlarm: this.pendingAlarmAction == 1 ? '1' : '0'
-					};
-					// 动态调用匹配的接口
-					const registerRes = await sendApi(requestData);
-					if (registerRes.code == 200) {
-						uni.showToast({
-							title: isAlarming ? '强制报警开启成功' : '报警已解除',
-							icon: 'success'
-						});
-						this.showPopupFlag = false
-						uni.$emit('deviceStatusUpdate', {});
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 500)
-					} else {
-						uni.showToast({
-							title: registerRes.msg || '状态查询失败',
-							icon: 'none'
-						});
-					}
-
-				} catch (error) {
-					console.error('报警操作异常：', error);
-					uni.showToast({
-						title: '网络异常，请重试',
-						icon: 'none'
-					});
-				} finally {
-					uni.hideLoading();
-				}
-			},
-			// 点击确认状态
-			onPopupConfirm() {
-				this.sendAlarmCommand(this.popupType);
-			},
-		},
-		onLoad(options) {
-			const eventChannel = this.getOpenerEventChannel();
-			// 监听 'deviceSend' 事件，获取传过来的数据
-			eventChannel.on('devicePolice', (data) => {
-				this.getData(data.data.id)
-				this.sendInfo = data.data
-			});
-			eventChannel.emit('ack', {})
-		},
-	}
-</script>
-
-<style scoped>
-	.container {
-		min-height: 100vh;
-		background-color: rgb(18, 18, 18);
-		box-sizing: border-box;
-		overflow-x: hidden;
-
-	}
-
-	.allSelect {
-		color: rgba(255, 255, 255, 0.87);
-		float: right;
-		padding: 25rpx;
-		cursor: pointer;
-	}
-
-	.device-list {
-		flex: 1;
-		padding: 0rpx 20rpx;
-		clear: both;
-	}
-
-	.device-card {
-		position: relative;
-		display: flex;
-		align-items: center;
-		width: 95%;
-		margin-bottom: 20rpx;
-	}
-
-	.checkbox {
-		width: 40rpx;
-		height: 40rpx;
-		border: 2rpx solid rgba(255, 255, 255, 0.5);
-		margin-right: 20rpx;
-		border-radius: 4rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.checkbox.checked {
-		background: rgba(224, 52, 52, 1);
-		border-color: rgba(224, 52, 52, 1);
-	}
-
-	.device-content {
-		background-color: rgb(26, 26, 26);
-		border-radius: 16rpx;
-		position: relative;
-		/* display: flex; */
-		align-items: center;
-		padding: 20rpx;
-		width: 95%;
-	}
-
-	.device-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 15rpx;
-	}
-
-	.device-name {
-		font-size: 32rpx;
-		color: rgba(255, 255, 255, 0.87);
-		margin-left: 12rpx;
-		line-height: 50rpx;
-		width: 83%;
-		white-space: nowrap;
-	}
-
-	.ID {
-		color: rgba(255, 255, 255, 0.6);
-		font-size: 26rpx;
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-	}
-
-	.device-status {
-		width: 122rpx;
-		height: 52rpx;
-		font-size: 26rpx;
-		border-radius: 0px 8px 0px 8px;
-		background-color: rgb(42, 42, 42);
-		position: absolute;
-		top: 0rpx;
-		right: 0rpx;
-		text-align: center;
-		line-height: 52rpx;
-	}
-
-	.online {
-		color: rgb(187, 230, 0);
-	}
-
-	.unline {
-		color: rgba(255, 255, 255, 0.4);
-	}
-
-	.device-info {
-		display: flex;
-		justify-content: space-evenly;
-		font-size: 26rpx;
-		color: rgba(255, 255, 255, 0.87);
-		padding-top: 10rpx;
-		position: relative;
-	}
-
-	.deviceIMG {
-		width: 100rpx;
-		height: 100rpx;
-		border-radius: 16rpx;
-		position: relative;
-		background-color: rgba(42, 42, 42, 0.6);
-		display: flex;
-		align-items: center;
-	}
-
-	.IMG {
-		width: 68rpx;
-		height: 50rpx;
-		margin-left: 17%;
-	}
-
-	.onlines {
-		position: relative;
-	}
-
-	.onlines::before {
-		content: '';
-		position: absolute;
-		width: 15rpx;
-		height: 15rpx;
-		background: rgb(0, 171, 103);
-		border-radius: 50%;
-		top: 20rpx;
-		left: -20rpx
-	}
-
-	.unlines {
-		position: relative;
-	}
-
-	.unlines::before {
-		content: '';
-		position: absolute;
-		width: 15rpx;
-		height: 15rpx;
-		background: rgba(255, 255, 255, 0.4);
-		border-radius: 50%;
-		top: 20rpx;
-		left: -20rpx
-	}
-
-	.line {
-		width: 2rpx;
-		height: 24rpx;
-		background: linear-gradient(90deg,
-				rgba(0, 0, 0, 0) 0%,
-				rgb(255, 255, 255) 50%,
-				rgba(255, 255, 255, 0) 100%);
-		margin-top: 12rpx;
-	}
-
-	.ql-editor {
-		color: rgba(255, 255, 255, 0.6);
-		font-size: 30rpx;
-	}
-
-	.ql-input {
-		width: 95.9%;
-		height: 200rpx;
-		margin-top: 30rpx;
-		box-sizing: border-box;
-		padding: 30rpx;
-		border-radius: 16rpx;
-		background: rgb(26, 26, 26);
-	}
-
-	.textarea {
-		color: rgba(255, 255, 255, 0.8);
-		background: rgba(42, 42, 42, 1);
-		border-radius: 16rpx;
-		padding: 10rpx;
-		height: 150rpx;
-	}
-
-	.editInfmation {
-		display: flex;
-		padding: 20rpx;
-		border-radius: 40rpx 40rpx 0px 0px;
-		width: 96%;
-		position: fixed;
-		bottom: 50rpx;
-		box-sizing: border-box;
-
-	}
-
-	.login-btn {
-		margin-top: 30rpx;
-		color: rgb(35, 35, 35);
-		border-radius: 50rpx;
-		width: 40%;
-		color: #fff;
-		height: 88rpx;
-		font-size: 30rpx;
-		line-height: 88rpx;
-	}
-
-	.qz {
-		background: rgba(224, 52, 52, 1);
-	}
-
-	.jc {
-		border: 1px solid rgba(255, 255, 255, 0.87);
-		background: rgba(18, 18, 18, 1);
-	}
-
-	.checkbox.disabled {
-		opacity: 0.5;
-		background-color: rgba(255, 255, 255, 0.1) !important;
-		border-color: rgba(255, 255, 255, 0.2) !important;
-		pointer-events: none;
-		/* 阻止点击事件 */
-	}
-
-	/* 可选：离线设备的卡片整体置灰 */
-	.device-card[data-offline="true"] {
-		opacity: 0.6;
-	}
+<template>
+	<view class="container">
+		<!-- 设备列表 -->
+		<view class="allSelect" @click="selectAll"> 全选</view>
+		<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
+			:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
+
+			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
+				<!-- 复选框 -->
+				<view class="checkbox" :class="{ checked: item.checked }">
+					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
+				</view>
+				<!-- 设备信息 -->
+				<view class="device-content">
+					<view class="device-header">
+						<view class="deviceIMG">
+							<image :src="item.devicePic" class="IMG" mode="aspectFit"></image>
+						</view>
+						<view class="device-name">
+							<view>设备:{{ item.deviceName }}</view>
+							<view class="ID">
+								<view class="ID">ID:{{ item.deviceImei }}</view>
+								<view class="onlines" v-if="item.onlineStatus == 1">在线</view>
+								<!-- 离线状态 -->
+								<view class="unlines" v-if="item.onlineStatus == 0">离线</view>
+								<view>电量：{{ item.battery || '0' }}%</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</mescroll-uni>
+		<view class="editInfmation">
+			<button class="login-btn qz" @click="forceAlarm">强制报警</button>
+			<button class="login-btn jc" @click="cancelAlarm">解除报警</button>
+		</view>
+
+		<!-- 强制报警提示弹框 -->
+		<CustomPopup v-if="popupType === 'force'" :show="showPopupFlag" popupBorder="1rpx solid rgba(224, 52, 52, 0.3)"
+			:message="popupMessage" icon="/static/images/6170/bj.png" :confirm-text="popupConfirmText"
+			:show-cancel="false" @close="onclosePopup" @confirm="onPopupConfirm" confirmBtnBg="rgba(224, 52, 52, 1)"
+			confirmBtnColor="#fff" />
+		<!-- 解除报警 -->
+		<CustomPopup v-if="popupType === 'cancel'" :show="showPopupFlag" popupBorder="1rpx solid rgba(224, 52, 52, 0.3)"
+			:message="popupMessage" icon="/static/images/6170/svg.png" :confirm-text="popupConfirmText"
+			:show-cancel="false" @close="onclosePopup" @confirm="onPopupConfirm" confirmBtnBg="rgba(224, 52, 52, 1)"
+			confirmBtnColor="#fff" />
+	</view>
+</template>
+
+<script>
+	import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
+	import {
+		generateShortId,
+		getdeviceSTatus
+	} from '@/utils/function.js';
+	import {
+		deviceInfo,
+	} from '@/api/common/index.js'
+	// 1. 导入所有需要的报警接口
+	import {
+		deviceSendAlarmMessage, //6170对应类型接口
+		deviceDefaultAlarm
+	} from '@/api/6170/callPolice.js'
+	import {
+		deviceForceAlarmActivation
+	} from '@/api/100J/HBY100-J.js'
+	// BJQ100J 对应的接口
+	import {
+		deviceRealTimeStatus //设备状态
+	} from '@/api/6170/deviceControl.js'
+
+	import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue';
+
+	import MqTool from '@/utils/MqHelper.js';
+	var timeout = null;
+	var these = null;
+	var mq=null;
+	export default {
+		components: {
+			CustomPopup,
+			MescrollUni
+		},
+		data() {
+			return {
+				deviceList: [],
+				showPopupFlag: false,
+				popupTitle: '',
+				popupMessage: '确认要对所选设备开启强制报警?',
+				popupConfirmText: '确认',
+				popupType: 'force', // 'force' or 'cancel'
+				pendingAlarmAction: '',
+				sendInfo: '',
+				// 2. 核心：typeName 与接口的映射表
+				dic: {
+					alarmApiMapping: [{
+							type: ['HBY100-J'],
+							sendApi: deviceForceAlarmActivation,
+							statusTypeName: 'FunctionAccessBatchStatusRule_BJQ100J',
+							sendType: 'FYSSend'
+						},
+						{
+							type: ['BJQ6170'],
+							sendApi: deviceSendAlarmMessage,
+							statusTypeName: 'FunctionAccessBatchStatusRule_BJQ200J',
+							sendType: 'FYSSend'
+						},
+
+						{
+							type: ['BJQ6075J'],
+							sendApi: deviceSendAlarmMessage,
+							statusTypeName: '',
+							sendType: 'CommonSend'
+						},
+						{
+							type: ['HBY670'],
+							sendApi: deviceSendAlarmMessage,
+							statusTypeName: '',
+							sendType: 'XSSend'
+						}
+					]
+				},
+				loading: false,
+				total: 0,
+				mescroll: null,
+				downOption: {
+					auto: true,
+					autoShowLoading: false,
+				},
+				upOption: {
+					auto: false,
+					noMoreSize: 0,
+					offset: 50,
+					isLock: false,
+					empty: {
+						tip: '暂无数据',
+						hideScroll: false
+					},
+					textNoMore: '没有更多数据了'
+				},
+				mescrollHeight: 0
+			}
+		},
+		computed: {
+			selectedDeviceIds() {
+				return this.deviceList.filter(item => item.checked).map(item => item.id);
+			},
+			// 自动匹配当前typeName对应的接口配置
+			currentApiConfig() {
+				const currentTypeName = this.sendInfo.typeName || '';
+				// 匹配到则用对应配置，匹配不到用默认配置
+				let f = this.dic.alarmApiMapping.find(v => {
+					return v.type.indexOf(currentTypeName) > -1;
+				});
+				if (f) {
+					return f;
+				} else {
+					return {
+						sendApi: deviceDefaultAlarm,
+						statusTypeName: 'FunctionAccessBatchStatusRule_Default',
+						sendType:'FYSSend'
+					};
+				}
+
+
+			}
+		},
+		methods: {
+			getSystemInfoSyncH() {
+
+				let sysInfo = uni.getSystemInfoSync();
+
+				// 底部 footer 高度约 220rpx + 120rpx = 340rpx，转换为 px（1rpx = sysInfo.pixelRatio / 750 * 屏幕宽度？不，直接用 rpx 转 px 公式）
+				let footerHeight = 340 * (sysInfo.screenWidth / 750); // rpx 转 px
+
+				// console.log("footerHeight=", footerHeight);
+				this.mescrollHeight = sysInfo.screenHeight - footerHeight;
+				// console.log("mescrollHeight=", this.mescrollHeight);
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			// 下拉刷新
+			downCallback() {
+
+
+				if (this.mescroll) {
+					this.mescroll.resetUpScroll(false);
+					this.mescroll.scrollTo(0, 0);
+				}
+				this.getData(this.sendInfo.id);
+
+
+			},
+			// 上拉加载 
+			upCallback() {
+				this.getData(this.sendInfo.id);
+			},
+			onclosePopup() {
+				this.showPopupFlag = false
+			},
+			toggleSelect(index) {
+				this.deviceList[index].checked = !this.deviceList[index].checked
+				this.$forceUpdate()
+			},
+			// 全选/取消全选
+			selectAll() {
+				console.log('123');
+				// 仅对在线设备进行全选/取消
+				const allSelected = this.deviceList.every(item => item.checked);
+				this.deviceList.forEach(item => {
+					// 离线设备不修改checked状态
+
+					item.checked = !allSelected;
+
+				});
+				this.$forceUpdate();
+			},
+			// 获取设备列表
+			getData(deviceType) {
+				clearTimeout(timeout);
+				timeout = setTimeout(() => {
+					console.log(deviceType, 'deviceTypedeviceType');
+					this.loading = true;
+					let data = {
+						pageNum: this.mescroll?this.mescroll.num:1,
+						pageSize: 50,
+						deviceType: deviceType
+					}
+					deviceInfo(data).then((res) => {
+						if (res.code == 200) {
+							const newDevices = res.rows.map(device => ({
+								...device,
+								showConfirm: false,
+								checked: false
+							}));
+							this.total = res.total;
+							
+							if(data.pageNum===1){
+							this.deviceList = newDevices;	
+							}else{
+								this.deviceList =this.deviceList.concat(newDevices);
+							}
+							
+							
+							let hasNext = true;
+							if (res.rows.length < data.pageSize || this.deviceList.length >= this.total) {
+								hasNext = false;
+							} else {
+								hasNext = true;
+							}
+							this.mescroll.endSuccess(res.rows.length, hasNext);
+
+						} else {
+							this.mescroll.endSuccess(0, false);
+						}
+					}).finally(() => {
+						this.loading = false;
+					}).catch(ex => {
+						this.mescroll.endSuccess(0, false);
+					});
+
+				}, 200);
+
+			},
+			// 强制报警
+			forceAlarm() {
+				const selectedDevices = this.deviceList.filter(item => item.checked)
+				if (selectedDevices.length === 0) {
+					uni.showToast({
+						title: '请选择一个在线设备',
+						icon: 'none'
+					});
+					return;
+				}
+				this.popupType = 'force';
+				this.popupMessage = '确认要对所选设备开启强制报警?';
+				this.showPopupFlag = true;
+				this.pendingAlarmAction = 1
+			},
+			// 解除报警
+			cancelAlarm() {
+				const selectedDevices = this.deviceList.filter(item => item.checked);
+				if (selectedDevices.length === 0) {
+					uni.showToast({
+						title: '请选择一个在线设备',
+						icon: 'none'
+					});
+					return;
+				}
+				this.popupType = 'cancel';
+				this.popupMessage = '确认要解除所选设备的报警状态?';
+				this.showPopupFlag = true;
+				this.pendingAlarmAction = 0
+			},
+			//动态调用对应接口
+			sendAlarmCommand() {
+				const selectedDevices = this.deviceList.filter(item => item.checked);
+				const deviceIds = selectedDevices.map(item => item.id);
+				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
+				const isAlarming = this.pendingAlarmAction == 1;
+				if (selectedDevices.length === 0) {
+					uni.showToast({
+						title: '请选择在线设备',
+						icon: 'none'
+					});
+					return;
+				}
+				try {
+					uni.showLoading({
+						title: isAlarming ? '设备报警中...' : '解除报警中...',
+						mask: true
+					});
+					// 获取当前typeName对应的接口和参数配置
+					const {
+						sendApi,
+						statusTypeName,
+						sendType
+					} = this.currentApiConfig;
+
+					//FYS的方法
+					let FYSSend = async () => {
+						const requestData = {
+							deviceIds: deviceIds,
+							typeName: this.sendInfo.typeName,
+							deviceImeiList: deviceImeiList,
+							// batchId: batchId,
+							voiceStrobeAlarm: this.pendingAlarmAction == 1 ? '1' : '0'
+						};
+						// 动态调用匹配的接口
+						const registerRes = await sendApi(requestData);
+						if (registerRes.code == 200) {
+							uni.showToast({
+								title: isAlarming ? '强制报警开启成功' : '报警已解除',
+								icon: 'success'
+							});
+							this.showPopupFlag = false
+							uni.$emit('deviceStatusUpdate', {});
+							setTimeout(() => {
+								uni.navigateBack()
+							}, 500)
+						} else {
+							uni.showToast({
+								title: registerRes.msg || '状态查询失败',
+								icon: 'none'
+							});
+						}
+					}
+					//XS的方法
+					let XSSend = () => {
+						let json=JSON.stringify({ins_SOSGrade:[1]});
+						for (let i = 0; i < deviceImeiList.length; i++) {
+							let imei = deviceImeiList[i];
+							
+							mq.sendData("B/"+imei,json,false);
+						}
+						
+						uni.showToast({
+							title: isAlarming ? '强制报警开启成功' : '报警已解除',
+							icon: 'success'
+						});
+						this.showPopupFlag = false
+					}
+					//统一通信协议方法
+					let CommonSend = () => {
+						let json=JSON.stringify({ins_ShakeBit:1});
+						for (let i = 0; i < deviceImeiList.length; i++) {
+							let imei = deviceImeiList[i];
+							mq.sendData("B/"+imei,json,false);
+						}
+						
+						uni.showToast({
+							title: isAlarming ? '强制报警开启成功' : '报警已解除',
+							icon: 'success'
+						});
+						this.showPopupFlag = false
+					}
+					
+					switch (sendType) {
+						case "FYSSend":
+							FYSSend();
+							break;
+						case "XSSend":
+							XSSend();
+							break;
+						case "CommonSend":
+							CommonSend();
+							break;
+					}
+
+				} catch (error) {
+					console.error('报警操作异常：', error);
+					uni.showToast({
+						title: '网络异常，请重试',
+						icon: 'none'
+					});
+				} finally {
+					uni.hideLoading();
+				}
+			},
+			// 点击确认状态
+			onPopupConfirm() {
+				this.sendAlarmCommand(this.popupType);
+			},
+		},
+		onUnload() {
+			if(mq){
+				mq.disconnect();
+			}
+		},
+		onLoad(options) {
+			these = this;
+			mq=MqTool.getMqTool();
+			if(mq){
+				mq.init();
+				
+			}
+			const eventChannel = this.getOpenerEventChannel();
+			// 监听 'deviceSend' 事件，获取传过来的数据
+			eventChannel.on('devicePolice', (data) => {
+				this.getData(data.data.id)
+				this.sendInfo = data.data
+			});
+			eventChannel.emit('ack', {});
+			this.getSystemInfoSyncH();
+		},
+	}
+</script>
+
+<style scoped>
+	.container {
+		min-height: 100vh;
+		background-color: rgb(18, 18, 18);
+		box-sizing: border-box;
+		overflow-x: hidden;
+
+	}
+
+	.allSelect {
+		color: rgba(255, 255, 255, 0.87);
+		float: right;
+		padding: 25rpx;
+		cursor: pointer;
+	}
+
+	.device-list {
+		flex: 1;
+		padding: 0rpx 20rpx;
+		clear: both;
+	}
+
+	.device-card {
+		position: relative;
+		display: flex;
+		align-items: center;
+		width: 95%;
+		margin-bottom: 20rpx;
+	}
+
+	.checkbox {
+		width: 40rpx;
+		height: 40rpx;
+		border: 2rpx solid rgba(255, 255, 255, 0.5);
+		margin-right: 20rpx;
+		border-radius: 4rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.checkbox.checked {
+		background: rgba(224, 52, 52, 1);
+		border-color: rgba(224, 52, 52, 1);
+	}
+
+	.device-content {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		position: relative;
+		/* display: flex; */
+		align-items: center;
+		padding: 20rpx;
+		width: 95%;
+	}
+
+	.device-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 15rpx;
+	}
+
+	.device-name {
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+		margin-left: 12rpx;
+		line-height: 50rpx;
+		width: 83%;
+		white-space: nowrap;
+	}
+
+	.ID {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+	}
+
+	.device-status {
+		width: 122rpx;
+		height: 52rpx;
+		font-size: 26rpx;
+		border-radius: 0px 8px 0px 8px;
+		background-color: rgb(42, 42, 42);
+		position: absolute;
+		top: 0rpx;
+		right: 0rpx;
+		text-align: center;
+		line-height: 52rpx;
+	}
+
+	.online {
+		color: rgb(187, 230, 0);
+	}
+
+	.unline {
+		color: rgba(255, 255, 255, 0.4);
+	}
+
+	.device-info {
+		display: flex;
+		justify-content: space-evenly;
+		font-size: 26rpx;
+		color: rgba(255, 255, 255, 0.87);
+		padding-top: 10rpx;
+		position: relative;
+	}
+
+	.deviceIMG {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 16rpx;
+		position: relative;
+		background-color: rgba(42, 42, 42, 0.6);
+		display: flex;
+		align-items: center;
+	}
+
+	.IMG {
+		width: 68rpx;
+		height: 50rpx;
+		margin-left: 17%;
+	}
+
+	.onlines {
+		position: relative;
+	}
+
+	.onlines::before {
+		content: '';
+		position: absolute;
+		width: 15rpx;
+		height: 15rpx;
+		background: rgb(0, 171, 103);
+		border-radius: 50%;
+		top: 20rpx;
+		left: -20rpx
+	}
+
+	.unlines {
+		position: relative;
+	}
+
+	.unlines::before {
+		content: '';
+		position: absolute;
+		width: 15rpx;
+		height: 15rpx;
+		background: rgba(255, 255, 255, 0.4);
+		border-radius: 50%;
+		top: 20rpx;
+		left: -20rpx
+	}
+
+	.line {
+		width: 2rpx;
+		height: 24rpx;
+		background: linear-gradient(90deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgb(255, 255, 255) 50%,
+				rgba(255, 255, 255, 0) 100%);
+		margin-top: 12rpx;
+	}
+
+	.ql-editor {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 30rpx;
+	}
+
+	.ql-input {
+		width: 95.9%;
+		height: 200rpx;
+		margin-top: 30rpx;
+		box-sizing: border-box;
+		padding: 30rpx;
+		border-radius: 16rpx;
+		background: rgb(26, 26, 26);
+	}
+
+	.textarea {
+		color: rgba(255, 255, 255, 0.8);
+		background: rgba(42, 42, 42, 1);
+		border-radius: 16rpx;
+		padding: 10rpx;
+		height: 150rpx;
+	}
+
+	.editInfmation {
+		display: flex;
+		padding: 20rpx;
+		border-radius: 40rpx 40rpx 0px 0px;
+		width: 96%;
+		position: fixed;
+		bottom: 50rpx;
+		box-sizing: border-box;
+
+	}
+
+	.login-btn {
+		margin-top: 30rpx;
+		color: rgb(35, 35, 35);
+		border-radius: 50rpx;
+		width: 40%;
+		color: #fff;
+		height: 88rpx;
+		font-size: 30rpx;
+		line-height: 88rpx;
+	}
+
+	.qz {
+		background: rgba(224, 52, 52, 1);
+	}
+
+	.jc {
+		border: 1px solid rgba(255, 255, 255, 0.87);
+		background: rgba(18, 18, 18, 1);
+	}
+
+	.checkbox.disabled {
+		opacity: 0.5;
+		background-color: rgba(255, 255, 255, 0.1) !important;
+		border-color: rgba(255, 255, 255, 0.2) !important;
+		pointer-events: none;
+		/* 阻止点击事件 */
+	}
+
+	/* 可选：离线设备的卡片整体置灰 */
+	.device-card[data-offline="true"] {
+		opacity: 0.6;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index e706aba..d384bde 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -18,13 +18,16 @@
 					<image src="/static/images/common/more.png" mode="aspectFit" class="more"></image>
 				</view>
 			</view>
-		<!-- 	<view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
-				<view class="callpolice" @click="callpolice">报警</view>
-				<view class="Sendmessage" @click="location">位置</view>
-				<view class="Sendmessage" @click="handleSend" v-if="activeTabInfo.typeName!=='HBY100-J'">发送信息</view>
-			</view> -->
-			<!-- <scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100" style="height:80vh;"> -->
-			<mescroll-uni class="device-list"  @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
+			<view class="sendFlex"
+			v-show="showSendFlex"
+				>
+				<view class="callpolice" @click="callpolice" v-show="showWarn">报警</view>
+				<view class="Sendmessage" @click="location" v-show="showMap">位置</view>
+				<view class="Sendmessage" @click="handleSend"
+					v-show="ShowSendmessage">发送信息</view>
+			</view>
+
+			<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
 				:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
 				<view v-if="deviceList.length>0">
 					<uni-swipe-action ref="swipeAction">
@@ -40,15 +43,15 @@
 										<view class="device-name">
 											<view>设备:{{item.deviceName}}</view>
 											<view class="ID">
-												<view class="ID" v-if="item.communicationMode==0 || item.communicationMode==2">ID:{{item.deviceImei}}
+												<view class="ID"
+													v-if="item.communicationMode==0 || item.communicationMode==2">
+													ID:{{item.deviceImei}}
 												</view>
 												<view class="ID" v-else>ID:{{item.deviceMac}}</view>
 												<!-- 在线状态 -->
-												<view class="onlines"
-													v-if="item.onlineStatus==1">在线</view>
+												<view class="onlines" v-if="item.onlineStatus==1">在线</view>
 												<!-- 离线状态 -->
-												<view class="offlines"
-													v-if="item.onlineStatus==0">离线</view>
+												<view class="offlines" v-if="item.onlineStatus==0">离线</view>
 												<view>电量：{{item.battery || '0'}}%</view>
 											</view>
 										</view>
@@ -74,7 +77,7 @@
 					暂无数据
 				</view> -->
 			</mescroll-uni>
-			<!-- </scroll-view> -->
+
 		</view>
 		<!-- 删除弹框 -->
 		<view class="agreement-mask" v-if="deleteShow" @click.stop="closePopup('delete')" catchtouchmove="true">
@@ -116,7 +119,7 @@
 			<view class="tooltip-content" @click.stop>
 				<view class="tooltip-item" v-for="(item, index) in menuItems" :key="index"
 					@click="handleMenuClick(item)">
-					<image :src="item.icon" class="item-icon"  mode="aspectFit"/>
+					<image :src="item.icon" class="item-icon" mode="aspectFit" />
 					<text>{{ item.text }}</text>
 				</view>
 			</view>
@@ -146,17 +149,34 @@
 	} from '@/api/common/index.js'
 	import bleTool from '@/utils/BleHelper.js';
 	import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue'
-import BleReceive from '@/utils/BleReceive';
+	import BleReceive from '@/utils/BleReceive';
 
 	var pagePath = 'pages/common/index';
 	var ble = null;
 	var timeout = null;
-	var recei=null;
+	var recei = null;
 	export default {
 		components: {
 			MescrollUni
 		},
-
+		computed:{
+			showSendFlex(){
+				// return this.activeTab && this.activeTab.id !== ''&& (this.activeTabInfo.communicationMode==0 || this.activeTabInfo.communicationMode==2);
+				if(this.showMap || this.ShowSendmessage || this.showWarn){
+					return true;
+				}
+				return false;
+			},
+			ShowSendmessage(){
+				return  this.dic.showMsgTypes.indexOf(this.activeTabInfo.typeName)>-1
+			},
+			showMap(){
+				return  this.dic.showMapTypes.indexOf(this.activeTabInfo.typeName)>-1
+			},
+			showWarn(){
+				return  this.dic.showCallPolice.indexOf(this.activeTabInfo.typeName)>-1
+			}
+		},
 		data() {
 			return {
 				mescroll: null,
@@ -232,7 +252,12 @@ import BleReceive from '@/utils/BleReceive';
 
 				deviceId: '',
 				deviceName: "", //重命名
-				activeTabInfo: ''
+				activeTabInfo: '',
+				dic: {
+					showMsgTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'BJQ6075J'],//需要发送消息的类型
+					showMapTypes:['BJQ6170','HBY210','HBY670','BJQ6075','HBY018A','HBY100-J','BJQ6075J','HBY008A','HBY100-Y'],//需要显示地图的类型
+					showCallPolice:['BJQ6170','HBY210','HBY670','BJQ6075','HBY018A','HBY100-J','BJQ6075J','HBY008A','HBY100-Y']//需要发送报警的类型
+				}
 			}
 		},
 		methods: {
@@ -253,7 +278,7 @@ import BleReceive from '@/utils/BleReceive';
 			// 下拉刷新
 			downCallback() {
 
-			
+
 				if (this.mescroll) {
 					this.mescroll.resetUpScroll(false);
 					this.mescroll.scrollTo(0, 0);
@@ -265,7 +290,7 @@ import BleReceive from '@/utils/BleReceive';
 			// 上拉加载 
 			upCallback() {
 
-			
+
 
 				this.getData();
 			},
@@ -386,7 +411,7 @@ import BleReceive from '@/utils/BleReceive';
 					if (res.code == 200) {
 						//console.log("deviceTypeList=" + JSON.stringify(res.data));
 						this.tabs = [{
-								id: '',         
+								id: '',
 								name: '全部设备',
 								typeName: '全部设备'
 							},
@@ -411,7 +436,7 @@ import BleReceive from '@/utils/BleReceive';
 			getData() {
 
 				var task = () => {
-				
+
 					return new Promise((resolve, reject) => {
 						let data = {
 							pageNum: this.mescroll.num,
@@ -495,9 +520,9 @@ import BleReceive from '@/utils/BleReceive';
 					case 'scan':
 						// 扫一扫
 						uni.navigateTo({
-							url:'/pages/common/addScan/ScanEquip'
+							url: '/pages/common/addScan/ScanEquip'
 						});
-						
+
 						break;
 					case 'bluetooth':
 						uni.navigateTo({
@@ -618,7 +643,7 @@ import BleReceive from '@/utils/BleReceive';
 				const deviceType = currentTab.id || '';
 				console.log(`跳转到发送信息页面\n当前设备类型: ${deviceType}\n设备类型名称: ${currentTab.typeName}`);
 				uni.navigateTo({
-					url: '/pages/6170/callPolice/index',
+					url: '/pages/common/callPolice/index',
 					events: {
 						ack: function(data) {}
 					},
@@ -665,7 +690,7 @@ import BleReceive from '@/utils/BleReceive';
 			// 列表跳转
 			handleFile(item) {
 				let url = item.detailPageUrl;
-				// console.log("url=",url);
+				// url="/pages/6075/BJQ6075L";
 				// if(!url){
 				// url="/pages/6075/BJQ6075"
 				// }
@@ -714,7 +739,7 @@ import BleReceive from '@/utils/BleReceive';
 			},
 		},
 		onShow() {
-			
+
 			if (ble) {
 				//因为vue视图只能后退不能隐藏后再显示
 				//所以回到首页后将其他所有页面的订阅都删除
@@ -722,12 +747,12 @@ import BleReceive from '@/utils/BleReceive';
 			}
 		},
 		onLoad() {
-			
+
 			// console.error("首页加载");
 			this.getTab()
 			this.downCallback();
-			
-			
+
+
 			// 绑定页面做了监听,新增成功,刷新页面
 			uni.$on('refreshDeviceList', () => {
 				this.getTab() // 刷新数据
@@ -770,9 +795,9 @@ import BleReceive from '@/utils/BleReceive';
 				recei.ReceiveData(receive, device, path, recArr);
 				this.updateBleStatu();
 			}, pagePath);
-			
-			let phone=uni.getStorageSync("phone");
-			if(phone==='17671332251'){//先写死方便自己使用，后面按人员权限区分
+
+			let phone = uni.getStorageSync("phone");
+			if (phone === '17671332251') { //先写死方便自己使用，后面按人员权限区分
 				this.menuItems.push({
 					text: '上报设备',
 					icon: '/static/images/common/add.png',
diff --git a/pages/common/privacyAgreement/index.vue b/pages/common/privacyAgreement/index.vue
index 0cd534f..7c27108 100644
--- a/pages/common/privacyAgreement/index.vue
+++ b/pages/common/privacyAgreement/index.vue
@@ -2,7 +2,10 @@
 	<view class="device-page">
 		<view class="title">星汉物联App联隐私政策</view>
 		<view class="smalltitle">
-			更新日期：2025-09-23
+			编写日期：2025-09-23
+		</view>
+		<view class="smalltitle">
+			更新日期：2026-03-05
 		</view>
 		<view class="smalltitle">
 			生效日期：2025-10-08
@@ -38,7 +41,7 @@
 			<view class="deviceTitle">(1).账号信息：手机号码、验证码,用于注册、登陆</view>
 			<view class="deviceTitle">(2).蓝牙,用于设备连接后的通信、控制</view>
 			<view class="deviceTitle">(3).相机/相册权限,拍摄的照片或视频用于上传给设备、扫码等</view>
-			<view class="deviceTitle">(4).设备标识信息：IMEI、Android ID、MAC、OAID、软件安装列表,用于日志查询、统计分析、识别您的设备预防恶意程序及反作弊，提高服务安全性</view>
+			<view class="deviceTitle">(4).设备标识信息：BSSID、Wi-Fi SSID、Wi-Fi BSSID、IMEI、Android ID、MAC、OAID、AAID、PushToken、APP ID、应用包名、软件安装列表,用于日志查询、统计分析、识别您的设备预防恶意程序及反作弊，提高服务安全性</view>
 			<view class="deviceTitle">(5).GPS或网络位置,用于基于位置的服务，如地图导航、位置偏移预警</view>
 			<view class="deviceTitle">(6).麦克风,我们的智能设备支持播放语音，需要录音以上传给设备</view>
 			<view class="deviceTitle">(7).根据SDK功能，可能收集设备信息、位置信息等。我们会对合作的第三方SDK进行严格评估，并要求其遵守相关法规。具体清单见下文。</view>
@@ -51,6 +54,11 @@
 			<view class="deviceTitle">(2).定位SDK(com.amap.api.location),所属公司:北京高德图强科技有限公司,隐私政策链接:https://lbs.amap.com/pages/privacy/</view>
 			<view class="deviceTitle">(3).移动智能终端补充设备标识体系统一调用SDK(com.bun.miitmdid),所属公司:中国信息通信研究院,隐私政策链接:https://www.msa-alliance.cn/col.jsp?id=122</view>
 			<view class="deviceTitle">(4).轻量版地图SDK(com.amap.api.maps.utils),所属公司:北京高德图强科技有限公司,隐私政策链接:https://lbs.amap.com/pages/privacy/</view>
+			
+			<view class="deviceTitle">(5).个推消息推送(com.igexin.push),所属公司:浙江每日互动网络科技股份有限公司,隐私政策链接:http://docs.getui.com/download.html</view>
+			<view class="deviceTitle">(6).阿里云快速json(com.alibaba.fastjson),所属公司:杭州阿里巴巴广告有限公司,隐私政策链接:https://github.com/alibaba/fastjson</view>
+			<view class="deviceTitle">(7).vivo PUSH-SDK(com.vivo.push),所属公司:维沃移动通信有限公司,隐私政策链接:https://dev.vivo.com.cn/documentCenter/doc/180</view>
+			<view class="deviceTitle">(8).OPPO PUSH 客户端SDK(com.heytap),所属公司:OPPO广东移动通信有限公司,隐私政策链接:https://open.oppomobile.com/new/introduction?page_name=oppopush</view>
 		</view>
 		<view class="smalltitle">
 			4. 信息的存储与安全
diff --git a/pages/common/productDes/index.vue b/pages/common/productDes/index.vue
index f450cfc..f9dc3c7 100644
--- a/pages/common/productDes/index.vue
+++ b/pages/common/productDes/index.vue
@@ -10,6 +10,7 @@
 			<view class="example-body">
 				<!-- 图片列表 -->
 				<view class="image-list">
+					
 					<view class="image-item" v-for="(image, index) in instructionImages" :key="index"
 						@click="handleImageClick(index,image)">
 						<image :src="image.fileUrl" mode="aspectFit" class="instruction-image"
@@ -71,6 +72,7 @@
 				fileList: [],
 				deviceID: "",
 				instructionImages: [],
+				typeImgs:[],//该设备类型的官方数据
 				isDeleteMode: false, // 是否删除模式
 				selectedImages: [], // 选中的图片索引
 				deleteShow: false,
@@ -225,7 +227,8 @@
 		},
 		onLoad(options) {
 			this.deviceID = options.id
-			this.callOtherApi()
+			this.callOtherApi();
+			
 		}
 	}
 </script>
diff --git a/pages/common/send/index.vue b/pages/common/send/index.vue
index f064c70..68efc2d 100644
--- a/pages/common/send/index.vue
+++ b/pages/common/send/index.vue
@@ -1,11 +1,12 @@
 <template>
 	<view class="container">
 		<!-- 设备列表 -->
-		<scroll-view class="device-list" scroll-y>
-			<view class="device-card" v-for="(item, index) in deviceList" :key="index"
-				@click="item.onlineStatus === 1 ? toggleSelect(index) : null">
+		<!-- <scroll-view class="device-list" scroll-y> -->
+		<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
+			:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
+			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
 				<!-- 复选框 -->
-				<view class="checkbox" :class="{ checked: item.checked, disabled: item.onlineStatus !== 1 }">
+				<view class="checkbox" :class="{ checked: item.checked }">
 					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
 				</view>
 				<!-- 设备信息 -->
@@ -27,385 +28,752 @@
 					</view>
 				</view>
 			</view>
-			<view class="editInfmation">
-				<view class="ql-editor">编辑信息</view>
-				<view class="ql-input">
-					<textarea placeholder-style="color:rgba(255, 255, 255, 0.4)" placeholder="请输入内容" class="textarea"
-						v-model="messageToSend" :maxlength="20" />
-				</view>
-				<button class="login-btn" @click.stop="sendTextMessage">发送</button>
+		</mescroll-uni>
+		<!-- </scroll-view> -->
+
+		<view class="editInfmation">
+			<view class="ql-editor">编辑信息</view>
+			<view class="ql-input">
+				<textarea placeholder-style="color:rgba(255, 255, 255, 0.4)" placeholder="请输入内容" class="textarea"
+					v-model="messageToSend" :maxlength="20" />
+					<TextToHexV1 class="TextToHex" ref="textToHex" :txts="textLines" :bgColor="'#FFFFFF'"
+						:color="'#000000'" :fontSize="16" />
 			</view>
-		</scroll-view>
+			<button class="login-btn" @click.stop="sendTextMessage">发送</button>
+		</view>
 		<!-- 成功提示弹框 -->
 		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"
 			icon="/static/images/common/sendSucc.png" :confirm-text="popupConfirmText" :show-cancel="false"
 			@confirm="onPopupConfirm" />
+			
+			<MsgBox ref="msgPop" />
+			<global-loading ref="loading" />
+			
 	</view>
 </template>
 
 <script>
-import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
-import {
-	deviceInfo,
-} from '@/api/common/index.js'
-import {
-	deviceSendMessage,
-	deviceRealTimeStatus //设备状态
-} from '@/api/6170/deviceControl.js'
-import {
-	generateShortId,
-	getdeviceSTatus
-} from '@/utils/function.js';
-export default {
-	components: {
-		CustomPopup
-	},
-	data() {
-		return {
-			deviceList: [],
-			messageToSend: '', //发送信息
-			showPopupFlag: false,
-			popupTitle: '',
-			popupMessage: '信息发送成功！',
-			popupConfirmText: '确认',
-			isSending: false,
-			sendInfo: {}
-		}
-	},
-	methods: {
-		onPullDownRefresh() {
-			// 执行下拉刷新时的操作，比如重新获取数据
-			this.getData();
+	import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
+	import {
+		deviceInfo,
+	} from '@/api/common/index.js'
+	import {
+		deviceSendMessage,
+		deviceRealTimeStatus //设备状态
+	} from '@/api/6170/deviceControl.js'
+	import {
+		generateShortId,
+		getdeviceSTatus
+	} from '@/utils/function.js';
+	import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue';
+	import MqTool from '@/utils/MqHelper.js';
+	import gbk from '@/utils/gbk.js';
+	import TextToHexV1 from '@/components/TextToHex/TextToHexV1.vue';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js';
+	import {
+		MsgSuccess,
+		MsgError,
+		MsgClose,
+		MsgWarning,
+		showPop
+	} from '@/utils/MsgPops.js';
+	
+	var mq = null;
+	var timer = null;
+	var these = null;
+	export default {
+		components: {
+			CustomPopup,
+			MescrollUni,
+			TextToHexV1
 		},
-		toggleSelect(index) {
-			this.deviceList[index].checked = !this.deviceList[index].checked
-			this.$forceUpdate()
-		},
-		// 获取设备列表
-		getData(deviceType) {
-			this.loading = true;
-			let data = {
-				pageNum: 1,
-				pageSize: 50,
-				deviceType: deviceType
+		data() {
+			return {
+				deviceList: [],
+				messageToSend: '', //发送信息
+				showPopupFlag: false,
+				popupTitle: '',
+				popupMessage: '信息发送成功！',
+				popupConfirmText: '确认',
+				isSending: false,
+				sendInfo: {},
+				mescroll: null,
+				downOption: {
+					auto: true,
+					autoShowLoading: false,
+				},
+				upOption: {
+					auto: false,
+					noMoreSize: 0,
+					offset: 50,
+					isLock: false,
+					empty: {
+						tip: '暂无数据',
+						hideScroll: false
+					},
+					textNoMore: '没有更多数据了'
+				},
+				mescrollHeight: 0,
+				textLines:[]
 			}
-			deviceInfo(data).then((res) => {
-				if (res.code == 200) {
-					const newDevices = res.rows.map(device => ({
-						...device,
-						showConfirm: false,
-						checked: false
-					}));
-					this.total = res.total;
-					this.deviceList = newDevices
+		},
+		methods: {
+			getSystemInfoSyncH() {
+
+				let sysInfo = uni.getSystemInfoSync();
+
+				// 底部 footer 高度约 220rpx + 120rpx = 340rpx，转换为 px（1rpx = sysInfo.pixelRatio / 750 * 屏幕宽度？不，直接用 rpx 转 px 公式）
+				let footerHeight = 500 * (sysInfo.screenWidth / 750); // rpx 转 px
+
+				// console.log("footerHeight=", footerHeight);
+				this.mescrollHeight = sysInfo.screenHeight - footerHeight;
+				// console.log("mescrollHeight=", this.mescrollHeight);
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			// 下拉刷新
+			downCallback() {
+
+				console.log("触发下拉刷新");
+				if (this.mescroll) {
+					this.mescroll.resetUpScroll(false);
+					this.mescroll.scrollTo(0, 0);
 				}
-			}).finally(() => {
-				this.loading = false;
-			});
-		},
-		// 发送文本消息
-		async sendTextMessage() {
-			// 防重复提交
-			if (this.isSending) return;
-			const selectedDevices = this.deviceList.filter(item => item.checked)
-			const deviceIds = selectedDevices.map(item => item.id);
-			const deviceImeiList = selectedDevices.map(item => item.deviceImei);
-			if (selectedDevices.length === 0) {
-				uni.showToast({
-					title: '请选择一个设备',
-					icon: 'none'
-				});
-				return;
-			}
-			if (!this.messageToSend) {
-				uni.showToast({
-					title: '请输入要发送的文字',
-					icon: 'none'
-				});
-				return;
-			}
-			this.isSending = true;
-			let loadingShown = false;
-			try {
-				uni.showLoading({
-					title: '发送中...',
-					mask: true
-				});
-				loadingShown = true;
-				// 2. 准备请求数据
-				const batchId = generateShortId();
-				const data = {
-					sendMsg: this.messageToSend,
-					deviceIds: deviceIds,
-					batchId: batchId,
-					typeName: this.sendInfo.typeName,
-					batchId: batchId,
-					deviceImeiList: deviceImeiList
-				};
-				// 3.人员信息
-				const registerRes = await deviceSendMessage(data);
-				if (registerRes.code !== 200) {
+				this.getData(this.sendInfo.id);
+
+
+			},
+			// 上拉加载 
+			upCallback() {
+				console.log("触发上拉加载");
+
+
+				this.getData(this.sendInfo.id);
+			},
+			// onPullDownRefresh() {
+			// 	// 执行下拉刷新时的操作，比如重新获取数据
+			// 	this.getData();
+			// },
+			toggleSelect(index) {
+				this.deviceList[index].checked = !this.deviceList[index].checked
+				this.$forceUpdate()
+			},
+			// 获取设备列表
+			getData(deviceType) {
+				clearTimeout(timer);
+				timer = setTimeout(() => {
+					console.log("开始加载第" + (this.mescroll ? this.mescroll.num : 1) + '页数据')
+					this.loading = true;
+					let data = {
+						pageNum: this.mescroll ? this.mescroll.num : 1,
+						pageSize: 50,
+						deviceType: deviceType
+					}
+					deviceInfo(data).then((res) => {
+						if (res.code == 200) {
+							const newDevices = res.rows.map(device => ({
+								...device,
+								showConfirm: false,
+								checked: false
+							}));
+							this.total = res.total;
+							if (data.pageNum === 1) {
+								this.deviceList = newDevices;
+							} else {
+								this.deviceList = this.deviceList.concat(newDevices);
+							}
+
+
+							this.total = res.total;
+							// 判断是否加载完成
+							let hasNext = true;
+							if (res.rows.length < data.pageSize || this.deviceList.length >= this.total) {
+								hasNext = false;
+							} else {
+								hasNext = true;
+							}
+							this.mescroll.endSuccess(res.rows.length, hasNext);
+						} else {
+							this.mescroll.endSuccess(0, false);
+						}
+					}).finally(() => {
+						this.loading = false;
+					}).catch(ex => {
+
+						this.mescroll.endSuccess(0, false);
+
+					});
+
+				}, 200);
+
+			},
+			// 发送文本消息
+			sendTextMessage() {
+				// 防重复提交
+				if (this.isSending) return;
+				const selectedDevices = this.deviceList.filter(item => item.checked)
+				const deviceIds = selectedDevices.map(item => item.id);
+				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
+				if (selectedDevices.length === 0) {
 					uni.showToast({
-						title: registerRes.msg,
+						title: '请选择一个设备',
 						icon: 'none'
-					})
-					return
+					});
+					return;
 				}
-					// 4. 获取设备状态
-					let deviceImei = this.sendInfo.deviceImei
-					let typeName = this.sendInfo.typeName
-					const statusRes = await getdeviceSTatus({
-							functionMode: 2,
-							batchId,
-							typeName:'FunctionAccessBatchStatusRule',
-							deviceImei,
-							interval: 500
-						},
-						deviceRealTimeStatus
-					);
-				if (statusRes.data.functionAccess === 'OK') {
-					// 5. 显示成功弹窗
-					this.showPopupFlag = true
+				if (!this.messageToSend) {
+					uni.showToast({
+						title: '请输入要发送的文字',
+						icon: 'none'
+					});
+					return;
 				}
-			} catch (error) {
-				uni.showToast({
-					title: error.message,
-					icon: 'none'
+				this.isSending = true;
+				//FYS的方法
+				let FYSSend = async () => {
+
+
+					try {
+						showLoading(these,{
+							text: '发送中...',
+							mask: true
+						});
+
+						// 2. 准备请求数据
+						const batchId = generateShortId();
+						const data = {
+							sendMsg: this.messageToSend,
+							deviceIds: deviceIds,
+							batchId: batchId,
+							typeName: this.sendInfo.typeName,
+							batchId: batchId,
+							deviceImeiList: deviceImeiList
+						};
+						// 3.人员信息
+						const registerRes = await deviceSendMessage(data);
+						if (registerRes.code !== 200) {
+							uni.showToast({
+								title: registerRes.msg,
+								icon: 'none'
+							})
+							return
+						}
+						// 4. 获取设备状态
+						let deviceImei = this.sendInfo.deviceImei
+						let typeName = this.sendInfo.typeName
+						const statusRes = await getdeviceSTatus({
+								functionMode: 2,
+								batchId,
+								typeName: 'FunctionAccessBatchStatusRule',
+								deviceImei,
+								interval: 500
+							},
+							deviceRealTimeStatus
+						);
+						if (statusRes.data.functionAccess === 'OK') {
+							// 5. 显示成功弹窗
+							this.showPopupFlag = true
+						}
+					} catch (error) {						
+						MsgError(error.message,null,these);
+					} finally {
+						hideLoading(these);
+						this.isSending = false;
+					}
+				}
+				//XS的方法
+				let XSSend = () => {
+
+
+					try {
+
+
+						let text = this.messageToSend.padEnd(16,'').substring(0,16);						
+						let arr = gbk.encode(text)						
+						let gbkData = gbk.arr2hex(arr);																
+						let len=gbkData.length;
+						let list = [];
+						console.log("gbkData=",gbkData);
+						let rec = function(payload, receive) {
+							debugger;
+							
+							console.log("收到消息,imei=" + mei + ",消息内容,", payload);
+							let json =JSON.parse(payload.payload);
+							let mei=payload.receive.topic.replace('A/','');
+						
+							let childData=null;
+							let childIndex=null;
+							if (json.sta_BreakNews === 1) {
+								childIndex=1;
+								childData=gbkData.slice(0,len/2);
+							}
+							else if (json.sta_BreakNews === 2) {
+								childIndex=2;
+								childData=gbkData.slice(len/2,len);
+							}
+							else if (json.sta_BreakNews === 'cover!') {
+								mq.unSubscribes({topic:"A/" + mei});
+								return;
+							}
+							if(childData){
+								console.log("childData=",childData)
+								let buffer={ins_BreakNews:[childIndex]};
+								for (var i = 0; i < childData.length; i += 2) {
+									let value = parseInt(childData[i] + "" + childData[i + 1], 16);
+								
+									buffer.ins_BreakNews.push(value);
+								}
+								
+								let msg=JSON.stringify(buffer);
+								mq.sendData("B/" + mei, msg, false);
+							}
+
+						};
+						let msg = JSON.stringify({
+							ins_BreakNews: [0]
+						});
+						for (let i = 0; i < deviceImeiList.length; i++) {
+							
+							list.push({
+								imie: deviceImeiList[i],
+								topic: 'A/' + deviceImeiList[i],
+								callback: rec
+							});
+
+							mq.sendData("B/" + deviceImeiList[i], msg, false);
+
+						}
+
+
+
+						mq.subscribes(list);
+
+						this.showPopupFlag = true;
+					} catch (error) {
+
+					} finally {
+
+						this.isSending = false;
+					}
+				}
+				//FS的方法
+				let FSSend = () => {
+					
+					this.messageToSend.padEnd(16, ' ').slice(0,16);
+					
+					this.textLines = [this.messageToSend.slice(0, 8), this.messageToSend.slice(8, 16)];
+					
+					
+					
+					showLoading(this, {
+						text: "发送中"
+					});
+					//握手
+					let holdHand = (hexs, time) => {
+						return new Promise((resolve, reject) => {
+							setTimeout(() => {
+								resolve(true)
+							}, time);
+						});
+					}
+					//画图
+					let drawText = () => {
+						return new Promise((resolve, reject) => {
+							this.$refs.textToHex.drawAndGetPixels().then(allPixels => {
+								if (!allPixels) {
+									reject("文本初始化失败");
+									return;
+								}
+								console.log("画图成功");
+								
+								resolve(allPixels)
+							}).catch(compEx => {
+								reject(compEx);
+							});
+					
+						});
+					}
+					//发送3个分包的数据
+					let task = (allPixels,imei) => {
+						try {
+							let combinedData = [];
+							for (let i = 0; i < 2; i++) {
+								let linePixels = (allPixels[i] || []).flat(Infinity).map(item =>
+					
+									item.replace('0x', '')
+								);
+					
+								for (var j = linePixels.length; j < 256; j++) {
+									linePixels.push("00");
+					
+								}
+					
+					
+								combinedData.push(['0' + (i + 1), '01'].concat(linePixels.slice(0, 128)));
+								combinedData.push(['0' + (i + 1), '02'].concat(linePixels.slice(128, 256)));
+							}
+					
+					
+							let curr = 1;
+							let len = combinedData.length;
+					
+					
+							console.log("包数量", len)
+							//分包发送
+							let sendPacket = () => {
+					
+								if (combinedData.length === curr - 1) {
+					
+					
+									holdHand('transmit complete', 200).then(res => {
+					
+					
+									});
+									
+									return;
+								}
+					
+								let array = combinedData[curr - 1];
+					
+								let json =JSON.stringify( {
+									ins_msg: array.join("")
+								});
+								mq.sendData("B/" + imei, json, false).then(
+									res => {
+										curr++;
+										console.log("发送成功", curr)
+										setTimeout(sendPacket, 500);
+									}).catch(err => {
+									if (err.code == '10007') {
+					
+										setTimeout(sendPacket, 500);
+									} else {
+										console.log("err:", err);
+										MsgError('发送失败' + (err.msg || err.code), '确定', these);
+									}
+					
+								});
+							}
+					
+							setTimeout(sendPacket, 40);
+							// 5. 发送成功处理
+					
+					
+						} catch (ex) {
+							uni.showModal({
+								title: '提示',
+								content: '发送失败' + (ex.msg || ex.code)
+							})
+						}
+					
+					
+					}
+					
+					setTimeout(()=>{
+						drawText().then(pixels=>{
+							for (let i = 0; i < deviceImeiList.length; i++) {
+								let imei = deviceImeiList[i];									
+								task(pixels,imei);
+							}
+							
+							setTimeout(()=>{
+								hideLoading(these);
+								MsgSuccess("发送成功",null,these);
+							},800);
+						})
+					}, 10);
+
+					
+				}
+
+
+				let device = selectedDevices[0];
+				let sendDic = [{
+						urls: ['/pages/6170/deviceControl/index', '/pages/210/HBY210', '/pages/6075/BJQ6075',
+							'/pages/100J/HBY100-J'
+						],
+						send: FYSSend,
+					},
+					{
+						urls: ['/pages/670/HBY670'],
+						send: XSSend
+					},
+					{
+						urls: ['/pages/6075J/BJQ6075J'],
+						send: FSSend
+					}
+
+
+				];
+
+				let f = sendDic.find(v => {
+					return v.urls.indexOf(device.detailPageUrl) > -1;
 				});
-			} finally {
-				uni.hideLoading();
-				this.isSending = false;
+
+				if (f) {
+					f.send();
+				} else {
+					FYSSend();
+				}
+
+			},
+			onPopupConfirm() {
+				this.showPopupFlag = false
+				uni.navigateBack()
+				console.log('用户点击了确定')
+				// 处理确认逻辑
+			},
+		},
+		onLoad(options) {
+			these = this;
+			mq = MqTool.getMqTool();
+			if(mq){
+				mq.init();
 			}
+			const eventChannel = this.getOpenerEventChannel();
+			// 监听 'deviceSend' 事件，获取传过来的数据
+			eventChannel.on('deviceSend', (data) => {
+				console.log('Received detail data:', data);
+
+				this.sendInfo = data.data
+				this.downCallback();
+			});
+			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
+			eventChannel.emit('ack', {});
+
+			this.getSystemInfoSyncH();
 		},
-		onPopupConfirm() {
-			this.showPopupFlag = false
-			uni.navigateBack()
-			console.log('用户点击了确定')
-			// 处理确认逻辑
-		},
-	},
-	onLoad(options) {
-		const eventChannel = this.getOpenerEventChannel();
-		// 监听 'deviceSend' 事件，获取传过来的数据
-		eventChannel.on('deviceSend', (data) => {
-			console.log('Received detail data:', data);
-			this.getData(data.data.id)
-			this.sendInfo = data.data
-		});
-		// 如果需要向调用页面返回数据，可以触发 'ack' 事件
-		eventChannel.emit('ack', {})
-	},
-}
+		onUnload() {
+			clearTimeout(timer);
+			if (mq) {
+				mq.disconnect();
+			}
+		}
+	}
 </script>
 
 <style scoped>
-.container {
-	min-height: 100vh;
-	background-color: rgb(18, 18, 18);
-	box-sizing: border-box;
-	overflow-x: hidden;
+	.container {
+		min-height: 100vh;
+		background-color: rgb(18, 18, 18);
+		box-sizing: border-box;
+		overflow-x: hidden;
 
-}
+	}
 
-.device-list {
-	flex: 1;
-	padding: 0 20rpx;
+	.device-list {
+		flex: 1;
+		padding: 0 20rpx;
 
-}
+	}
 
-.device-card {
-	position: relative;
-	display: flex;
-	align-items: center;
-	width: 95%;
-	margin-bottom: 20rpx;
-}
+	.device-card {
+		position: relative;
+		display: flex;
+		align-items: center;
+		width: 95%;
+		margin-bottom: 20rpx;
+	}
 
-.checkbox {
-	width: 40rpx;
-	height: 40rpx;
-	border: 2rpx solid rgba(255, 255, 255, 0.5);
-	margin-right: 20rpx;
-	border-radius: 4rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+	.checkbox {
+		width: 40rpx;
+		height: 40rpx;
+		border: 2rpx solid rgba(255, 255, 255, 0.5);
+		margin-right: 20rpx;
+		border-radius: 4rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.checkbox.checked {
-	background-color: rgb(187, 230, 0);
-	border-color: rgb(187, 230, 0);
-}
+	.checkbox.checked {
+		background-color: rgb(187, 230, 0);
+		border-color: rgb(187, 230, 0);
+	}
 
-.device-content {
-	background-color: rgb(26, 26, 26);
-	border-radius: 16rpx;
-	position: relative;
-	/* display: flex; */
-	align-items: center;
-	padding: 20rpx;
-	width: 95%;
-}
+	.device-content {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		position: relative;
+		/* display: flex; */
+		align-items: center;
+		padding: 20rpx;
+		width: 95%;
+	}
 
-.device-header {
-	display: flex;
-	align-items: center;
-	margin-bottom: 15rpx;
-}
+	.device-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 15rpx;
+	}
 
-.device-name {
-	font-size: 32rpx;
-	color: rgba(255, 255, 255, 0.87);
-	margin-left: 12rpx;
-	line-height: 50rpx;
-	width: 83%;
-	white-space: nowrap;
-}
+	.device-name {
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+		margin-left: 12rpx;
+		line-height: 50rpx;
+		width: 83%;
+		white-space: nowrap;
+	}
 
-.ID {
-	color: rgba(255, 255, 255, 0.6);
-	font-size: 26rpx;
-	display: flex;
-	justify-content: space-between;
-	position: relative;
-}
+	.ID {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 26rpx;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+	}
 
-.device-status {
-	width: 122rpx;
-	height: 52rpx;
-	font-size: 26rpx;
-	border-radius: 0px 8px 0px 8px;
-	background-color: rgb(42, 42, 42);
-	position: absolute;
-	top: 0rpx;
-	right: 0rpx;
-	text-align: center;
-	line-height: 52rpx;
-}
+	.device-status {
+		width: 122rpx;
+		height: 52rpx;
+		font-size: 26rpx;
+		border-radius: 0px 8px 0px 8px;
+		background-color: rgb(42, 42, 42);
+		position: absolute;
+		top: 0rpx;
+		right: 0rpx;
+		text-align: center;
+		line-height: 52rpx;
+	}
 
-.online {
-	color: rgb(187, 230, 0);
-}
+	.online {
+		color: rgb(187, 230, 0);
+	}
 
-.unline {
-	color: rgba(255, 255, 255, 0.4);
-}
+	.unline {
+		color: rgba(255, 255, 255, 0.4);
+	}
 
-.device-info {
-	display: flex;
-	justify-content: space-evenly;
-	font-size: 26rpx;
-	color: rgba(255, 255, 255, 0.87);
-	padding-top: 10rpx;
-	position: relative;
-}
+	.device-info {
+		display: flex;
+		justify-content: space-evenly;
+		font-size: 26rpx;
+		color: rgba(255, 255, 255, 0.87);
+		padding-top: 10rpx;
+		position: relative;
+	}
 
-.deviceIMG {
-	width: 100rpx;
-	height: 100rpx;
-	border-radius: 16rpx;
-	position: relative;
-	background-color: rgba(42, 42, 42, 0.6);
-	display: flex;
-	align-items: center;
-}
+	.deviceIMG {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 16rpx;
+		position: relative;
+		background-color: rgba(42, 42, 42, 0.6);
+		display: flex;
+		align-items: center;
+	}
 
-.IMG {
-	width: 68rpx;
-	height: 50rpx;
-	margin-left: 17%;
-}
+	.IMG {
+		width: 68rpx;
+		height: 50rpx;
+		margin-left: 17%;
+	}
 
-.onlines {
-	position: relative;
-}
+	.onlines {
+		position: relative;
+	}
 
-.onlines::before {
-	content: '';
-	position: absolute;
-	width: 15rpx;
-	height: 15rpx;
-	background: rgb(0, 171, 103);
-	border-radius: 50%;
-	top: 20rpx;
-	left: -20rpx
-}
+	.onlines::before {
+		content: '';
+		position: absolute;
+		width: 15rpx;
+		height: 15rpx;
+		background: rgb(0, 171, 103);
+		border-radius: 50%;
+		top: 20rpx;
+		left: -20rpx
+	}
 
-.unlines {
-	position: relative;
-}
+	.unlines {
+		position: relative;
+	}
 
-.unlines::before {
-	content: '';
-	position: absolute;
-	width: 15rpx;
-	height: 15rpx;
-	background: rgba(255, 255, 255, 0.4);
-	border-radius: 50%;
-	top: 20rpx;
-	left: -20rpx
-}
+	.unlines::before {
+		content: '';
+		position: absolute;
+		width: 15rpx;
+		height: 15rpx;
+		background: rgba(255, 255, 255, 0.4);
+		border-radius: 50%;
+		top: 20rpx;
+		left: -20rpx
+	}
 
-.line {
-	width: 2rpx;
-	height: 24rpx;
-	background: linear-gradient(90deg,
-			rgba(0, 0, 0, 0) 0%,
-			rgb(255, 255, 255) 50%,
-			rgba(255, 255, 255, 0) 100%);
-	margin-top: 12rpx;
-}
+	.line {
+		width: 2rpx;
+		height: 24rpx;
+		background: linear-gradient(90deg,
+				rgba(0, 0, 0, 0) 0%,
+				rgb(255, 255, 255) 50%,
+				rgba(255, 255, 255, 0) 100%);
+		margin-top: 12rpx;
+	}
 
-.ql-editor {
-	color: rgba(255, 255, 255, 0.6);
-	font-size: 30rpx;
-}
+	.ql-editor {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 30rpx;
+	}
 
-.ql-input {
-	width: 95.9%;
-	height: 200rpx;
-	margin-top: 30rpx;
-	box-sizing: border-box;
-	padding: 30rpx;
-	border-radius: 16rpx;
-	background: rgb(26, 26, 26);
-}
+	.ql-input {
+		width: 95.9%;
+		height: 200rpx;
+		margin-top: 30rpx;
+		box-sizing: border-box;
+		padding: 20rpx;
+		border-radius: 16rpx;
+		background: rgb(26, 26, 26);
+	}
 
-.textarea {
-	color: rgba(255, 255, 255, 0.8);
-	background: rgba(42, 42, 42, 1);
-	border-radius: 16rpx;
-	padding: 10rpx;
-	height: 150rpx;
-}
+	.textarea {
+		color: rgba(255, 255, 255, 0.8);
+		background: rgba(42, 42, 42, 1);
+		border-radius: 16rpx;
+		padding: 10rpx;
+		height: 150rpx;
+		width: 100%;
+	}
 
-.editInfmation {
-	padding: 20rpx;
-	border-radius: 40rpx 40rpx 0px 0px;
-	background: rgba(28, 28, 28, 1);
-	position: fixed;
-	bottom: 50rpx;
-	box-sizing: border-box;
-}
+	.editInfmation {
+		padding: 20rpx;
+		border-radius: 40rpx 40rpx 0px 0px;
+		background: rgba(28, 28, 28, 1);
+		position: fixed;
+		bottom: 20rpx;
+		box-sizing: border-box;
+		width: 100%;
+	}
 
-.login-btn {
-	margin-top: 30rpx;
-	background-color: rgb(187, 230, 0);
-	color: rgb(35, 35, 35);
-	border-radius: 50rpx;
-	width: 90%;
-}
+	.login-btn {
+		margin-top: 30rpx;
+		background-color: rgb(187, 230, 0);
+		color: rgb(35, 35, 35);
+		border-radius: 50rpx;
+		width: 90%;
+	}
 
-.checkbox.disabled {
-	opacity: 0.5;
-	background-color: rgba(255, 255, 255, 0.1) !important;
-	border-color: rgba(255, 255, 255, 0.2) !important;
-	pointer-events: none;
-	/* 阻止点击事件 */
-}
+	.checkbox.disabled {
+		opacity: 0.5;
+		background-color: rgba(255, 255, 255, 0.1) !important;
+		border-color: rgba(255, 255, 255, 0.2) !important;
+		pointer-events: none;
+		/* 阻止点击事件 */
+	}
 
-/* 可选：离线设备的卡片整体置灰 */
-.device-card[data-offline="true"] {
-	opacity: 0.6;
-}
+	/* 可选：离线设备的卡片整体置灰 */
+	.device-card[data-offline="true"] {
+		opacity: 0.6;
+	}
+	
+	.TextToHex {
+		position: fixed;
+		top: -99999rpx;
+		left: -99999rpx;
+		visibility: hidden;
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/6331/jieN.png b/static/images/6331/jieN.png
deleted file mode 100644
index 71d371d..0000000
Binary files a/static/images/6331/jieN.png and /dev/null differ
diff --git a/static/images/6331/jieNActive.png b/static/images/6331/jieNActive.png
deleted file mode 100644
index 4d00ec1..0000000
Binary files a/static/images/6331/jieNActive.png and /dev/null differ
diff --git a/static/images/common/jig.png b/static/images/common/jig.png
new file mode 100644
index 0000000..fbb5e19
Binary files /dev/null and b/static/images/common/jig.png differ
diff --git a/static/images/common/jigA.png b/static/images/common/jigA.png
new file mode 100644
index 0000000..09fed8d
Binary files /dev/null and b/static/images/common/jigA.png differ
diff --git a/static/images/common/sg.png b/static/images/common/sg.png
new file mode 100644
index 0000000..6d8bf65
Binary files /dev/null and b/static/images/common/sg.png differ
diff --git a/static/images/common/sgActive.png b/static/images/common/sgActive.png
new file mode 100644
index 0000000..17a1d79
Binary files /dev/null and b/static/images/common/sgActive.png differ
diff --git a/static/images/lightImg/closeLight.png b/static/images/lightImg/closeLight.png
new file mode 100644
index 0000000..506ea9b
Binary files /dev/null and b/static/images/lightImg/closeLight.png differ
diff --git a/static/images/6155/DeviceDetail/fan.png b/static/images/lightImg/fan.png
similarity index 100%
rename from static/images/6155/DeviceDetail/fan.png
rename to static/images/lightImg/fan.png
diff --git a/static/images/670/jieN.png b/static/images/lightImg/jieN.png
similarity index 100%
rename from static/images/670/jieN.png
rename to static/images/lightImg/jieN.png
diff --git a/static/images/670/jieNActive.png b/static/images/lightImg/jieNActive.png
similarity index 100%
rename from static/images/670/jieNActive.png
rename to static/images/lightImg/jieNActive.png
diff --git a/static/images/6155/DeviceDetail/qiang.png b/static/images/lightImg/qiang.png
similarity index 100%
rename from static/images/6155/DeviceDetail/qiang.png
rename to static/images/lightImg/qiang.png
diff --git a/static/images/6155/DeviceDetail/ruo.png b/static/images/lightImg/ruo.png
similarity index 100%
rename from static/images/6155/DeviceDetail/ruo.png
rename to static/images/lightImg/ruo.png
diff --git a/static/images/6155/DeviceDetail/shan.png b/static/images/lightImg/shan.png
similarity index 100%
rename from static/images/6155/DeviceDetail/shan.png
rename to static/images/lightImg/shan.png
diff --git a/static/images/lightImg/sos.png b/static/images/lightImg/sos.png
new file mode 100644
index 0000000..a961fd5
Binary files /dev/null and b/static/images/lightImg/sos.png differ
diff --git a/static/images/lightImg/super.png b/static/images/lightImg/super.png
new file mode 100644
index 0000000..0167f90
Binary files /dev/null and b/static/images/lightImg/super.png differ
diff --git a/static/images/lightImg/warn.png b/static/images/lightImg/warn.png
new file mode 100644
index 0000000..90dc68d
Binary files /dev/null and b/static/images/lightImg/warn.png differ
diff --git a/static/images/lightImg/work.png b/static/images/lightImg/work.png
new file mode 100644
index 0000000..a236880
Binary files /dev/null and b/static/images/lightImg/work.png differ
diff --git a/utils/BleHelper.js b/utils/BleHelper.js
index c127d69..1124b62 100644
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@@ -1601,7 +1601,7 @@ class BleHelper {
 					// console.log("正在连接" + deviceId);
 					uni.createBLEConnection({
 						deviceId: deviceId,
-						timeout: 30000,
+						timeout: 15000,
 						success: (info) => {
 							//释放连接锁
 							
diff --git a/utils/Common.js b/utils/Common.js
index 3570666..f2b829c 100644
--- a/utils/Common.js
+++ b/utils/Common.js
@@ -218,31 +218,31 @@ export default {
 				value: "1",
 				label: "灯光模式",
 				checked: false,
-				type: ['6170', '670','102','6155','650','7305']
+				type: ['6170', '670','102','6155','650','7305','6075']
 			},
 			{
 				value: "2",
 				label: "激光模式",
 				checked: false,
-				type: ['6170']
+				type: ['6170','6075']
 			},
 			{
 				value: "3",
 				label: "开机画面",
 				checked: false,
-				type: ['210', '6170', '670','6155','650','7305']
+				type: ['210', '6170', '670','6155','650','7305','6075']
 			},
 			{
 				value: "4",
 				label: "人员信息登记",
 				checked: false,
-				type: ['210', '6170', '670','6155','650','7305']
+				type: ['210', '6170', '670','6155','650','7305','6075']
 			},
 			{
 				value: "5",
 				label: "发送信息",
 				checked: false,
-				type: ['210', '6170', '670']
+				type: ['210', '6170', '670','6075']
 			},
 			{
 				value: "6",
@@ -258,7 +258,7 @@ export default {
 				value: "42",
 				label: "SOS",
 				checked: false,
-				type: ['670','4877']
+				type: ['670','4877','6075']
 			},
 			{
 				value: "43",
diff --git a/utils/mqtt.js b/utils/mqtt.js
index 2297fa2..e5554d1 100644
--- a/utils/mqtt.js
+++ b/utils/mqtt.js
@@ -281,7 +281,36 @@ class MqttClient {
 		}
 	}
 
-	publish(topic, message,retained) {
+	async publish(topic, message,retained) {
+		let getLan=()=>{
+			return new Promise((succ,error)=>{
+				uni.getNetworkType({
+				success: (res) => {
+					let networkType = res.networkType;					
+					// 判断网络是否连接
+					if (networkType === 'none') {
+						console.error('无网络连接')					
+							succ(false);					
+					} else {					
+							succ(true);									
+					}
+				},
+				fail: (err) => {
+					console.error('获取网络状态失败：', err);
+				
+						succ(false);
+				
+				}
+			});
+			});
+			
+		}
+		
+		let flag=await getLan();
+		if(!flag){
+			
+			return false;
+		}
 		if (this.client && this.client.isConnected()) {
 			const mqttMessage = new Paho.Message(message);
 			mqttMessage.destinationName = topic;