liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

解决版本冲突

Browse Source
This commit is contained in:
liub
2025-08-18 08:49:46 +08:00
parent 535f4728ea 823c54aed7
commit 76329756c9
8 changed files with 2195 additions and 1949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/index.js
View File

@ -6,7 +6,7 @@ const config = {
API_PREFIX: '',
// MQTT 配置
MQTT_HOST: '47.120.79.150',
MQTT_PORT: 8083,
MQTT_PORT: 9083,
MQTT_USERNAME: 'admin',
MQTT_PASSWORD: '#YtvpSfCNG'
},
@ -16,7 +16,7 @@ const config = {
API_PREFIX: '',
// MQTT 配置
MQTT_HOST: '47.120.79.150',
MQTT_PORT: 8083,
MQTT_PORT: 9083,
MQTT_USERNAME: 'admin',
MQTT_PASSWORD: '#YtvpSfCNG'
}

69
pages.json
View File

@ -1,21 +1,16 @@
{
"pages": [
{
"path": "pages/common/login/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/index/index",
"style": {
"navigationStyle": "custom"
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
{
@ -39,7 +34,8 @@
{
"path": "pages/common/send/index",
"style": {
"navigationBarTitleText": "发送信息"
"navigationBarTitleText": "发送信息",
"enablePullDownRefresh": true
}
},
{
@ -66,6 +62,18 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/6170/callPolice/index",
"style": {
"navigationBarTitleText": "报警"
}
},
{
"path": "pages/210/deviceControl/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/operationVideo/index",
"style": {
@ -94,29 +102,25 @@
},
{
"path": "pages/common/addBLE/addEquip",
"style" :
{
"style": {
"navigationBarTitleText": "添加设备"
}
},
{
"path": "pages/common/addBLE/LinkBle",
"style" :
{
"style": {
"navigationBarTitleText": "扫描到的设备"
}
},
{
"path": "pages/6155/deviceDetail",
"style" :
{
"style": {
"navigationBarTitleText": "HBY 6155"
}
},
{
"path": "pages/6155/ImgCrop",
"style" :
{
"style": {
"navigationBarTitleText": "图像裁剪",
"navigationStyle": "custom",
"fullscreen": true
@ -124,8 +128,7 @@
},
{
"path": "pages/650/HBY650",
"style" :
{
"style": {
"navigationBarTitleText": "HBY650"
}
},
@ -147,7 +150,6 @@
"navigationBarTitleText": "所有分享"
}
},
{
"path": "pages/6170/share/index",
"style": {
@ -165,15 +167,38 @@
"style": {
"navigationBarTitleText": "分享管理"
}
},
{
"path": "pages/210/onlineDevice/index",
"style": {
"navigationBarTitleText": "联机设备"
}
},
{
"path": "pages/210/addDevice/index",
"style": {
"navigationBarTitleText": "添加联机设备"
}
},
{
"path": "pages/210/historyRecords/index",
"style": {
"navigationBarTitleText": "历史记录"
}
},
{
"path": "pages/210/call/index",
"style": {
"navigationBarTitleText": "呼叫"
}
}
],
"tabBar": {
"color": "#fff",
"selectedColor": "#BBE600",
"backgroundColor": "#202020",
"list": [{
"list": [
{
"pagePath": "pages/common/index/index",
"text": "我的设备",
"iconPath": "/static/tabs/device.png",

6
pages/6170/allShare/index.vue
View File

@ -249,14 +249,10 @@
},
onLoad() {
this.onIntall()
// 绑定页面做了监听,新增成功,刷新页面
uni.$on('refreshDeviceList', () => {
this.onIntall()
});
},
beforeDestroy() {
// 组件销毁前移除监听器
uni.$off('refreshDeviceList');
},
}
</script>

117
pages/6170/callPolice/index.vue
View File

@ -3,9 +3,10 @@
<!-- 设备列表 -->
<view class="allSelect" @click="selectAll"> 全选</view>
<scroll-view class="device-list" scroll-y>
<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
<view class="device-card" v-for="(item, index) in deviceList" :key="index"
@click="item.onlineStatus === 1 ? toggleSelect(index) : null">
<!-- 复选框 -->
<view class="checkbox" :class="{ checked: item.checked }">
<view class="checkbox" :class="{ checked: item.checked, disabled: item.onlineStatus !== 1 }">
<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
</view>
<!-- 设备信息 -->
@ -47,12 +48,18 @@
<script>
import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
import {
generateShortId
} from '@/utils/function.js';
import {
deviceInfo,
} from '@/api/common/index.js'
import {
deviceSendAlarmMessage
} from '@/api/6170/callPolice.js'
import {
deviceRealTimeStatus //设备状态
} from '@/api/6170/deviceControl.js'
export default {
components: {
CustomPopup
@ -60,13 +67,13 @@
data() {
return {
deviceList: [],
messageToSend: '', //发送信息
showPopupFlag: false,
popupTitle: '',
popupMessage: '确认要对所选设备开启强制报警?',
popupConfirmText: '确认',
popupType: 'force', // 'force' or 'cancel'
pendingAlarmAction: ''
pendingAlarmAction: '',
sendInfo: ''
}
},
computed: {
@ -82,6 +89,44 @@
this.deviceList[index].checked = !this.deviceList[index].checked
this.$forceUpdate()
},
/**
* 获取设备状态（带自动轮询）
* @param {number} val - 功能模式
* @param {string} batchId - 批次ID
* @param {number} [interval=1000] - 轮询间隔（毫秒）
*/
async getdeviceSTatus(val, batchId, interval =500) {
const checkStatus = async () => {
try {
const data = {
functionMode: val,
batchId: batchId,
typeName: this.sendInfo.typeName,
deviceImei: this.sendInfo.deviceImei
};
const res = await deviceRealTimeStatus(data);
if (res.code !== 200) {
throw new Error(res.msg || '请求失败');
}
switch (res.data.functionAccess) {
case 'OK':
return res; // 成功完成
case 'ACTIVE':
await new Promise(r => setTimeout(r, interval));
return checkStatus(); // 继续轮询
case 'FAILED':
throw new Error('设备操作失败');
case 'TIMEOUT':
throw new Error('设备响应超时');
default:
throw new Error('未知状态');
}
} catch (error) {
throw error;
}
};
return checkStatus();
},
// 全选/取消全选
selectAll() {
console.log('123');
@ -97,7 +142,7 @@
this.loading = true;
let data = {
pageNum: 1,
pageSize: 20,
pageSize: 50,
deviceType: deviceType
}
deviceInfo(data).then((res) => {
@ -117,7 +162,6 @@
// 强制报警
forceAlarm() {
const selectedDevices = this.deviceList.filter(item => item.checked)
const deviceIds = selectedDevices.map(item => item.id);
if (selectedDevices.length === 0) {
uni.showToast({
title: '请选择一个设备',
@ -146,18 +190,40 @@
this.showPopupFlag = true;
this.pendingAlarmAction = 0
},
sendAlarmCommand(type) {
// 确认
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;
try {
let data = {
uni.showLoading({
title: isAlarming ? '设备报警中...' : '解除报警中...',
mask: true
});
// 2. 准备请求数据
const batchId = generateShortId();
const data = {
deviceIds: deviceIds,
instructValue: this.pendingAlarmAction, // '强制或者解除'
}
deviceSendAlarmMessage(data).then((res) => {
if (res.code == 200) {
typeName: this.sendInfo.typeName,
deviceImeiList: deviceImeiList,
batchId: batchId,
instructValue: this.pendingAlarmAction == 1 ? '1' : '0'
};
const registerRes = await deviceSendAlarmMessage(data);
if (registerRes.code !== 200) {
uni.showToast({
title: res.msg,
title: registerRes.msg,
icon: 'none'
})
return
}
// 4. 获取设备状态
const statusRes = await this.getdeviceSTatus(2, batchId);
if (statusRes.data.functionAccess === 'OK') {
uni.showToast({
title: statusRes.msg,
icon: 'none'
});
this.showPopupFlag = false
@ -165,18 +231,19 @@
setTimeout(() => {
uni.navigateBack()
}, 500)
} else {
}
} catch (error) {
uni.showToast({
title: res.msg,
title: error.message,
icon: 'none'
});
} finally {
uni.hideLoading();
}
});
},
// 点击确认状态
onPopupConfirm() {
this.sendAlarmCommand(this.popupType);
// 处理确认逻辑
},
},
@ -184,7 +251,8 @@
const eventChannel = this.getOpenerEventChannel();
// 监听 'deviceSend' 事件，获取传过来的数据
eventChannel.on('devicePolice', (data) => {
this.getData(data.data)
this.getData(data.data.id)
this.sendInfo = data.data
});
// 如果需要向调用页面返回数据，可以触发 'ack' 事件
eventChannel.emit('ack', {})
@ -410,4 +478,17 @@
border: 1px solid rgba(255, 255, 255, 0.87);
background: rgba(18, 18, 18, 1);
}
.checkbox.disabled {
opacity: 0.5;
background-color: rgba(255, 255, 255, 0.1) !important;
border-color: rgba(255, 255, 255, 0.2) !important;
pointer-events: none;
/* 阻止点击事件 */
}
/* 可选：离线设备的卡片整体置灰 */
.device-card[data-offline="true"] {
opacity: 0.6;
}
</style>

370
pages/6170/deviceControl/index.vue
View File

@ -309,6 +309,7 @@ export default {
lightModeB: false,
lightModeC: false, //激光提示框
items: [],
pendingMainMode: null, // 选中的索引
isFormExpanded: true, // 默认展开
deviceID: '',
itemInfo: {},
@ -350,16 +351,9 @@ export default {
* @param {number} val - 功能模式
* @param {string} batchId - 批次ID
* @param {number} [interval=800] - 轮询间隔（毫秒）
* @param {number} [maxRetries=10] - 最大重试次数
*/
async getdeviceSTatus(val, batchId, interval = 800) {
//let retries = 0;
const checkStatus = async () => {
// if (retries >= maxRetries) {
// throw new Error('超过最大重试次数');
// }
// retries++;
try {
const data = {
functionMode: val,
@ -477,6 +471,7 @@ export default {
uni.vibrateShort({
type: 'light'
});
let data = {
deviceId: this.computedDeviceId,
instructValue: this.sliderValue + '.00',
@ -490,6 +485,13 @@ export default {
}
},
onSliderChangeEnd(e) {
if (this.deviceInfo.onlineStatus !== 1) {
uni.showToast({
title: '设备已离线',
icon: 'none'
});
return;
}
let value = e.detail.value;
if (value < 10) {
value = 10;
@ -552,28 +554,51 @@ export default {
toggleForm() {
this.isFormExpanded = !this.isFormExpanded;
},
// onItemClick(index) {
// const selectedItem = this.items[index];
// if (selectedItem.text === '激光') {
// this.lightModeC = true;
// } else {
// // 更新选中状态
// this.items = this.items.map((item, i) => ({
// ...item,
// selected: i === index
// }));
// this.currentMainMode = selectedItem.text;
// this.selectedItemIndex = index;
// // 强制更新视图（如果需要）
// this.$forceUpdate();
// }
// },
onItemClick(index) {
const selectedItem = this.items[index];
if (selectedItem.text === '激光') {
const item = this.items[index];
// 激光模式特殊处理
if (item.text === '激光') {
this.lightModeC = true;
} else {
// 更新选中状态
return;
}
// 只更新临时选中状态
this.selectedItemIndex = index;
// UI高亮效果（不影响实际模式）
this.items = this.items.map((item, i) => ({
...item,
selected: i === index
}));
this.currentMainMode = selectedItem.text;
this.selectedItemIndex = index;
// 强制更新视图（如果需要）
this.$forceUpdate();
}
// 显示临时选中的模式名称（视觉反馈）
this.pendingMainMode = item.text;
},
// 灯光模式的确认
async handleSumbit() {
handleSumbit() {
if (this.deviceInfo.onlineStatus !== 1) {
uni.showToast({
title: '设备已离线',
icon: 'none'
});
return;
}
// 防重复提交
if (this.isProcessing) return;
let loadingShown = false;
try {
uni.showLoading({
title: '处理中...',
mask: true
@ -582,52 +607,52 @@ export default {
this.isProcessing = true
if (this.selectedItemIndex === null) return;
const selectedItem = this.items[this.selectedItemIndex];
// 准备请求数据
let data = {
deviceId: this.computedDeviceId,
instructValue: selectedItem.instructValue,
deviceImei: this.itemInfo.deviceImei,
typeName: this.itemInfo.typeName,
};
// 第一个请求：设置灯光模式
const res = await lightModeSettings(data);
if (res.code !== 200) {
lightModeSettings(data).then((res) => {
if (res.code == 200) {
// 只有确认成功才更新实际模式,选中模式
this.currentMainMode = this.pendingMainMode;
this.selectedItemIndex = selectedItem;
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
// 第二个请求：获取设备状态
const statusRes = await this.getdeviceSTatus(1);
if (statusRes.data.functionAccess === 'OK') {
uni.showToast({
icon: 'none',
title: statusRes.msg
});
// 关闭弹窗
this.lightModeA = false;
}
} catch (error) {
uni.showToast({
title: error.message,
icon: 'none'
});
} finally {
uni.hideLoading();
this.lightModeA = false;
this.isProcessing = false
loadingShown = false
} else {
uni.showToast({
title: res.msg,
icon: 'none'
})
this.isProcessing = false
loadingShown = false
uni.hideLoading();
}
})
},
// 激光模式
lasermode() {
this.lightModeC = true
},
// 激光确认框提交
async handleBtn() {
handleBtn() {
if (this.deviceInfo.onlineStatus !== 1) {
uni.showToast({
title: '设备已离线',
icon: 'none'
});
return;
}
// 防重复提交
if (this.isProcessing) return;
let loadingShown = false;
try {
uni.showLoading({
title: '处理中...',
mask: true
@ -641,37 +666,27 @@ export default {
deviceImei: this.itemInfo.deviceImei,
typeName: this.itemInfo.typeName,
};
// 第一个请求
const res = await laserModeSettings(data);
if (res.code !== 200) {
uni.showToast({
title: res.msg,
icon: 'none'
})
return
}
// 第二个请求
const statusRes = await this.getdeviceSTatus(1);
if (statusRes.data.functionAccess === 'OK') {
laserModeSettings(data).then((res) => {
if (res.code == 200) {
uni.showToast({
icon: 'none',
title: statusRes.msg // 添加默认提示
title: res.msg
});
// 更新状态
this.isLaserOn = !this.isLaserOn;
this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
this.lightModeC = false;
}
} catch (error) {
this.isProcessing = false
loadingShown = false
} else {
uni.showToast({
title: error.message,
title: res.msg,
icon: 'none'
});
} finally {
uni.hideLoading();
this.isProcessing = false;
this.isProcessing = false
loadingShown = false
}
})
},
//激光取消
handleDisagree() {
@ -721,18 +736,25 @@ export default {
});
return;
}
if (this.deviceInfo.onlineStatus !== 1) {
uni.showToast({
title: '设备已离线',
icon: 'none'
});
return;
}
// 显示上传加载状态
uni.showLoading({
title: '图片上传中...',
mask: true
});
loadingShown = true
loadingShown = true;
uni.uploadFile({
url: baseURL + '/app/bjq/device/uploadLogo',
filePath: this.selectedImage,
name: 'file',
formData: {
deviceId: this.computedDeviceId,
deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
deviceImei: this.itemInfo.deviceImei,
typeName: this.itemInfo.typeName,
},
@ -740,43 +762,47 @@ export default {
'Authorization': 'Bearer ' + getToken(),
'clientid': clientid(),
},
complete: (res) => { // 使用 complete 确保 hideLoading 总能被调用
complete: async (res) => {
try {
uni.hideLoading(); // 首先关闭“
const responseData = JSON.parse(res.data);
if (responseData.code === 200) {
// 异步操作链
this.getdeviceSTatus(1)
.then(statusRes => {
uni.showLoading({
title: '等待设备响应...',
mask: true
});
try {
// 获取设备状态
const statusRes = await this.getdeviceSTatus(1);
if (statusRes.data.functionAccess === 'OK') {
uni.hideLoading();
this.selectedImage = '';
this.file = null;
this.popupType = 'logo';
this.showPopupFlag = true;
this.popupMessage = '上传成功';
this.lightModeB = false;
}
})
.catch(error => {
} catch (error) {
uni.hideLoading();
uni.showToast({
title: error.message,
icon: 'none'
});
})
.finally(() => {
uni.hideLoading(); // 在所有异步操作完成后关闭loading
});
}
} else {
uni.hideLoading();
uni.showToast({
title: responseData.msg || '上传失败',
title: responseData.msg,
icon: 'none'
});
uni.hideLoading();
}
} catch (e) {
uni.hideLoading();
uni.showToast({
title: '解析响应失败',
title: e.message,
icon: 'none'
});
uni.hideLoading();
}
}
});
@ -795,8 +821,6 @@ export default {
}
})
},
// 发送人员信息
async sendPersonnelInfo() {
if (this.isSending) return;
@ -830,6 +854,13 @@ export default {
return;
}
}
if (this.deviceInfo.onlineStatus !== 1) {
uni.showToast({
title: '设备已离线',
icon: 'none'
});
return;
}
this.isSending = true;
let loadingShown = false;
try {
@ -847,26 +878,20 @@ export default {
deviceId: this.computedDeviceId,
deviceImei: this.itemInfo.deviceImei
};
// 3. 注册人员信息
const registerRes = await registerPersonInfo(data);
if (registerRes.code !== 200) {
if (registerRes.code == 200) {
this.popupType = 'person';
this.showPopupFlag = true;
this.popupMessage = '人员信息发送成功';
} else {
uni.showToast({
title: registerRes.msg,
icon: 'none'
});
return;
}
// 4. 获取设备状态
const statusRes = await this.getdeviceSTatus(1);
// 只有当状态为'OK'时才显示成功弹窗
if (statusRes.data.functionAccess === 'OK') {
this.popupType = 'person';
this.showPopupFlag = true;
this.popupMessage = '人员信息发送成功';
}
} catch (error) {
uni.showToast({
title: error.message,
title: error.msg,
icon: 'none'
});
} finally {
@ -886,6 +911,13 @@ export default {
},
// 解除报警逻辑
async onPopupConfirmPolice() {
if (this.deviceInfo.onlineStatus !== 1) {
uni.showToast({
title: '设备已离线',
icon: 'none'
});
return;
}
try {
uni.showLoading({
title: '解除告警中...',
@ -900,7 +932,7 @@ export default {
deviceImeiList: [this.itemInfo.deviceImei],
instructValue: 0, // '解除报警'
};
// 3.人员信息
// 3.解除告警状态
const registerRes = await deviceSendAlarmMessage(data);
if (registerRes.code !== 200) {
uni.showToast({
@ -909,17 +941,22 @@ export default {
})
return
}
// 4. 获取设备状态 ，批量的报警，解除报警，发送信息，都传2，单次的都传1
// 4. 获取设备状态
const statusRes = await this.getdeviceSTatus(2, batchId);
if (statusRes.data.functionAccess === 'OK') {
uni.showToast({
title: statusRes.msg,
icon: 'none'
});
// 刷新详情接口
this.fetchDeviceDetail(this.computedDeviceId, true);
uni.$emit('deviceStatusUpdate', {});
this.showPopupFlag = false
if (this.apiType === 'listA') {
this.fetchDeviceDetail(this.computedDeviceId)
} else {
// 分享权限详情
this.fetchSharedDeviceDetail(this.itemInfo.id)
}
}
} catch (error) {
uni.showToast({
@ -932,6 +969,13 @@ export default {
},
// 发送文本消息
async sendTextMessage() {
if (this.deviceInfo.onlineStatus !== 1) {
uni.showToast({
title: '设备已离线',
icon: 'none'
});
return;
}
// 防重复提交
if (this.isSending) return;
if (!this.messageToSend) {
@ -981,6 +1025,7 @@ export default {
icon: 'none'
});
} finally {
console.log('失败还是成功了');
uni.hideLoading();
this.isSending = false;
}
@ -1002,25 +1047,9 @@ export default {
this.messageToSend = res.data.sendMsg || '';
this.sliderValue = res.data.lightBrightness || '25'
let mainLightMode = parseInt(res.data.mainLightMode);
switch (mainLightMode) {
case 0:
this.currentMainMode = '关闭';
break;
case 1:
this.currentMainMode = '强光';
break;
case 2:
this.currentMainMode = '弱光';
break;
case 3:
this.currentMainMode = '爆闪';
break;
case 4:
this.currentMainMode = '泛光';
break;
default:
console.log('未知的灯光模式:', mainLightMode);
}
// 取主灯光模式初始值
this.currentMainMode = this.getMainLightModeLabel(mainLightMode)
console.log(this.currentMainMode, 'this.currentMainMode');
const laserMode = res.data.LaserLightMode;
this.isLaserOn = laserMode === 1;
this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
@ -1033,10 +1062,11 @@ export default {
this.isSharedDevice = false;
this.activePermissions = []; // 非分享设备清空权限
}
if (!isUpdate) {
// 关闭加载中
uni.hideLoading()
}
}
},
// 检查权限的方法
hasPermission(permissionCode) {
@ -1050,25 +1080,48 @@ export default {
async fetchDeviceDetail(id, isUpdate = false) {
try {
const res = await deviceDetail(id)
if (res.code == 200) {
this.handleDeviceData(res, false, isUpdate)
} catch (error) {
} else {
uni.showToast({
title: '获取详情失败',
title: res.msg,
icon: 'none'
})
if (!isUpdate) {
uni.hideLoading()
}
}
} catch (error) {
if (!isUpdate) {
uni.hideLoading()
}
// uni.showToast({
// title: error.msg,
// icon: 'none'
// })
}
},
// 获取分享设备详情
async fetchSharedDeviceDetail(id) {
try {
const res = await deviceShareId(id)
if (res.code == 200) {
this.handleDeviceData(res, true)
} catch (error) {
} else {
uni.showToast({
title: '获取分享详情失败',
title: res.msg,
icon: 'none'
})
}
} catch (error) {
uni.showToast({
title: error.msg,
icon: 'none'
})
uni.hideLoading()
}
},
// 操作说明
operatingInst() {
@ -1103,6 +1156,17 @@ export default {
console.log('MQTT not connected, cannot query status.');
}
},
// 灯光模式共用封装共其他地方使用
getMainLightModeLabel(mode) {
const modeMap = {
0: '关闭',
1: '强光',
2: '弱光',
3: '爆闪',
4: '泛光'
}
return modeMap[mode] || (console.log('未知的灯光模式:', mode), '未知');
}
},
onLoad(options) {
@ -1127,68 +1191,59 @@ export default {
this.mqttClient.subscribe(statusTopic, (payload) => {
try {
console.log(`收到来自 ${statusTopic} 的消息:`, payload);
//收到电量上报。
const parsedMessage = typeof payload === 'string' ? JSON.parse(
payload) :
payload;
const deviceState = parsedMessage.state; // 直接取 state 数组
if (deviceState && deviceState[0] === 12) {
// 根据协议直接更新设备状态，提供即时反馈
const mainLightMode = deviceState[1];
switch (mainLightMode) {
case 0:
this.currentMainMode = '关闭';
break;
// 切换主灯光模式,亮度值设备同步
if (!deviceState) return;
// 1设备切换灯光实时返回
switch (deviceState[0]) {
case 1:
this.currentMainMode = '强光';
this.currentMainMode = this.getMainLightModeLabel(deviceState[
1]);
this.sliderValue = deviceState[2];
this.deviceInfo.batteryRemainingTime = deviceState[3];
break;
case 2:
this.currentMainMode = '弱光';
break;
case 3:
this.currentMainMode = '爆闪';
break;
case 4:
this.currentMainMode = '泛光';
break;
default:
console.log('未知的灯光模式:', mainLightMode);
}
const laserMode = deviceState[2];
this.isLaserOn = laserMode === 1;
// 12为设备实时上报
case 12:
this.currentMainMode = this.getMainLightModeLabel(deviceState[
1]);
this.isLaserOn = deviceState[2] === 1;
this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
if (this.deviceInfo) {
this.deviceInfo.batteryPercentage = deviceState[3];
this.deviceInfo.chargeState = deviceState[4];
this.deviceInfo.batteryRemainingTime = deviceState[5];
}
// 这里的10秒延迟是为了解决一个特定的后端问题：
// GPS坐标上报后，逆地址解析（将坐标转换为地址）需要一些时间。
// 如果立即请求设备详情，地址字段可能尚未更新。
// 这是一个临时解决方案，理想情况下应由后端通过消息通知或其他机制来确保数据一致性。
setTimeout(() => {
this.fetchDeviceDetail(data.data.id, true).then(() => {
// 在获取到最新信息后，再判断电量
if (this.deviceInfo.batteryPercentage < 20) {
if (this.deviceInfo.batteryPercentage <
20) {
this.popupType = 'bettery';
this.popupMessage = '请及时充电';
this.showPopupFlag = true;
}
});
if (this.apiType === 'listA') {
this.fetchDeviceDetail(data.data.id)
} else {
// 分享权限详情
this.fetchSharedDeviceDetail(data.data.id)
}
}, 10000);
// ✅ 发送全局事件通知主页面更新
// 上报电量,在列表里面同步
uni.$emit('deviceStatusUpdate', {
message: parsedMessage, // 消息内容
timestamp: new Date().getTime() // 时间戳
message: parsedMessage,
timestamp: new Date().getTime()
});
break;
default:
console.log('未知的 deviceState 类型:', deviceState[0]);
}
} catch (error) {
console.log('解析MQTT消息失败:', error, '原始消息:', payload);
}
});
// 连接成功后，立即查询一次设备状态
// mqtt连接成功后，上报一次设备状态
this.queryDeviceStatus();
})
if (this.apiType === 'listA') {
@ -1199,7 +1254,6 @@ export default {
}
});
// 如果需要向调用页面返回数据，可以触发 'ack' 事件
eventChannel.emit('ack', {
})

138
pages/common/send/index.vue
View File

@ -2,9 +2,9 @@
<view class="container">
<!-- 设备列表 -->
<scroll-view class="device-list" scroll-y>
<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="item.onlineStatus === 1 ? toggleSelect(index) : null">
<!-- 复选框 -->
<view class="checkbox" :class="{ checked: item.checked }">
<view class="checkbox" :class="{ checked: item.checked,disabled: item.onlineStatus !== 1 }">
<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
</view>
<!-- 设备信息 -->
@ -17,11 +17,9 @@
<view>设备:{{ item.deviceName }}</view>
<view class="ID">
<view class="ID">ID:{{ item.deviceImei }}</view>
<view class="onlines"
v-if="item.onlineStatus==1">在线</view>
<view class="onlines" v-if="item.onlineStatus == 1">在线</view>
<!-- 离线状态 -->
<view class="unlines"
v-if="item.onlineStatus==0">离线</view>
<view class="unlines" v-if="item.onlineStatus == 0">离线</view>
<view>电量：{{ item.battery || '0' }}%</view>
</view>
</view>
@ -34,12 +32,13 @@
<textarea placeholder-style="color:rgba(255, 255, 255, 0.4)" placeholder="请输入内容" class="textarea"
v-model="messageToSend" :maxlength="20" />
</view>
<button class="login-btn" @click="sendTextMessage">发送</button>
<button class="login-btn" @click.stop="sendTextMessage">发送</button>
</view>
</scroll-view>
<!-- 成功提示弹框 -->
<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage" icon="/static/images/common/sendSucc.png"
:confirm-text="popupConfirmText" :show-cancel="false" @confirm="onPopupConfirm" />
<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"
icon="/static/images/common/sendSucc.png" :confirm-text="popupConfirmText" :show-cancel="false"
@confirm="onPopupConfirm" />
</view>
</template>
@ -49,8 +48,12 @@
deviceInfo,
} from '@/api/common/index.js'
import {
deviceSendMessage
deviceSendMessage,
deviceRealTimeStatus //设备状态
} from '@/api/6170/deviceControl.js'
import {
generateShortId
} from '@/utils/function.js';
export default {
components: {
CustomPopup
@ -62,10 +65,55 @@
showPopupFlag: false,
popupTitle: '',
popupMessage: '信息发送成功！',
popupConfirmText: '确认'
popupConfirmText: '确认',
isSending: false,
sendInfo: {}
}
},
methods: {
onPullDownRefresh() {
// 执行下拉刷新时的操作，比如重新获取数据
this.getData();
},
/**
* 获取设备状态（带自动轮询）
* @param {number} val - 功能模式
* @param {string} batchId - 批次ID
* @param {number} [interval=1000] - 轮询间隔（毫秒）
*/
async getdeviceSTatus(val, batchId, interval = 800) {
const checkStatus = async () => {
try {
const data = {
functionMode: val,
batchId: batchId,
typeName: this.sendInfo.typeName,
deviceImei: this.sendInfo.deviceImei
};
const res = await deviceRealTimeStatus(data);
if (res.code !== 200) {
throw new Error(res.msg || '请求失败');
}
switch (res.data.functionAccess) {
case 'OK':
return res; // 成功完成
case 'ACTIVE':
await new Promise(r => setTimeout(r, interval));
return checkStatus(); // 继续轮询
case 'FAILED':
throw new Error('设备操作失败');
case 'TIMEOUT':
throw new Error('设备响应超时');
default:
throw new Error('未知状态');
}
} catch (error) {
throw error;
}
};
return checkStatus();
},
toggleSelect(index) {
this.deviceList[index].checked = !this.deviceList[index].checked
this.$forceUpdate()
@ -75,7 +123,7 @@
this.loading = true;
let data = {
pageNum: 1,
pageSize: 20,
pageSize: 50,
deviceType: deviceType
}
deviceInfo(data).then((res) => {
@ -93,9 +141,12 @@
});
},
// 发送文本消息
sendTextMessage() {
async sendTextMessage() {
// 防重复提交
if (this.isSending) return;
const selectedDevices = this.deviceList.filter(item => item.checked)
const deviceIds = selectedDevices.map(item => item.id);
const deviceImeiList = selectedDevices.map(item => item.deviceImei);
if (selectedDevices.length === 0) {
uni.showToast({
title: '请选择一个设备',
@ -105,25 +156,53 @@
}
if (!this.messageToSend) {
uni.showToast({
title: '请输入要发送的内容',
title: '请输入要发送的文字',
icon: 'none'
});
return;
}
let data = {
this.isSending = true;
let loadingShown = false;
try {
uni.showLoading({
title: '发送中...',
mask: true
});
loadingShown = true;
// 2. 准备请求数据
const batchId = generateShortId();
const data = {
sendMsg: this.messageToSend,
deviceIds: deviceIds
}
deviceSendMessage(data).then((res) => {
if (res.code == 200) {
this.showPopupFlag = true
} else {
deviceIds: deviceIds,
batchId: batchId,
typeName: this.sendInfo.typeName,
batchId: batchId,
deviceImeiList: deviceImeiList
};
// 3.人员信息
const registerRes = await deviceSendMessage(data);
if (registerRes.code !== 200) {
uni.showToast({
title: res.msg,
title: registerRes.msg,
icon: 'none'
})
return
}
// 4. 获取设备状态
const statusRes = await this.getdeviceSTatus(2, batchId);
if (statusRes.data.functionAccess === 'OK') {
// 5. 显示成功弹窗
this.showPopupFlag = true
}
} catch (error) {
uni.showToast({
title: error.message,
icon: 'none'
});
} finally {
uni.hideLoading();
this.isSending = false;
}
})
},
onPopupConfirm() {
this.showPopupFlag = false
@ -137,7 +216,8 @@
// 监听 'deviceSend' 事件，获取传过来的数据
eventChannel.on('deviceSend', (data) => {
console.log('Received detail data:', data);
this.getData(data.data)
this.getData(data.data.id)
this.sendInfo = data.data
});
// 如果需要向调用页面返回数据，可以触发 'ack' 事件
eventChannel.emit('ack', {})
@ -342,4 +422,14 @@
border-radius: 50rpx;
width: 90%;
}
.checkbox.disabled {
opacity: 0.5;
background-color: rgba(255, 255, 255, 0.1) !important;
border-color: rgba(255, 255, 255, 0.2) !important;
pointer-events: none; /* 阻止点击事件 */
}
/* 可选：离线设备的卡片整体置灰 */
.device-card[data-offline="true"] {
opacity: 0.6;
}
</style>

2
pages/common/user/index.vue
View File

@ -6,7 +6,7 @@
<image src="/static/images/common/logo.png" class="logo"></image>
</view>
<view class="user-right">
<view class="user-title">富源晟科技</view>
<view class="user-title">武汉研创</view>
<view class="ID">ID:123456</view>
</view>
</view>

4
utils/request.js
View File

@ -1,5 +1,5 @@
import config from '../config/index.js';
const env = 'development'; //production development //开发of线上 改这里就行
const env = 'production'; //production development //开发of线上 改这里就行
const BASE = config[env];
const request = (options) => {
console.log("options"+JSON.stringify(options),BASE.BASE_URL)
@ -20,7 +20,7 @@ const request = (options) => {
method: options.method || 'GET',
data: options.method !== 'GET' ? options.data : {},
header: options.header || {},
timeout: 10000,
timeout: 30000,
success: (res) => {
resolve(res.data);
},