merge upstream

api/100J/HBY100-J.js

@@ -81,3 +81,11 @@ export function deviceUpdateVolume(data) {
 	data:data
   })
 }
+// 语音播放
+export function deviceVoiceBroadcast(data) {
+  return request({
+    url: `/app/hby100j/device/voiceBroadcast`,
+    method: 'post',
+	data:data
+  })
+}

config/index.js

@@ -5,10 +5,10 @@ const config = {
 		BASE_URL: 'http://192.168.2.34:8000',//http://139.224.253.23:8000
 		API_PREFIX: '',
 		// MQTT 配置
-		MQTT_HOST: 'www.cnxhyc.com',
+		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 8083,
+		MQTT_PORT: 9083,
 		MQTT_USERNAME: 'admin',
-		MQTT_PASSWORD: '#YtvpSfCNG'    
+		MQTT_PASSWORD: '#YtvpSfCNG' 
 	},
 	// 生产环境
 	production: {

pages/100J/audioManager/AudioList.vue

@@ -1,34 +1,36 @@
 <template>
 	<view class="maincontent contentBg">
-		<mescroll-uni class="device-list" @init="     " @down="downCallback" @up="upCallback" :up="upOption"
+		<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
 			:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in dataListA" class="li" :key="index" :ref="'swipeItem_' + index">
-					<view class="itemIcon center" :class="{'displayNone':!Status.isEdit,'check':isCheck(item,index)}"
+					<view class="itemIcon center"
-						v-on:click.stop="checkToggle(item,index)">
+						:class="{ 'displayNone': !Status.isEdit, 'check': isCheck(item, index) }"
-						<image class="img" :class="{'displayNone':!isCheck(item,index)}"
+						v-on:click.stop="checkToggle(item, index)">
+						<image class="img" :class="{ 'displayNone': !isCheck(item, index) }"
 							src="/static/images/common/gou.png" mode="aspectFit"></image>
 					</view>
-					<view class="itemMain " :class="{'Edit':Status.isEdit}">
+					<view class="itemMain " :class="{ 'Edit': Status.isEdit }">
 						<uni-swipe-action-item :right-options="Options" @click="handleSwipeClick($event, item, index)"
 							class="device-card ">
-							<view @click.stop="handleFile(item,index)">
+							<view @click.stop="handleFile(item, index)">
 								<view class="item">
 									<view class="itemLeft ">
 										<view class="title">{{ item.fileNameExt }}</view>
 										<view class="smallTitle">
 											<!-- 展示前端生成的时间 -->
-											<text>{{item.createTime || Common.DateFormat(new Date(), "yyyy年MM月dd日")}}</text>
+											<text>{{ item.createTime || Common.DateFormat(new Date(),
-											<text v-show="item.duration">{{item.duration}}秒</text>
+												"yyyy年MM月dd日") }}</text>
-											<image :class="{'displayNone':!item.fileUrl}" class="img"
+											<text v-show="item.duration">{{ item.duration }}秒</text>
+											<image :class="{ 'displayNone': !item.fileUrl }" class="img"
 												src="/static/images/100/volume.png" mode="aspectFit"
-												@click.stop="play(item,index)"></image>
+												@click.stop="play(item, index)"></image>
 										</view>
 									</view>
 									<view class="itemRight ">
-										<view class="btn" @click.stop="Apply(item,index)"
+										<view class="btn" @click.stop="Apply(item, index)"
-											:class="{'active':item.useStatus,'btn-default':!item.useStatus}">
+											:class="{ 'active': item.useStatus, 'btn-default': !item.useStatus }">
-											{{item.useStatus==1 ?'使用中':'使用'}}
+											{{ item.useStatus == 1 ? '使用中' : '使用' }}
 										</view>
 									</view>
 									<view class="clear"></view>
@@ -40,7 +42,7 @@
 			</uni-swipe-action>
 		</mescroll-uni>
 		<view class="footer">
-			<view class="addContent" :class="{'displayNone':Status.isEdit}">
+			<view class="addContent" :class="{ 'displayNone': Status.isEdit }">
 				<view class="addItem" @click="gotoRecord('Record')">
 					<view class="imgContent center">
 						<image class="img" src="/static/images/100/record.png" mode="aspectFit"></image>
@@ -60,7 +62,7 @@
 					<view class="txt">文字转语音</view>
 				</view>
 			</view>
-			<view class="editContent" :class="{'displayNone':!Status.isEdit}">
+			<view class="editContent" :class="{ 'displayNone': !Status.isEdit }">
 				<view class="btn-del" @click.stop="delCheckList()">删除</view>
 			</view>
 		</view>
@@ -80,6 +82,12 @@
 			<audio :src="cPlay.src" :id="cPlay.Id" :name="cPlay.name" author="">
 		</view> -->
 		<global-loading ref="loading"></global-loading>
+		<!-- 圆形进度条 + 全屏遮罩层（升级中显示） -->
+		<view v-if="isUpdating" class="mask-layer">
+			<view class="circle-progress-box">
+				<progress :percent="updateProgress" activeColor="#bbe600" backgroundColor="#686767" :border-radius='22' show-info stroke-width="15" class="custom-progress" />
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -91,6 +99,7 @@
 	var timeout = null;
 	import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue'
 	import BleTool from '@/utils/BleHelper.js'
+	import MqttClient from '@/utils/mqtt.js';
 	import {
 		deviceVoliceList,
 		videRenameAudioFile,
@@ -114,6 +123,7 @@
 					isEdit: false,
 					playState: '',
 					playPath: '',
+					mqttClient: null,
 					Pop: {
 						showPop: false, //是否显示弹窗
 						popType: 'custom',
@@ -193,7 +203,10 @@
 					createTime: "", //创建时间
 					fileUrl: "", //本地地址
 					fileUrl: "", //网络地址
-				}
+				},
+				updateProgress: 0, // 升级进度，0-100
+				isUpdating: false, // 是否正在升级（控制进度条显示/隐藏）
+				mqttSubscribeSuccess: false // MQTT订阅是否成功
 			}
 		},
 		onLoad() {
@@ -212,7 +225,10 @@
 			console.log("页面返回")
 		},
 		onUnload() {
-			console.log("页面卸载了");
+			// 页面卸载时断开MQTT连接
+			if (this.mqttClient) {
+				this.mqttClient.disconnect();
+			}
 		},
 		methods: {
 			//语音管理列表
@@ -452,57 +468,72 @@
 				}
 			},
 			Apply(item, index) {
-				console.log(item, 'itemmm');
+				this.mqttClient = new MqttClient();
+				this.updateProgress = 0;
+				this.isUpdating = true;
 				let data = {
 					id: item.id
 				}
 				deviceUpdateVoice(data).then((RES) => {
 					if (RES.code == 200) {
+						this.updateProgress = 0;
+						this.isUpdating = true;
+						this.mqttClient.connect(() => {
+							// 订阅来自设备的状态更新
+							const statusTopic = `status/894078/HBY100/${this.device.deviceImei}`;
+							this.mqttClient.subscribe(statusTopic, (payload) => {
+								console.log(payload, 'payloadpayloadpayload');
+								try {
+									// 解析MQTT返回的payload
+									const payloadObj = typeof payload === 'string' ? JSON.parse(
+										payload) : payload;
+									// 取出进度值（用可选链避免字段不存在报错）
+									const progress = payloadObj.data?.progress;
+									if (progress !== undefined && !isNaN(progress) && progress >=
+										0 && progress <= 100) {
+										this.updateProgress = progress;
+										console.log('当前升级进度：', progress + '%');
+										// 进度到100%时，触发升级完成逻辑
+										if (progress === 100) {
+											clearTimeout(this.upgradeTimer);
+											uni.showToast({
+												title: '升级完成！',
+												icon: 'success',
+												duration: 2000
+											});
+											this.isUpdating = false;
+											setTimeout(() => {
+												uni.navigateBack();
+											}, 1500);
+										}
+									}
+								} catch (e) {
+									 clearTimeout(this.upgradeTimer);
+									console.error('解析MQTT payload失败：', e);
+								}
+							})
+						})
+					} else {
 						uni.showToast({
 							title: RES.msg,
 							icon: 'none',
 							duration: 1000
 						});
-						console.log("状态修改完成");
+
-						// eventChannel.emit('audioApply', item.Id);
-						console.log("返回上一页");
-						setTimeout(()=>{
-							uni.navigateBack();
-						},1000)
-						
 					}
-
 				})
-
+				 this.upgradeTimer = setTimeout(() => {
-				let task = () => {
+				    // 超时后执行：隐藏进度条+提示超时+重置进度
-					//let fileList = uni.getStorageSync(Common.audioStorageKey);
+				    uni.showToast({
-					// for (let i = 0; i < these.dataListA.length; i++) {
+				      title: '升级进度同步超时',
-					// 	let ele = these.dataListA[i];
+				      icon: 'none',
-					// 	if (i === index) {
+				      duration: 2000
-					// 		these.$set(these.dataListA[index], "isApply", true);
+				    });
-					// 		fileList.find(v => {
+				    this.isUpdating = false; // 关闭进度条
-					// 			if (!v.devices) {
+				    this.updateProgress = 0; // 重置进度值
-					// 				v.devices = [];
+				    // 可选：如果需要取消MQTT订阅，加这行（根据需求选择）
-					// 			}
+				    // this.mqttClient.unsubscribe(statusTopic);
-					// 			if (v.Id == ele.Id) {
+				  }, 6000); // 6000ms = 6秒，时间可直接修改
-					// 				v.devices.push(these.device.id);
-					// 				return true;
-					// 			} else {
-					// 				for (let j = 0; j < v.devices.length; j++) {
-					// 					if (v.devices[j] === these.device.id) {
-					// 						v.devices.splice(j, 1);
-					// 						break
-					// 					};
-					// 				}
-					// 			}
-					// 			return false;
-					// 		});
-					// 	} else {
-					// 		these.$set(these.dataListA[i], "isApply", false);
-					// 	}
-					// }
-
-				}
 			},
 			closePop: function() {
 				this.Status.Pop.showPop = false;
@@ -608,7 +639,18 @@
 	}
 </script>
 
