增加102J蓝牙协议待设备验证

Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
新增102J设备控制页
2026-04-17 09:45:02 +08:00 · 2026-04-14 16:25:00 +08:00 · 2026-04-14 16:24:52 +08:00 · 2026-04-07 11:29:13 +08:00 · 2026-04-07 11:29:02 +08:00 · 2026-04-07 11:25:23 +08:00
33 changed files with 5705 additions and 1500 deletions
--- a/api/102J/hby102jBleProtocol.js
+++ b/api/102J/hby102jBleProtocol.js
@ -0,0 +1,159 @@
+/**
+ * HBY102J 晶全应用层协议：下行 FA … FF，上行 FB/FC … FF。
+ * 与 HBY100-J 使用同一颗蓝牙模组 / 同一套 GATT（AE30 + AE03 写 + AE02 通知），
+ * 见 `api/100J/HBY100-J.js` 中 SERVICE_UUID / WRITE / NOTIFY；仅帧语义与 100J 不同。
+ */
+
+export const HBY102J_SERVICE = '0000AE30-0000-1000-8000-00805F9B34FB'
+export const HBY102J_WRITE = '0000AE03-0000-1000-8000-00805F9B34FB'
+export const HBY102J_NOTIFY = '0000AE02-0000-1000-8000-00805F9B34FB'
+
+function buildFaFrame(func, dataBytes = []) {
+	return [0xfa, func & 0xff, ...dataBytes.map((b) => b & 0xff), 0xff]
+}
+
+const BYTE_TO_RADAR = {
+	0: 'status_off',
+	1: 'status_2M',
+	2: 'status_4M',
+	3: 'status_7M',
+	4: 'status_10M'
+}
+
+const BYTE_TO_LED = {
+	0: 'led_off',
+	1: 'led_flash',
+	2: 'led_low_flash',
+	3: 'led_steady',
+	4: 'led_alarm'
+}
+
+const RADAR_KEY_TO_BYTE = {
+	status_off: 0,
+	status_2M: 1,
+	status_4M: 2,
+	status_7M: 3,
+	status_10M: 4,
+	status_on: 1
+}
+
+const LED_KEY_TO_BYTE = {
+	led_off: 0,
+	led_flash: 1,
+	led_low_flash: 2,
+	led_steady: 3,
+	led_alarm: 4
+}
+
+export function encodeChannelSet(channelDecimal1to80) {
+	const ch = Math.max(1, Math.min(80, Number(channelDecimal1to80) || 1))
+	return buildFaFrame(0x21, [ch])
+}
+
+export function encodeOnline(on) {
+	return buildFaFrame(0x22, [on ? 1 : 0])
+}
+
+export function encodeRadarFromUiKey(sta_RadarType) {
+	const b = RADAR_KEY_TO_BYTE[sta_RadarType] !== undefined ? RADAR_KEY_TO_BYTE[sta_RadarType] : 0
+	return buildFaFrame(0x23, [b])
+}
+
+export function encodeWarningLightFromLedKey(ledKey) {
+	const m = LED_KEY_TO_BYTE[ledKey] !== undefined ? LED_KEY_TO_BYTE[ledKey] : 0
+	return buildFaFrame(0x24, [m])
+}
+
+export function encodeQueryOnlineCount() {
+	return buildFaFrame(0x25, [0])
+}
+
+export function encodeQueryPower() {
+	return buildFaFrame(0x26, [])
+}
+
+function formatMacFromBytes(u8, start, len) {
+	const hex = []
+	for (let i = 0; i < len; i++) {
+		hex.push(u8[start + i].toString(16).padStart(2, '0'))
+	}
+	return hex.join(':').toUpperCase()
+}
+
+/**
+ * 解析设备上行一帧（Notify），输出与 HBY102 页 formData 对齐的字段
+ */
+export function parseHby102jUplink(u8) {
+	const out = {}
+	if (!u8 || u8.length < 3) return out
+
+	const h = u8[0]
+	const func = u8[1]
+	const tail = u8[u8.length - 1]
+
+	if (tail !== 0xff && u8.length >= 4) {
+		// 非标准结尾时仍尽量解析
+	}
+
+	if (h === 0xfc && u8.length >= 8 && u8[7] === 0xff) {
+		out.sta_address = formatMacFromBytes(u8, 1, 6)
+		return out
+	}
+
+	if (h !== 0xfb) return out
+
+	switch (func) {
+		case 0x21:
+			if (u8.length >= 4) {
+				out.sta_Channel = u8[2]
+			}
+			break
+		case 0x22:
+			out.sta_Online = u8[2] === 1 ? 'E49_on' : 'E49_off'
+			break
+		case 0x23:
+			out.sta_RadarType = BYTE_TO_RADAR[u8[2]] !== undefined ? BYTE_TO_RADAR[u8[2]] : 'status_off'
+			break
+		case 0x24:
+			out.sta_LedType = BYTE_TO_LED[u8[2]] !== undefined ? BYTE_TO_LED[u8[2]] : 'led_off'
+			break
+		case 0x25:
+			if (u8.length >= 4) {
+				out.sta_onlineQuantity = u8[2]
+			}
+			break
+		case 0x26:
+			if (u8.length >= 5) {
+				out.sta_PowerPercent = u8[2]
+				out.sta_charge = u8[3]
+			}
+			break
+		case 0x27:
+			if (u8.length >= 9) {
+				out.sta_PowerPercent = u8[2]
+				out.sta_charge = u8[3]
+				out.sta_Channel = u8[4]
+				out.sta_LedType = BYTE_TO_LED[u8[5]] !== undefined ? BYTE_TO_LED[u8[5]] : 'led_off'
+				out.sta_RadarType = BYTE_TO_RADAR[u8[6]] !== undefined ? BYTE_TO_RADAR[u8[6]] : 'status_off'
+				out.sta_Online = u8[7] === 1 ? 'E49_on' : 'E49_off'
+			}
+			break
+		case 0x28:
+			if (u8.length >= 10) {
+				const peerMac = formatMacFromBytes(u8, 2, 6)
+				const ev = u8[8]
+				if (ev === 0x01) {
+					out.sta_sosadd = peerMac
+					out.sta_Intrusion = 1
+				} else if (ev === 0x02) {
+					out.sta_sosadd_off = peerMac
+				} else if (ev === 0x03) {
+					out.sta_tomac = peerMac
+				}
+			}
+			break
+		default:
+			break
+	}
+	return out
+}
--- a/components/MsgBox/MsgBox.vue
+++ b/components/MsgBox/MsgBox.vue
@ -6,10 +6,12 @@
 			: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"
