dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new-20250827 加入008A、100Y #41

Merged
liubiao merged 10 commits from liubiao/APP:new-20250827 into main 2026-04-03 10:05:25 +08:00
Conversation 0 Commits 10 Files Changed 46 +2416 -746
44 changed files with 2416 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4391d30f86 - Show all commits

2
components/MsgBox/MsgBox.vue
View File

@ -130,7 +130,7 @@
return json;
},
//弹出预定好的三种弹窗
//弹出预定好的四种弹窗
showMsg(msg, btnTxt, type, okCallback) {
let cfg = {

7
pages.json
View File

@ -446,6 +446,13 @@
"navigationStyle": "custom",
"fullscreen": true
}
},
{
"path" : "pages/008A/HBY008A",
"style" :
{
"navigationBarTitleText" : "HBY008A"
}
}
],

1268
pages/008A/HBY008A.vue Normal file
View File

File diff suppressed because it is too large Load Diff

8
pages/6075J/BJQ6075J.vue
View File

@ -1067,13 +1067,7 @@
'0')); // 包序号
if (packetData.length == 250) {
dataView.setUint8(3, 0x01);
dataView.setUint8(4, 0xF4);
} else {
dataView.setUint8(3, 0x00);
dataView.setUint8(4, 0x64);
}
dataView.setUint16(3, packetData.length*2,false); // 包t长度
// 填充数据（每个RGB565值占2字节）
for (let i = 0; i < packetData.length; i++) {

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

@ -141,7 +141,7 @@
<!-- 人员信息登记 -->
<view class="form-section" v-if="hasPermission('4')">
<TextToHexV2 class="TextToHex" ref="textToHex" :txts="formData.textLines" :bgColor="'#FFFFFF'"
:color="'#000000'" :fontSize="12" :returnType="10" />
:color="'#000000'" :fontSize="14" :returnType="10" />
<view class="mode-buttons">
<view class="section-title">人员信息登记</view>
@ -423,7 +423,7 @@
Status: {
pageHide: null
},
inteval: 1000
inteval: 200
}
},
computed: {
@ -921,7 +921,7 @@
json.instruct[1] = parseInt(selectedItem.instructValue);
ble.sendString(f.deviceId, json).then(res => {
console.log("ble send success")
console.log("ble send success",json);
this.lightModeA = false;
}).catch(ex => {
console.error("ble send fail,mqsending....")
@ -1226,15 +1226,9 @@
dataView.setUint8(0, 0x55); // 帧头
dataView.setUint8(1, 0x02); // 帧类型：开机画面
dataView.setUint8(2, currentPacket); // 包序号
dataView.setUint16(3, packetData.length*2,false); // 包t长度
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++) {

11
pages/650/HBY650.vue
View File

@ -975,17 +975,10 @@ import request, { baseURL } from '@/utils/request.js';
// 填充头部
dataView.setUint8(0, 0x55); // 帧头
dataView.setUint8(1, 0x02); // 帧类型：开机画面
dataView.setUint8(2, '0x' + currentPacket.toString(16).padStart(2,
'0')); // 包序号
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);
}
dataView.setUint16(3, packetData.length*2,false); // 包t长度
// 填充数据（每个RGB565值占2字节）
for (let i = 0; i < packetData.length; i++) {

8
pages/670/HBY670.vue
View File

@ -1799,13 +1799,7 @@
'0')); // 包序号
if (packetData.length == 250) {
dataView.setUint8(3, 0x01);
dataView.setUint8(4, 0xF4);
} else {
dataView.setUint8(3, 0x00);
dataView.setUint8(4, 0x64);
}
dataView.setUint16(3, packetData.length*2,false); // 包t长度
// 填充数据（每个RGB565值占2字节）
for (let i = 0; i < packetData.length; i++) {

17
pages/common/addDevice/addBle.vue
View File

@ -125,7 +125,8 @@
MsgClose,
MsgWarning,
showPop,
MsgClear
MsgClear,
MsgInfo
} from '@/utils/MsgPops.js';
import MQTT from '@/utils/MqHelper.js';
@ -412,8 +413,7 @@
}
arr[i].name = arr[i].name.replace(/\r\n/g, '').replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
'');
arr[i].name = arr[i].name.replace(/\r\n/g, '').replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,'');
@ -557,13 +557,22 @@
setTimeout(()=>{
MsgSuccess("如需要在PC上查看此数据,请复制链接后在PC端打开，然后点右上角扫码授权","复制链接",these,()=>{
MsgInfo("如需要在PC上查看此数据,请复制链接后通过微信发送到PC,在PC端打开，然后点右上角扫码授权","复制链接",these,true,()=>{
console.log("执行复制");
uni.setClipboardData({
data:'https://static-mp-5b7c35fc-f6fe-4100-a2e1-3669e4d4bfc9.next.bspapp.com/AppTools/views/index.html',
success(){
uni.showToast({
title:'已复制链接'
});
plus.runtime.openURL('weixin://', (err) => {
MsgError("打开微信失败,请手动打开微信粘贴");
});
},
fail(ex){
console.error("无法复制",ex)
}
});
});