-<style>
+<style  lang="less">
+.custom-progress{
+	border-radius: 10rpx;
+}
+.custom-progress .uni-progress-bar{
+	border-radius: 10rpx !important;
+}
+.custom-progress .uni-progress-info{
+	color: #BBE600;
+	font-size: 40rpx;
+	font-weight: 600;
+}
 	.popup-prompt {
 		width: 100%;
 		margin-top: 40rpx;
@@ -645,8 +687,6 @@
 
 	}
 
-	.li .itemMain {}
-
 	.li .item {
 		width: 100%;
 		height: 200rpx;
@@ -849,4 +889,28 @@
 		height: 100%;
 		justify-content: flex-end;
 	}
+
+	/* 全屏遮罩层：半透明黑色，覆盖整个页面，禁止底层滚动/点击 */
+	.mask-layer {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.7);
+		/* 半透明黑，可调整透明度 */
+		z-index: 9999;
+		/* 遮罩层层级拉满，确保在最上层 */
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		/* 让内部圆形进度条垂直+水平居中 */
+	}
+
+	/* 圆形进度条容器 */
+	.circle-progress-box {
+		position: relative;
+		width: 70%;
+		height: 100rpx;
+	}
 </style>

pages/6170/callPolice/index.vue

@@ -55,12 +55,19 @@
 	import {
 		deviceInfo,
 	} from '@/api/common/index.js'