+			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" :showSlot="item.showSlot"
 			:showHeader="item.showHeader" :headerTxt="item.headerTxt"
 		
-			@cancelPop="cancelClick(item,index)" />
+			@cancelPop="cancelClick(item,index)" >
+			<slot />
+			</MessagePopup>
 	</view>
 </template>

@ -48,10 +50,10 @@
 				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);
@ -79,7 +81,7 @@
 					showPop: true, //是否显示弹窗
 					popType: 'custom',
 					bgColor: '#383934bd',
-					borderColor: '#BBE600',
+					borderColor: '#BBE6004d',
 					textColor: '#ffffffde',
 					buttonBgColor: '#BBE600',
 					buttonTextColor: '#232323DE',
@ -116,7 +118,7 @@
 				}

 				if (!json.borderColor) {
-					json.borderColor = '#BBE600';
+					json.borderColor = '#BBE6004d';
 					json.buttonBgColor = '#BBE600';
 				}
 				json.showPop = true;
@ -137,21 +139,37 @@
 					error: {
 						icoUrl: '/static/images/common/uploadErr.png',
 						borderColor: "#e034344d",
-						buttonBgColor: "#E03434"
+						buttonBgColor: "#E03434",
+						bgColor:'#38393466',
+						buttonTextColor:'#FFFFFFde'
 					},
 					succ: {
 						icoUrl: '/static/images/common/success.png',
-						borderColor: "#BBE600",
-						buttonBgColor: "#BBE600"
+						borderColor: "#BBE6004d",
+						buttonBgColor: "#BBE600",
+						bgColor:'#38393466'
 					},
 					warn: {
 						icoUrl: '/static/images/common/warning.png',
-						borderColor: "#FFC84E",
+						borderColor: "#FFC84E4d",
 						buttonBgColor: "#FFC84E",
+						bgColor:'#38393466'
 					},
 					info:{						
-						borderColor: "#BBE600",
-						buttonBgColor: "#BBE600"
+						borderColor: "#BBE6004d",
+						buttonBgColor: "#BBE600",
+						bgColor:'#38393466'
+					},
+					prompt:{
+						
+						
+						borderColor: "#aed6004d",
+						buttonBgColor: "#aed600",
+						bgColor:'#38393466',
+						buttonTextColor:'#232323de',
+						showSlot:true,
+						showCancel:true,
+						buttonCancelText:'取消'
 					}
 				}

