Merge branch 'liubiao-new-20250827'

.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"
         }

App.vue

@@ -212,4 +212,5 @@
 			font-family: "PingFangBold";
 			src: url("~@/static/fonts/PingFangBold.ttf") format("opentype");
 		}
+	
 </style>

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",

components/BottomSlideMenuPlus/BottomSlideMenuPlus.vue

@@ -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);

components/MessagePopup/MessagePopup.vue

@@ -1,31 +1,19 @@
 <template>
 	<view class="message-popup" v-if="visible">
 		<view class="popup-mask" @click="handleMaskClick"></view>
-    <view 
+		<view class="popup-content" :style="{ 
-      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="showHeader&&headerTxt" class="header"
 
-	>{{headerTxt}}</view>
+			<view v-if="visibleClose" class="rightClose" :style="{color:textColor || getTypeStyle('textColor')}"
-	
+				@click="closeClick">x</view>
-     <view v-if="visibleClose" class="rightClose" 
-	 :style="{color:textColor || getTypeStyle('textColor')}"
-	 @click="closeClick"
-	 >x</view>
 
 			<view v-if="!visiblePrompt">
-        <image 
+				<image v-if="iconUrl" :src="iconUrl" mode="aspectFit" class="popup-icon"
-          v-if="iconUrl" 
+					:style="{ tintColor: textColor || getTypeStyle('textColor') }"></image>
-          :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>
@@ -35,33 +23,19 @@
 
 			<view v-else class="popup-prompt">
 				<text class="popup-prompt-title">{{ promptTitle || '请输入信息' }}</text>
-        <input 
+				<input class="popup-prompt-input" :placeholder="promptPlaceholder" :value="modelValue"
-          class="popup-prompt-input"  
+					@input="handleInput" @confirm="handleButtonClick" />
-          :placeholder="promptPlaceholder" 
-          :value="modelValue"
-          @input="handleInput"
-          @confirm="handleButtonClick"
-        />
 			</view>
 
 			<view class="popBtnContent" v-show="showCancel || buttonText">
 
-		  <view
+				<view class="popup-button-cancel" v-if="showCancel" :style="{display:showCancel?'block':'none'}"
-		    class="popup-button-cancel" 
+					@click="handleCancelClick">{{ buttonCancelText?buttonCancelText:'取消' }}</view>
-			v-if="showCancel"
-		   :style="{display:showCancel?'block':'none'}"
-		    @click="handleCancelClick"
-		  >{{ buttonCancelText?buttonCancelText:'取消' }}</view>
 
-		  <view
+				<view class="popup-button" :class="buttonText?'':'displayNone'" :style="{ 
-		    class="popup-button" 
-			:class="buttonText?'':'displayNone'"
-		    :style="{ 
 		      backgroundColor: buttonBgColor || getTypeStyle('buttonBgColor'),
 		      color: buttonTextColor || getTypeStyle('buttonTextColor')
-		    }"
+		    }" @click="handleButtonClick">{{ buttonText }}</view>
-		    @click="handleButtonClick"
-		  >{{ buttonText }}</view>
 
 
 			</view>
@@ -73,16 +47,16 @@
 </template>
 
 <script>