+	// 1. 导入所有需要的报警接口
 	import {
-		deviceSendAlarmMessage
+		deviceSendAlarmMessage, //6170对应类型接口
+		deviceDefaultAlarm
 	} from '@/api/6170/callPolice.js'
+	import {
+		deviceForceAlarmActivation
+	} from '@/api/100J/HBY100-J.js'
+	// BJQ100J 对应的接口
 	import {
 		deviceRealTimeStatus //设备状态
 	} from '@/api/6170/deviceControl.js'
+
 	export default {
 		components: {
 			CustomPopup
@@ -74,12 +81,34 @@
 				popupConfirmText: '确认',
 				popupType: 'force', // 'force' or 'cancel'
 				pendingAlarmAction: '',
-				sendInfo: ''
+				sendInfo: '',
+				// 2. 核心：typeName 与接口的映射表
+				alarmApiMapping: {
+					'HBY100-J': { //100J类型
+						sendApi: deviceForceAlarmActivation,
+						statusTypeName: 'FunctionAccessBatchStatusRule_BJQ100J'
+					},
+					'BJQ6170': { //6170类型
+						sendApi: deviceSendAlarmMessage,
+						statusTypeName: 'FunctionAccessBatchStatusRule_BJQ200J'
+					}
+				},
+				loading: false,
+				total: 0
 			}
 		},
 		computed: {
 			selectedDeviceIds() {
 				return this.deviceList.filter(item => item.checked).map(item => item.id);
+			},
+			// 自动匹配当前typeName对应的接口配置
+			currentApiConfig() {
+				const currentTypeName = this.sendInfo.typeName || '';
+				// 匹配到则用对应配置，匹配不到用默认配置
+				return this.alarmApiMapping[currentTypeName] || {
+					sendApi: deviceDefaultAlarm,
+					statusTypeName: 'FunctionAccessBatchStatusRule_Default'
+				};
 			}
 		},
 		methods: {
@@ -93,15 +122,19 @@
 			// 全选/取消全选
 			selectAll() {
 				console.log('123');
-				const allSelected = this.deviceList.every(item => item.checked);
+				// 仅对在线设备进行全选/取消
+				const allSelected = this.deviceList.every(item => item.onlineStatus === 1 && item.checked);
 				this.deviceList.forEach(item => {
-					item.checked = !allSelected;
+					// 离线设备不修改checked状态
+					if (item.onlineStatus === 1) {
+						item.checked = !allSelected;
+					}
 				});
-
 				this.$forceUpdate();
 			},
 			// 获取设备列表
 			getData(deviceType) {
+				console.log(deviceType, 'deviceTypedeviceType');
 				this.loading = true;
 				let data = {
 					pageNum: 1,
@@ -127,7 +160,7 @@
 				const selectedDevices = this.deviceList.filter(item => item.checked)
 				if (selectedDevices.length === 0) {
 					uni.showToast({
-						title: '请选择一个设备',
+						title: '请选择一个在线设备',
 						icon: 'none'
 					});
 					return;
@@ -136,14 +169,13 @@
 				this.popupMessage = '确认要对所选设备开启强制报警?';
 				this.showPopupFlag = true;
 				this.pendingAlarmAction = 1
-
 			},
 			// 解除报警
 			cancelAlarm() {
 				const selectedDevices = this.deviceList.filter(item => item.checked);
 				if (selectedDevices.length === 0) {
 					uni.showToast({
-						title: '请选择一个设备',
+						title: '请选择一个在线设备',
 						icon: 'none'
 					});
 					return;
@@ -153,61 +185,61 @@
 				this.showPopupFlag = true;
 				this.pendingAlarmAction = 0
 			},
-			// 确认
+			//动态调用对应接口
 			async sendAlarmCommand() {
 				const selectedDevices = this.deviceList.filter(item => item.checked);
 				const deviceIds = selectedDevices.map(item => item.id);
 				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
 				const isAlarming = this.pendingAlarmAction == 1;
+				if (selectedDevices.length === 0) {
+					uni.showToast({
+						title: '请选择在线设备',
+						icon: 'none'
+					});
+					return;
+				}
 				try {
-
 					uni.showLoading({
 						title: isAlarming ? '设备报警中...' : '解除报警中...',
 						mask: true
 					});
-					// 2. 准备请求数据
+					// 获取当前typeName对应的接口和参数配置
-					const batchId = generateShortId();
+					const {
-					const data = {
+						sendApi,
-						deviceIds: deviceIds,
+						statusTypeName
+					} = this.currentApiConfig;
+					// 准备请求数据
+					// const batchId = generateShortId();
+					const requestData = {
+						deviceIds: deviceIds,   
 						typeName: this.sendInfo.typeName,
 						deviceImeiList: deviceImeiList,
-						batchId: batchId,
+						// batchId: batchId,
-						instructValue: this.pendingAlarmAction == 1 ? '1' : '0'
+						voiceStrobeAlarm: this.pendingAlarmAction == 1 ? '1' : '0'
 					};
-					const registerRes = await deviceSendAlarmMessage(data);
+					// 动态调用匹配的接口
-					if (registerRes.code !== 200) {
+					const registerRes = await sendApi(requestData);
+					if (registerRes.code == 200) {
 						uni.showToast({
-							title: registerRes.msg,
+							title: isAlarming ? '强制报警开启成功' : '报警已解除',
-							icon: 'none'
+							icon: 'success'
-						})
-						return
-					}
-					// 4. 获取设备状态
-					let deviceImei = this.sendInfo.deviceImei
-					let typeName = this.sendInfo.typeName
-					const statusRes = await getdeviceSTatus({
-							functionMode: 2,
-							batchId,
-							typeName:'FunctionAccessBatchStatusRule',
-							deviceImei,
-							interval: 500
-						},
-						deviceRealTimeStatus
-					);
-					if (statusRes.data.functionAccess === 'OK') {
-						uni.showToast({
-							title: statusRes.msg,
-							icon: 'none'
 						});
 						this.showPopupFlag = false
 						uni.$emit('deviceStatusUpdate', {});
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 500)
+					} else {
+						uni.showToast({
+							title: registerRes.msg || '状态查询失败',
+							icon: 'none'
+						});
 					}
+
 				} catch (error) {
+					console.error('报警操作异常：', error);
 					uni.showToast({
-						title: error.message,
+						title: '网络异常，请重试',
 						icon: 'none'
 					});
 				} finally {
@@ -217,7 +249,6 @@
 			// 点击确认状态
 			onPopupConfirm() {
 				this.sendAlarmCommand(this.popupType);
-				// 处理确认逻辑
 			},
 		},
 		onLoad(options) {
@@ -227,7 +258,6 @@
 				this.getData(data.data.id)
 				this.sendInfo = data.data
 			});
-			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
 			eventChannel.emit('ack', {})
 		},
 	}
@@ -236,7 +266,7 @@
 <style scoped>
 	.container {
 		min-height: 100vh;
-		background-color:rgb(18, 18, 18);
+		background-color: rgb(18, 18, 18);
 		box-sizing: border-box;
 		overflow-x: hidden;
 

pages/common/index/index.vue

@@ -18,11 +18,11 @@
 					<image src="/static/images/common/more.png" mode="aspectFit" class="more"></image>
 				</view>
 			</view>
-			<view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
+		<!-- 	<view class="sendFlex" v-if="activeTab && activeTab.id !== ''&& activeTabInfo.communicationMode==0 || activeTabInfo.communicationMode==2">
 				<view class="callpolice" @click="callpolice">报警</view>
 				<view class="Sendmessage" @click="location">位置</view>
-				<view class="Sendmessage" @click="handleSend">发送信息</view>
+				<view class="Sendmessage" @click="handleSend" v-if="activeTabInfo.typeName!=='HBY100-J'">发送信息</view>
-			</view>
+			</view> -->
 			<!-- <scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100" style="height:80vh;"> -->
 			<mescroll-uni class="device-list"  @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
 				:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">

utils/Common.js

@@ -307,21 +307,21 @@ export default {
 				value: "50",
 				label: "报警模式",
 				checked: false,
-				type: ['100']
+				type: ['100','100J']
 			},
 			
 			{
 				value: "51",
 				label: "警示灯",
 				checked: false,
-				type: ['100']
+				type: ['100','100J']
 			},
 			
 			{
 				value: "52",
 				label: "语音管理",
 				checked: false,
-				type: ['100']
+				type: ['100','100J']
 			},
 			
 			{
@@ -342,6 +342,12 @@ export default {
 				checked: false,
 				type: ['4877']
 			},
+			{
+				value: "56",
+				label: "灯光类型设置",
+				checked: false,
+				type: ['100J']
+			},
 		]
 
 		let arr = [];

utils/request.js

@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-export const env = 'development'; //production development  //开发of线上 改这里就行
+export const env = 'production'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options" + JSON.stringify(options), BASE.BASE_URL)
@@ -22,7 +22,7 @@ const request = (options) => {
 				.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(options.data[key])}`)
 				.join('&');
 			url += `?${params}`;
-		}
+		}  
 
 		const config = {
 			url: url,