@ -171,7 +189,13 @@
 					borderColor: cfg[type].borderColor,
 					buttonBgColor: cfg[type].buttonBgColor,
 					buttonText: btnTxt ? btnTxt : '确定',
-					okCallback: okCallback ? okCallback : this.closePop
+					okCallback: okCallback ? okCallback : this.closePop,
+					buttonTextColor:cfg[type].buttonTextColor,
+					bgColor:cfg[type].bgColor,
+					showSlot:cfg[type].showSlot,
+					showCancel:cfg[type].showCancel,
+					buttonCancelText:cfg[type].buttonCancelText
+					
 				};
 				return this.showPop(options);

--- a/components/global-loading/global-loading.vue
+++ b/components/global-loading/global-loading.vue
@ -142,8 +142,7 @@
 		align-items: center;
 		justify-content: center;
 		transform: translateZ(0);		
-		/* 启用GPU加速 */
-		margin-top: -150rpx;
+		margin-top: 0rpx;
 	}

 	/* 刻度容器 */
--- a/pages.json
+++ b/pages.json
@ -339,6 +339,14 @@
 				"navigationBarTitleText" : "HBY102"
 			}
 		},
+		{
+			"path" : "pages/102J/HBY102J",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"navigationBarTitleText" : "HBY102"
+			}
+		},
 		{
 			"path" : "pages/common/user/logOff",
 			"style" : 
@ -459,6 +467,13 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path": "pages/210/HBY210",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "HBY210"
+			}
 		}

 	],
--- a/pages/008A/HBY008A.vue
+++ b/pages/008A/HBY008A.vue
@ -66,7 +66,9 @@
 		</view>
 	
 		<ProParams :id="device.id"></ProParams>
+		
 		<MsgBox ref="msgPop" />
+			
 		<global-loading ref="loading" />
 	</view>
 </template>
@ -85,7 +87,8 @@
 		MsgClose,
 		MsgWarning,
 		showPop,
-		MsgInfo
+		MsgInfo,
+		MsgPrompt
 	} from '@/utils/MsgPops.js'
 	import Common from '@/utils/Common.js';
 	import BleTool from '@/utils/BleHelper.js'
@ -227,7 +230,7 @@

 			eventChannel = this.getOpenerEventChannel();