-export default {
+	export default {
 		name: 'MessagePopup',
 		props: {
 			visible: {
 				type: Boolean,
 				default: false
 			},
-	visibleClose:{
+			visibleClose: {
-		type:Boolean,
+				type: Boolean,
-		default:true
+				default: true
 			},
 			visiblePrompt: {
 				type: Boolean,
@@ -100,7 +74,7 @@ export default {
 			type: {
 				type: String,
 				default: 'info',
-      validator: value => ['success', 'error', 'info','custom'].includes(value)
+				validator: value => ['success', 'error', 'info', 'custom'].includes(value)
 			},
 			bgColor: String,
 			borderColor: String,
@@ -116,25 +90,25 @@ export default {
 				type: String,
 				default: '确定'
 			},
-	buttonCancelText:{
+			buttonCancelText: {
-		type:String,
+				type: String,
-		default:'取消'
+				default: '取消'
 			},
-	showCancel:{
+			showCancel: {
-		type:Boolean,
+				type: Boolean,
-		default:false
+				default: false
 			},
-	showHeader:{
+			showHeader: {
-		type:Boolean,
+				type: Boolean,
-		default:false
+				default: false
 			},
-	headerTxt:{
+			headerTxt: {
-		type:String,
+				type: String,
-		default:""
+				default: ""
 			},
-	showSlot:{
+			showSlot: {
-		type:Boolean,
+				type: Boolean,
-		default:false
+				default: false
 			}
 		},
 		data() {
@@ -194,11 +168,11 @@ export default {
 
 				this.$emit('maskClick')
 			},
-	closeClick(){
+			closeClick() {
 
 				this.$emit('closePop')
 			},
-	handleCancelClick(){
+			handleCancelClick() {
 
 				this.$emit('cancelPop');
 			},
@@ -208,14 +182,15 @@ export default {
 				this.$emit('update:modelValue', this.inputValue)
 			}
 		}
-}
+	}
 </script>
 
 <style>
-	.displayNone{
+	.displayNone {
 		display: none !important
 	}
-.message-popup {
+
+	.message-popup {
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -225,18 +200,18 @@ export default {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-}
+	}
 
-.popup-mask {
+	.popup-mask {
 		position: absolute;
 		top: 0;
 		left: 0;
 		width: 100%;
 		height: 100%;
 		background-color: rgba(0, 0, 0, 0.5);
-}
+	}
 
-.popup-content {
+	.popup-content {
 		position: relative;
 		width: 80%;
 		max-width: 400px;
@@ -248,9 +223,10 @@ export default {
 		border-style: solid;
 		box-sizing: border-box;
 		z-index: 10;
-}
+	}
-.header{
+
-	width:100%;
+	.header {
+		width: 100%;
 		color: rgba(255, 255, 255, 0.87);
 		font-family: PingFang SC;
 		font-size: 32rpx;
@@ -259,8 +235,9 @@ export default {
 		line-height: 80rpx;
 		letter-spacing: 0.07px;
 		text-align: center;
-}
+	}
-.rightClose{
+
+	.rightClose {
 		position: absolute;
 		right: 20rpx;
 		top: 20rpx;
@@ -269,38 +246,39 @@ export default {
 		width: 24rpx;
 		height: 24rpx;
 		line-height: 24rpx;
-}
+	}
-.popup-icon {
+
+	.popup-icon {
 		width: 60rpx;
 		height: 60rpx;
 		margin: 20rpx auto;
 		display: block;
-}
+	}
 
-.popup-message {
+	.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 {
+	.popup-prompt {
 		width: 100%;
-}
+	}
 
-.popup-prompt-title {
+	.popup-prompt-title {
 		display: block;
 		font-size: 32rpx;
 		text-align: center;
 		margin-bottom: 20rpx;
 		font-weight: 500;
-}
+	}
 
-.popup-prompt-input {
+	.popup-prompt-input {
 		width: 100%;
 		height: 80rpx;
 		line-height: 80rpx;
@@ -310,21 +288,21 @@ export default {
 		margin-bottom: 30rpx;
 		font-size: 28rpx;
 		box-sizing: border-box;
-}
+	}
 
-.popBtnContent{
+	.popBtnContent {
-	width:100%;
+		width: 100%;
 		height: 60rpx;
 		margin-top: 20rpx;
-	     display: flex
+		display: flex;
-	 ;
 		flex-direction: row;
 		flex-wrap: nowrap;
 		align-content: center;
 		justify-content: space-evenly;
 		align-items: center;
-}
+	}
-.popup-button {
+
+	.popup-button {
 		width: 30%;
 		height: 60rpx;
 		line-height: 60rpx;
@@ -338,9 +316,9 @@ export default {
 		outline: none;
 		cursor: pointer;
 
-}
+	}
 
-.popup-button-cancel{
+	.popup-button-cancel {
 		width: 30%;
 		height: 60rpx;
 		line-height: 60rpx;
@@ -359,40 +337,37 @@ export default {
 
 		background-color: #00000000;
 
-color: #FFFFFFde;
+		color: #FFFFFFde;
-}
+	}
 
-.popup-prompt{
+	.popup-prompt {
 		width: 100%;
 		height: 60rpx;
 		line-height: 60rpx;
-padding-top: 40rpx;	
+		padding-top: 40rpx;
-}
+	}
 
 
-.popup-prompt-title{
+	.popup-prompt-title {
 		color: rgba(255, 255, 255, 0.6);
 		text-align: right;
 		width: 30%;
 		float: left;
 		box-sizing: border-box;
-	white-space:nowrap;
+		white-space: nowrap;
 		padding-right: 10rpx;
-}
+	}
-.popup-prompt-input{
+
+	.popup-prompt-input {
 		float: left;
 		width: 70%;
 		height: 60rpx;
 		line-height: 60rpx;
-	color: rgba(255, 255, 255, 0.87) ;
+		color: rgba(255, 255, 255, 0.87);
 
 		box-sizing: border-box;
 		border: 2rpx solid rgba(255, 255, 255, 0.4);
 		border-radius: 8rpx;
 
-}
+	}
-
-
-
-
 </style>

components/MsgBox/MsgBox.vue

@@ -6,50 +6,59 @@
 			: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)" />
+			: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:[]
+				Msgboxs: []
 			}
 		},
 		methods: {
 			//确认按钮事件，如果回调函数返回true,将阻止关闭弹窗
-			okCallback(item,index){
+			okCallback(item, index) {
-				let flag=false;
+				let flag = false;
-				if(item.okCallback){
+				if (item.okCallback) {
-					flag=item.okCallback(item,index)
+					flag = item.okCallback(item, index)
 				}
 
-				if(flag){
+				if (flag) {
 					return;
 				}
 				this.closePop(item);
 			},
 			//取消按钮,如果回调函数返回true，将阻止关闭弹窗
-			cancelClick(item,index){
+			cancelClick(item, index) {
-				let flag=false;
+				let flag = false;
-				if(item.cancelCallback){
+				if (item.cancelCallback) {
-					flag=item.cancelCallback(item,index)
+					flag = item.cancelCallback(item, index)
 				}
 
-				if(flag){
+				if (flag) {
 					return;
 				}
 				this.closePop(item);
 			},
 			closePop: function(item) {
-			
+				debugger;
 				if (item) {
 					this.Msgboxs.find((v, i) => {
+						debugger;
+						if (item.key && v.key) {
 							if (item.key === v.key) {
 								this.Msgboxs.splice(i, 1);
+								return true;
 							}
+						}
+
 					});
 
 					if (item.cancelCallback) {
@@ -64,7 +73,7 @@
 
 			},
 			//根据传入的配置，自定义一个弹窗
-			showPop: function(option,isClear) {
+			showPop: function(option, isClear) {
 				let def = {
 					key: '',
 					showPop: true, //是否显示弹窗
@@ -86,7 +95,12 @@
 					showSlot: false,
 					buttonCancelText: '',
 					showCancel: false,
-					cancelCallback: null
+					cancelCallback: null,
+					visible:false,
+					promptPlaceholder:'',
+					type:'custom',
+					showHeader:false,
+					headerTxt:''
 				}
 				let json = {};
 				let keys = Object.keys(def);
@@ -96,13 +110,9 @@
 
 					json[key] = def[key];
 				}
-				if (option) {
-					keys = Object.keys(option);
-					for (let i = 0; i < keys.length; i++) {
-						let key = keys[i];
 				
-						json[key] = option[key];
+				if (option) {
-					}
+					Object.assign(json, option);
 				}
 
 				if (!json.borderColor) {
@@ -110,8 +120,10 @@
 					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);
@@ -119,7 +131,7 @@
 				return json;
 			},
 			//弹出预定好的三种弹窗			
-			showMsg(msg,btnTxt, type,okCallback) {
+			showMsg(msg, btnTxt, type, okCallback) {
 
 				let cfg = {
 					error: {
@@ -147,25 +159,25 @@
 				}
 
 
-				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:'确定',
+					buttonText: btnTxt ? btnTxt : '确定',
-					okCallback: okCallback?okCallback:this.closePop
+					okCallback: okCallback ? okCallback : this.closePop
 				};
 				return this.showPop(options);
 
 			},
 			//清除所有弹窗
-			clearPops(){
+			clearPops() {
-				this.Msgboxs=[];
+				this.Msgboxs = [];
 			},
 			//获取当前所有弹窗的数量
-			getPops(){
+			getPops() {
 				return this.Msgboxs.length;
 			}
 		}
@@ -173,15 +185,15 @@
 </script>
 
 <style>
-.msgBox{
+	.msgBox {
 		position: fixed;
 		top: 0;
 		left: 0;
 		width: 100%;
 		height: 100%;
-	z-index: 9999;
+		z-index: 99999;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-}
+	}
 </style>

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>

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',

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__A21EF43",
     "description" : "设备管控",
     "versionName" : "1.0.18",
-    "versionCode" : "100",
+    "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,22 @@
                 },
                 "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"
+                            }
+                        }
                     }
                 }
             },
@@ -170,7 +183,8 @@
     "fallbackLocale" : "zh-Hans",
     "app-harmony" : {
         "distribute" : {
-            "modules" : {}
+            "modules" : {},
+            "bundleName" : "uni.app.UNIA21EF43.Hommey"
         }
     }
 }

pages.json

@@ -440,6 +440,13 @@
 			"style": {
 				"navigationBarTitleText": "蓝牙添加设备"
 			}
+		},
+		{
+			"path" : "pages/6075J/BJQ6075J",
+			"style" : 
+			{
+				"navigationStyle": "custom"
+			}
 		}
 
 	],

pages/100/HBY100.vue

@@ -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',

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',

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,

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,

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'
 						}
@@ -786,8 +786,11 @@
 										iconUrl: "/static/images/common/success.png",
 									});
 									
+									setTimeout(()=>{
 										ble.sendString(f.deviceId, "transmit complete", f.writeServiceId, f
 										.wirteCharactId);
+									},1000);
+									
 									these.rgb565Data = null;
 									resolve();
 									return;
@@ -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(() => {

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,
@@ -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;

pages/6170/deviceControl/index.vue

@@ -52,6 +52,12 @@
 							{{ 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">
 						<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
 						<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
@@ -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,6 +660,9 @@
 				// 使用节流防止指令发送过于频繁
 				if (now - this.lastBrightnessTime > 200) { // 200毫秒节流
 					this.lastBrightnessTime = now;
+
+					let mqSend = () => {
+
 						// 增加轻微的震动反馈，提升手感
 						uni.vibrateShort({
 							type: 'light'
@@ -446,8 +679,38 @@
 							}
 						})
 					}
+
+					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: '设备已离线',
@@ -455,11 +718,7 @@
 						});
 						return;
 					}
-				let value = e.detail.value;
+
-				if (value < 10) {
-					value = 10;
-				}
-				this.sliderValue = value;
 					let data = {
 						deviceId: this.computedDeviceId,
 						instructValue: this.sliderValue + '.00',
@@ -475,6 +734,30 @@
 							})
 						}
 					})
+
+				}
+
+
+				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();
+				}
 			},
 			selectMode(type) {
 				this.modeType = type;
@@ -537,6 +820,11 @@
 			// 灯光模式的确认
 			handleSumbit() {
 
+
+				if (this.selectedItemIndex === null) return;
+				const selectedItem = this.items[this.selectedItemIndex];
+
+				let mqSend = () => {
 					if (this.deviceInfo.onlineStatus !== 1) {
 						uni.showToast({
 							title: '设备已离线',
@@ -544,8 +832,7 @@
 						});
 						return;
 					}
-				if (this.selectedItemIndex === null) return;
+
-				const selectedItem = this.items[this.selectedItemIndex];
 					let data = {
 						deviceId: this.computedDeviceId,
 						instructValue: selectedItem.instructValue,
@@ -569,14 +856,44 @@
 							})
 							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() {
+
+				const instructValue = this.isLaserOn ? 0 : 1;
+
+				let mqSend = () => {
 					if (this.deviceInfo.onlineStatus !== 1) {
 						uni.showToast({
 							title: '设备已离线',
@@ -584,7 +901,7 @@
 						});
 						return;
 					}
-				const instructValue = this.isLaserOn ? 0 : 1;
+
 					let data = {
 						deviceId: this.computedDeviceId,
 						instructValue: instructValue,
@@ -607,7 +924,33 @@
 								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() {
@@ -638,8 +981,9 @@
 						uni.navigateTo({
 							url: "/pages/6155/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,6 +1005,8 @@
 					});
 					return;
 				}
+
+				let mqSend = () => {
 					if (this.deviceInfo.onlineStatus !== 1) {
 						uni.showToast({
 							title: '设备已离线',
@@ -668,6 +1014,8 @@
 						});
 						return;
 					}
+
+					let loadingShown = false;
 					// 显示上传加载状态
 					uni.showLoading({
 						title: '图片上传中...',
@@ -747,6 +1095,174 @@
 							}
 						}
 					});
+				}
+
+				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,7 +1279,8 @@
 				})
 			},
 			// 发送人员信息
-			async sendPersonnelInfo() {
+			sendPersonnelInfo() {
+				let mqSend = async () => {
 					if (this.isSending) return;
 					const requiredFields = [{
 							field: 'unitName',
@@ -839,6 +1356,160 @@
 						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();
+				}
 			},
 			// 所有弹框，确定关闭按钮
 			onPopupConfirm() {
@@ -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>

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,

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,

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,

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: '主灯模式',
@@ -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;
 
 			},

pages/common/index/index.vue

@@ -665,7 +665,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"
 				// }

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. 信息的存储与安全

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>

utils/BleHelper.js

@@ -1601,7 +1601,7 @@ class BleHelper {
 					// console.log("正在连接" + deviceId);
 					uni.createBLEConnection({
 						deviceId: deviceId,
-						timeout: 30000,
+						timeout: 15000,
 						success: (info) => {
 							//释放连接锁
 							

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",

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;