-			eventChannel.on('detailData', function(data) {
+			eventChannel.on('detailData', (data)=> {
 				
 				console.log("收到父页面的参数：" + JSON.stringify(data));
 				var device = data.data;
@ -1196,7 +1199,7 @@
 	.navbarRight .img {
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}

 	.uni-navbar--fixed {
--- a/pages/018A/HBY018A.vue
+++ b/pages/018A/HBY018A.vue
@ -623,7 +623,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+					buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/100/HBY100.vue
+++ b/pages/100/HBY100.vue
@ -1360,7 +1360,7 @@ onFreqChanging(e){
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@ -58,6 +58,11 @@
 					<text class="value"
 						:class="deviceInfo.onlineStatus===0?'red':'green'">{{ deviceInfo.onlineStatus === 0 ? '离线': '在线' }}</text>
 				</view>
+				<view class="item">
+					<text class="lbl">充电状态</text>
+					<text class="value"
+						>{{ deviceInfo.chargingStatus === 0 ? '未充电': '充电中' }}</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)">
@ -192,6 +197,16 @@
 				</view>
 			</view>
 			<ProParams :id="device.id"></ProParams>
+			
+			<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"
+								:buttonCancelText="Status.Pop.buttonCancelText" :showCancel="Status.Pop.showCancel"
+								@cancelPop="closePop" />
+								
 			<MsgBox ref="msgPop" />
 		</view>
 	</view>
@ -794,6 +809,14 @@
 						that.formData.strobeFrequency = that.normalizeStrobeFreq(that.formData.strobeFrequency);
 						that.deviceInfo = res.data;
 						that.$nextTick(() => that.sync100JBleUiFromHelper && that.sync100JBleUiFromHelper());
+						// 语音频闪报警：0=关闭，1=开启 ui7是播放的状态
+						const voiceBroadcast = res.data.voiceBroadcast;
+						if (voiceBroadcast === 1) {
+							console.log('wo shi shui ');
+							that.formData.sta_VoiceType = '7'
+						} else {
+							that.formData.sta_VoiceType = '-1'
+						}
 						const strobeEnable = res.data.strobeEnable ?? 0; // 0=关闭，1=开启
 						const strobeMode = res.data.strobeMode ?? 0; // 0=红闪、1=蓝闪、3=红色顺时针...
 						if (strobeEnable === 1) {
@ -1037,7 +1060,7 @@
 					const data = {
 						deviceIds: [this.deviceInfo.deviceId],
 						voiceStrobeAlarm: 1,
-						mode: this.formData.sta_VoiceType
+						mode: item.key
 					};
 					deviceForceAlarmActivation(data).then((res) => {
 						if (res.code === 200) {
@ -1056,7 +1079,7 @@
 					const data = {
 						deviceId: this.deviceInfo.deviceId,
 						voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1,
-						mode: this.formData.sta_VoiceType,
+						mode: item.key,
 						voiceStrobeAlarm: this.deviceInfo.voiceStrobeAlarm
 					};
 					deviceVoiceBroadcast(data).then((res) => {
@ -1506,7 +1529,7 @@
 					option.buttonBgColor = '#BBE600';
 				}
 				these.Status.Pop.showPop = true;
-                showPop(option,this);
+                
 			},
 			btnClick() {

--- a/pages/100Y/HBY100Y.vue
+++ b/pages/100Y/HBY100Y.vue
@ -1196,7 +1196,7 @@
 	.navbarRight .img {
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}

 	.uni-navbar--fixed {
--- a/pages/102/HBY102.vue
+++ b/pages/102/HBY102.vue
@ -1365,7 +1365,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/102J/HBY102J.vue
+++ b/pages/102J/HBY102J.vue
--- a/pages/210/HBY210.vue
+++ b/pages/210/HBY210.vue
--- a/pages/210/HBY210Old.vue
+++ b/pages/210/HBY210Old.vue
--- a/pages/4877/BJQ4877.vue
+++ b/pages/4877/BJQ4877.vue
@ -1252,7 +1252,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/4877/BJQ4877V1.vue
+++ b/pages/4877/BJQ4877V1.vue
@ -748,7 +748,7 @@ import request, { baseURL } from '@/utils/request.js';
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/6075J/BJQ6075J.vue
+++ b/pages/6075J/BJQ6075J.vue
@ -1912,7 +1912,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					showCancel: true,
 					okCallback: function() {
 						console.log("1111");
@ -2858,7 +2858,7 @@
 	.navbarRight .img {
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}

 	.uni-navbar--fixed {
--- a/pages/6107/BJQ6107.vue
+++ b/pages/6107/BJQ6107.vue
@ -840,7 +840,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@ -708,7 +708,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 						// console.log("1111");
 						uni.navigateTo({
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@ -688,7 +688,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 						// console.log("1111");
 						uni.navigateTo({
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@ -556,7 +556,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					showCancel: true,
 					okCallback: function() {
 						console.log("1111");
--- a/pages/6331/BJQ6331.vue
+++ b/pages/6331/BJQ6331.vue
@ -739,7 +739,7 @@ import request, { baseURL } from '@/utils/request.js';
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/650/HBY650.vue
+++ b/pages/650/HBY650.vue
@ -822,7 +822,7 @@ import request, { baseURL } from '@/utils/request.js';
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {

 						uni.navigateTo({
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@ -180,7 +180,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/lightImg/jieNActive.png':'/static/images/lightImg/jieN.png'"
+						   :src="formData.lightCurr=='close'?'/static/images/lightImg/closeLightActive.png':'/static/images/lightImg/closeLight.png'"
 						   mode="aspectFit"></image>
 				</view>
 				<view class="txt">关闭</view>
@ -340,7 +340,7 @@
                        borderColor: '#BBE600',
                        textColor: '#ffffffde',
                        buttonBgColor: '#BBE600',
-                        buttonTextColor: '#232323DE',
+                        buttonTextColor: '#FFFFFFDE',

                        iconUrl: '',
                        message: '您确定要这样做吗？',
@ -725,7 +725,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					showCancel: true,
 					cancelCallback: () => {
 						// this.closePop();
@ -1178,6 +1178,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
 						buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@ -1221,6 +1222,7 @@
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
 								buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);

 						}).finally(() => {
@ -1286,6 +1288,7 @@
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
                                buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);

 						}).finally(() => {
@ -1368,6 +1371,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@ -1440,6 +1444,7 @@
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
                                buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);

 						}).finally(() => {
@ -1562,6 +1567,7 @@
 							iconUrl: "/static/images/common/uploadErr.png",
 							borderColor: "#e034344d",
 							buttonBgColor: "#E03434",
+                            buttonTextColor:"#FFFFFFde",
 							okCallback: OpenSOS,
 							buttonText: "开启"
 						},these);
@ -1591,6 +1597,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
 						buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@ -1633,6 +1640,7 @@
 								iconUrl: "/static/images/common/uploadErr.png",
 								borderColor: "#e034344d",
                                buttonBgColor: "#E03434",
+                                buttonTextColor: "#FFFFFFde"
 							},these);

 						}).finally(() => {
@ -2193,6 +2201,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@ -2314,6 +2323,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@ -2532,6 +2542,7 @@
 						iconUrl: "/static/images/common/uploadErr.png",
 						borderColor: "#e034344d",
                        buttonBgColor: "#E03434",
+                        buttonTextColor: "#FFFFFFde",
 						okCallback: null,
 						buttonText: "确定"
 					},these)
@ -2922,17 +2933,15 @@
 	}

 	.usrinfo .btnSend {	
-		line-height: 65rpx;
-		border-radius: 8px;
-		width: 120rpx;
-		height: 65rpx;
+	background-color: rgb(187, 230, 0);
 	color: rgba(35, 35, 35, 0.87);
-		font-family: PingFang SC;
-		font-size: 24rpx;
-		font-weight: 400;
-		letter-spacing: 0.15rpx;
+	height: 50rpx;
+	line-height: 50rpx;
+	border-radius: 16rpx;
+	font-size: 26rpx;
+	width: 112rpx;
+	white-space: nowrap;
 	text-align: center;
-		background-color: #BBE600;
 	}

 	.usrinfo .item {
@ -3330,7 +3339,7 @@
 	.navbarRight .img{
 		width: 35rpx;
 		height: 35rpx;
-		margin-right: 20rpx;
+		margin-right: 30rpx;
 	}
 	.uni-navbar--fixed{
 		top:0rpx;
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@ -628,7 +628,7 @@
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#232323de',
+                    buttonTextColor: '#FFFFFFde',
 					okCallback: function() {
 						console.log("1111");
 						uni.navigateTo({
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@ -357,8 +357,12 @@
 									device.isTarget = true;
 								}
 							}
+							// 102J：与 100J 同 AE30 芯片；协议不同。广播名一般为 HBY102J-xxxxxx（见协议）
+							if (device.name && /^HBY102J/i.test(device.name)) {
+								device.isTarget = true;
+							}
 							if (device.name) {
-								device.name = device.name.replace('JQZM-', '');
+								device.name = device.name.replace(/^JQZM-/i, '').replace(/^HBY102J-/i, '');
 							}
 							these.EquipMents.push(device);
 						}
@ -399,9 +403,9 @@
 							return;
 						}

-						if (receivData.str.indexOf('mac address:') > -1 || receivData.str.indexOf(
-								'sta_address') > -1 ||
-							(receivData.bytes[0] === 0xFC && receivData.bytes.length >= 7)) {
+						if ((receivData.str && (receivData.str.indexOf('mac address:') > -1 || receivData.str.indexOf(
+								'sta_address') > -1)) ||
+							(receivData.bytes && receivData.bytes[0] === 0xFC && receivData.bytes.length >= 7)) {

 							if (f.macAddress && these.device) {

--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@ -88,6 +88,7 @@
 				</view>
 				<!-- 按钮组 -->
 				<view class="popup-buttons">
+					<button class="btn cancelBtn" @click="closePopup('delete')">取消</button>
 					<button class="btn agreeBtn" @click="handleBtn">确定</button>
 				</view>
 			</view>
@ -98,14 +99,15 @@
 				<view class="popup-content">
 					<view>
 						<view class="popup-flex">
-							<text>设备名称</text>
-							<input type="text" v-model="deviceName" placeholder="请输入设备名称" class="popup-input"
+							<text>名称</text>
+							<input type="text" v-model="deviceName" placeholder="请输入名称" class="popup-input"
 								@click.stop />
 						</view>
 					</view>
 				</view>
 				<!-- 按钮组 -->
 				<view class="popup-buttons" style="margin-top:50rpx;">
+					<button class="btn cancelBtn" @click="closePopup('rename')">取消</button>
 					<button class="btn agreeBtn4" @click="handleBtnName">确定</button>
 				</view>
 			</view>
@ -878,12 +880,25 @@
 		text-align: center;
 		/* 文字居中 */
 		/* 设置最小宽度 */
+		
+		position: relative;
 	}

-	.active {
-		color: rgba(187, 230, 0, 1);
-		border-bottom: 6rpx solid rgba(187, 230, 0, 1);
+	.tab-item.active {
+		color: #bbe600;
+		
 		height: 60rpx;
+		font-weight: bold;
+	}
+	.tab-item.active::before{
+		content: "";
+		background-color:  #bbe600;
+		position: absolute;
+		top: 90%;
+		left:35%;
+		width: 30%;
+		height: 6rpx;
+		border-radius: 6rpx;
 	}

 	.sendFlex {
@ -1133,14 +1148,32 @@
 		border-radius: 40rpx;
 		padding: 30rpx;
 		text-align: center;
-		border: 1px solid rgba(255, 200, 78, 0.3);
+		border: 1px solid #E034344d;
 	}

+
+	.cancelBtn{
+		
+		
+		text-align: center;
+		width: 170rpx !important;
+		background-color: #00000000;
+	}
+	
+	.agreement-popupC .cancelBtn{
+		border:1rpx solid #E034344d;
+		color:#E03434;
+	}
+	
+	.agreement-popupD .cancelBtn{
+		border: 1rpx solid rgba(255, 255, 255, 0.6);
+		color:rgba(255, 255, 255, 0.6);
+	}
 	.agreement-popupD {
-		width: 70%;
+		width: 75%;
 		background-color: rgb(42, 42, 42);
 		border-radius: 40rpx;
-		padding: 40rpx;
+		padding: 40rpx 5rpx;
 		text-align: center;
 		border: 1px solid rgba(187, 230, 0, 0.3);
 	}
@ -1162,6 +1195,7 @@
 		font-size: 28rpx;
 		text-align: left;
 		text-indent: 5rpx;
+		width: calc(100% - 75rpx);
 	}

 	.svg {
@ -1182,8 +1216,8 @@

 	/* 同意按钮 */
 	.agreeBtn {
-		background: #FFC84E;
-		color: #232323;
+		background: #E03434;
+		color: #FFFFFF;
 		border: none;
 		width: 170rpx !important;
 	}
--- a/static/images/670/qiangActive.png
+++ b/static/images/670/qiangActive.png
--- a/static/images/670/ruoActive.png
+++ b/static/images/670/ruoActive.png
--- a/static/images/common/dell.png
+++ b/static/images/common/dell.png
--- a/static/images/lightImg/closeLight.png
+++ b/static/images/lightImg/closeLight.png
--- a/static/images/lightImg/closeLightActive.png
+++ b/static/images/lightImg/closeLightActive.png
--- a/utils/BleReceive.js
+++ b/utils/BleReceive.js
@ -2,6 +2,9 @@ import Common from '@/utils/Common.js'
 import {
 	parseBleData
 } from '@/api/100J/HBY100-J.js'
+import {
+	parseHby102jUplink
+} from '@/api/102J/hby102jBleProtocol.js'
 import {
 	MsgSuccess,
 	MsgError,
@ -14,7 +17,9 @@ import {

 class BleReceive {
 	constructor(_ref) {
+		if(_ref){
 			this.ref = _ref;	
+		}		
 		this.StorageKey = "linkedDevices";
 		this.HandlerMap = {
 			'/pages/6155/deviceDetail': this.Receive_6155.bind(this),
@ -25,9 +30,11 @@ class BleReceive {
 			'/pages/4877/BJQ4877': this.Receive_4877.bind(this),
 			'/pages/100/HBY100': this.Receive_100.bind(this),
 			'/pages/102/HBY102': this.Receive_102.bind(this),
+			'/pages/102J/HBY102J': this.Receive_102J.bind(this),
 			'/pages/6170/deviceControl/index': this.Receive_6170.bind(this),
 			'/pages/100J/HBY100-J': this.Receive_100J.bind(this),
-			'/pages/6075J/BJQ6075J': this.Receive_6075.bind(this)
+			'/pages/6075J/BJQ6075J': this.Receive_6075.bind(this),
+			'/pages/210/HBY210':this.Receive_210.bind(this),
 		};

 	}
@ -63,15 +70,24 @@ class BleReceive {


 	ReceiveData(receive, f, path, recArr) {
-		// 100J：首页等场景 LinkedList 项可能未带齐 mac/device，但语音分片上传依赖 parseBleData 消费 FB 05
+		// AE30 服务：100J 与 102J 为同一套蓝牙芯片（GATT 相同），应用层协议不同。
+		// 100J：f 未就绪时仍需 parseBleData 消费 FB 05 等语音/文件应答。
+		// 102J：上行 FB 21–28 为晶全协议，不得走 100J parseBleData，避免误触发语音/文件回调。
 		const sid = receive && receive.serviceId ? String(receive.serviceId) : '';
-		const is100JAe30 = /ae30/i.test(sid);
+		const isAe30 = /ae30/i.test(sid);
 		const fReady = f && f.macAddress && f.device && f.device.id;
-		if (is100JAe30 && receive && receive.bytes && receive.bytes.length >= 3 && !fReady) {
+		const u8Early = receive && receive.bytes && receive.bytes.length >= 4
+			? new Uint8Array(receive.bytes)
+			: null;
+		const is102JFbControl = u8Early && u8Early[0] === 0xfb && u8Early[u8Early.length - 1] === 0xff
+			&& u8Early[1] >= 0x21 && u8Early[1] <= 0x28;
+		if (isAe30 && receive && receive.bytes && receive.bytes.length >= 3 && !fReady) {
+			if (!is102JFbControl) {
 				try {
 					parseBleData(new Uint8Array(receive.bytes));
 				} catch (e) {
-				console.warn('[100J] ReceiveData 兜底解析失败', e);
+					console.warn('[100J/AE30] ReceiveData 兜底 parseBleData 失败', e);
+				}
 			}
 			return receive;
 		}
@ -100,8 +116,8 @@ class BleReceive {
 			}

 		} else {
-			// 100J AE30 二进制帧在 f 不完整时已在上方 parseBleData，此处不再误报「无法处理」
-			if (!is100JAe30) {
+			// AE30：100J 在 f 不完整时已在上方 parseBleData；102J 控制帧被有意跳过 parseBleData
+			if (!isAe30) {
 				console.error("已收到该消息,但无法处理", receive, "f:", f);
 			}
 		}
@ -941,6 +957,147 @@ class BleReceive {

 	}

+	Receive_102J(receive, f, path, recArr) {
+		let receiveData = {}
+		try {
+			if (receive && receive.bytes && receive.bytes.length >= 3) {
+				receiveData = parseHby102jUplink(new Uint8Array(receive.bytes))
+			}
+
+			let recCnt = recArr.find((v) => {
+				return v.key.replace(/\//g, '').toLowerCase() == f.device.detailPageUrl
+					.replace(/\//g, '').toLowerCase()
+			})
+			if (!recCnt) {
+				let msgs = []
+				if (receiveData.sta_PowerPercent <= 20 && receiveData.sta_charge == 0) {
+					msgs.push("设备'" + f.device.deviceName + "'电量低")
+				}
+				if (receiveData.sta_Intrusion === 1) {
+					msgs.push("设备'" + f.device.deviceName + "'闯入报警中")
+				}
+				if (this.ref && msgs.length > 0) {
+					const text = msgs.join(',')
+					MsgError(text, '', this.ref, () => {
+						MsgClear(this.ref)
+					})
+				}
+			}
+
+			if (f.device && path === 'pages/common/index') {
+				let linkKey = '102J_' + f.device.id + '_linked'
+				let warnKey = '102J_' + f.device.id + '_warning'
+				let time = new Date()
+
+				if (receiveData.sta_tomac) {
+					if (receiveData.sta_tomac.indexOf(':') === -1) {
+						receiveData.sta_tomac = receiveData.sta_tomac.replace(/(.{2})/g, '$1:').slice(0, -1)
+					}
+					uni.getStorageInfo({
+						success: function(res) {
+							let arr = []
+							let linked = {
+								linkId: f.linkId,
+								read: false,
+								linkEqs: [{
+									linkTime: time,
+									linkMac: f.macAddress
+								}, {
+									linkTime: time,
+									linkMac: receiveData.sta_tomac
+								}]
+							}
+							if (res.keys.includes(linkKey)) {
+								arr = uni.getStorageSync(linkKey)
+							}
+							if (arr.length === 0) {
+								arr.unshift(linked)
+							} else {
+								let dev = arr.find((v) => {
+									if (v.linkId === f.linkId) {
+										let vl = v.linkEqs.find((cvl) => {
+											if (cvl.linkMac === receiveData.sta_tomac) {
+												v.read = false
+												cvl.linkTime = time
+												return true
+											}
+											return false
+										})
+										if (!vl) {
+											v.linkEqs.push({
+												linkTime: time,
+												linkMac: receiveData.sta_tomac
+											})
+										}
+										return vl
+									}
+									return false
+								})
+								if (!dev) {
+									arr.unshift(linked)
+								}
+							}
+							uni.setStorage({
+								key: linkKey,
+								data: arr
+							})
+						}
+					})
+				}
+
+				let warnArrs = []
+				let guid = Common.guid()
+				if (receiveData.sta_sosadd) {
+					if (receiveData.sta_sosadd.indexOf(':') === -1) {
+						receiveData.sta_sosadd = receiveData.sta_sosadd.replace(/(.{2})/g, '$1:').slice(0, -1)
+					}
+					warnArrs.push({
+						linkId: f.linkId,
+						read: false,
+						key: guid,
+						warnType: '闯入报警',
+						warnMac: receiveData.sta_sosadd,
+						warnTime: time,
+						warnName: ''
+					})
+				}
+
+				if (receiveData.sta_LedType === 'led_alarm' || receiveData.ins_LedType === 'led_alarm') {
+					warnArrs.push({
+						linkId: f.linkId,
+						read: false,
+						key: guid,
+						warnType: '强制报警',
+						warnMac: f.macAddress,
+						warnTime: time,
+						warnName: ''
+					})
+				}
+
+				if (warnArrs.length > 0) {
+					uni.getStorageInfo({
+						success: function(res) {
+							let arr = []
+							if (res.keys.includes(warnKey)) {
+								arr = uni.getStorageSync(warnKey)
+								arr = warnArrs.concat(arr)
+							} else {
+								arr = warnArrs
+							}
+							uni.setStorage({
+								key: warnKey,
+								data: arr
+							})
+						}
+					})
+				}
+			}
+		} catch (error) {
+			receiveData = {}
+			console.log('Receive_102J 解析失败', error)
+		}
+		return receiveData
+	}

 	Receive_6075(receive, f, path, recArr) {
 		let receiveData = {};
@ -970,6 +1127,34 @@ class BleReceive {
 		return receiveData;

 	}
+	Receive_210(receive, f, path, recArr) {
+		let receiveData = {};
+
+		try {
+
+			receiveData = JSON.parse(receive.str);
+
+			let recCnt = recArr.find(v => {
+				return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
+					.replace(/\//g, "").toLowerCase();
+			});
+			if (!recCnt && this.ref) {
+				if (receiveData.sta_PowerPercent <= 20 && (receiveData.sta_system != 3 || receiveData.sta_system !=1)) {
+					
+						MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+							MsgClear(this.ref);
+						});
+					
+				}
+			}
+
+		} catch (error) {
+			receiveData = {};
+			console.log("文本解析失败", error)
+		}
+		return receiveData;
+
+	}
 }


--- a/utils/MsgPops.js
+++ b/utils/MsgPops.js
@ -2,7 +2,8 @@ var MsgType = {
 	error: "error",
 	succ: "succ",
 	warn: "warn",
-	info:'info'
+	info:'info',
+	prompt:'prompt'
 }
 var time = null;
 // 显示成功
@ -74,6 +75,26 @@ export const MsgInfo = (msg, btnTxt, ev, isClear,btnCallback) => {
 	return option;


+}
+
+//显示捕获窗口,用于自定义弹窗内容
+export const MsgPrompt = ( ev,refName, btnCallback,isClear) => {
+	if (!ev) {
+
+		return null;
+	}
+	if (!ev.$refs[refName]) {
+
+		return null;
+	}
+	let option = ev.$refs[refName].showMsg("", "", MsgType.prompt,btnCallback);
+	if (isClear === undefined || isClear) {
+		createClear(ev);
+	}
+
+	return option;
+
+
 }

 // 隐藏loading
Author	SHA1	Message	Date
微微一笑	736f24839f	增加102J蓝牙协议待设备验证	2026-04-17 09:45:02 +08:00
fengerli	c6a33832d4	Merge branch 'main' of http://47.107.152.87:3000/dyf/APP	2026-04-14 16:25:00 +08:00
fengerli	899078534d	新增102J设备控制页	2026-04-14 16:24:52 +08:00
liubiao	d82ae6445e	Merge pull request 'new-20250827 优化蓝牙订阅在首页的弹窗' (#42 ) from liubiao/APP:new-20250827 into main Reviewed-on: dyf/APP#42	2026-04-07 11:29:13 +08:00
liubiao	e94dfd6fe5	Merge branch 'main' into new-20250827	2026-04-07 11:29:02 +08:00
liub	bb49564646	调整一些组件样式	2026-04-07 11:25:23 +08:00
fengerli	f67bad8895	Merge branch 'main' of http://47.107.152.87:3000/dyf/APP	2026-04-07 09:08:21 +08:00
fengerli	57c8631070	1	2026-04-07 08:55:09 +08:00
liub	6715507125	修复100J一个小报错	2026-04-06 17:28:15 +08:00