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

670人员登记调整，蓝牙成功不再走后端

Browse Source
This commit is contained in:
liub
2025-10-09 14:34:22 +08:00
parent c556b802e4
commit 4f3a8bb3ec
15 changed files with 360 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pages/650/HBY650.vue
View File

@ -1246,14 +1246,14 @@
these.setBleFormData();
let json = {
deviceId: these.device.id,
name: these.formData.company,
position: these.formData.name,
unitName: these.formData.job,
code: these.formData.id
};
usrApi.sendUsr(json)
// let json = {
// deviceId: these.device.id,
// name: these.formData.company,
// position: these.formData.name,
// unitName: these.formData.job,
// code: these.formData.id
// };
// usrApi.sendUsr(json)
return;
}

44
pages/670/HBY670.vue
View File

@ -282,7 +282,7 @@
request,
baseURL
} from '../../utils/request';
import lnglatConvert from '@/utils/wgs84_to_gcj02.js'
const pagePath = "pages/670/HBY670";
var ble = null;
@ -369,6 +369,7 @@
showClose: false
},
usrToggle: true,
bleLinkCnt:0
},
formData: {
battary: "", //电量
@ -380,9 +381,9 @@
modeCurr: "", //档位
SOS: "", //sos
lightCurr: "qiang", //照明模式
company: "", //单位
usrname: "", //姓名
job: "", //职位
company: "湖北消防总队", //单位
usrname: "胡红军", //姓名
job: "中队长", //职位
usrid: "", //id
msgTxt: "", //消息1
qzwarn: false, //是否强制报警
@ -469,6 +470,7 @@
var device = data.data;
these.Status.apiType = data.apiType;
these.device = device;
these.formData.usrid = device.deviceImei;
if (data.apiType !== 'listA') {
Common.getdeviceShareId(data.data.id).then(res => {
if (res.code == 200) {
@ -523,7 +525,10 @@
},
methods: {
showBleUnConnect() {
this.Status.bleLinkCnt++;
if(this.Status.bleLinkCnt>3){
return;
}
this.showPop({
message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
@ -557,8 +562,9 @@
});
},
gotoMap() {
this.detailData.longitude = this.formData.Lon;
this.detailData.latitude = this.formData.Lat;
let lnglat=lnglatConvert.wgs84_to_gcj02(this.formData.Lon,this.formData.Lat);
this.detailData.longitude = lnglat[0];
this.detailData.latitude = lnglat[1];
uni.navigateTo({
url: '/pages/common/map/index',
events: {
@ -2196,14 +2202,14 @@
hideLoading(these);
let json = {
deviceId: these.device.id,
name: these.formData.company,
position: these.formData.usrname,
unitName: these.formData.job,
code: these.formData.usrid
};
api.sendUsr(json)
// let json = {
// deviceId: these.device.id,
// name: these.formData.company,
// position: these.formData.usrname,
// unitName: these.formData.job,
// code: these.formData.usrid
// };
// api.sendUsr(json)
return;
}
@ -2221,7 +2227,7 @@
let s = (text.length * 2).toString(16);
let len = String(s).padStart(4, '0')
len = len.match(/.{1,2}/g);
// 填充头部
dataView.setUint8(0, 0x55); // 帧头
dataView.setUint8(1, 0x03); // 帧类型：文字
@ -2251,10 +2257,10 @@
// 发送下一个包
currentPacket++;
setTimeout(sendNextPacket, 0);
setTimeout(sendNextPacket, 2000);
}).catch(err => {
if (err.code == '10007') {
setTimeout(sendNextPacket, 0);
setTimeout(sendNextPacket,2000);
} else {
requestSend();
}
@ -2276,7 +2282,7 @@
these.HoldYouHand("word transmit start", 120, f.deviceId, f.writeServiceId, f
.wirteCharactId).then(
() => {
setTimeout(sendText, 200);
setTimeout(sendText, 2000);
}).catch((ex) => {
requestSend();
// console.log("握手没有成功", ex);

18
pages/7305/BJQ7305.vue
View File

@ -67,7 +67,7 @@
<text class="smallTxt">泛光模式</text>
</view>
</view> -->
<view class="mode fleft" v-on:click.stop="UploadOpenImg()">
<view class="mode marginLeft fleft" v-on:click.stop="UploadOpenImg()">
<view class="leftImg">
<image class="img" src="/static/images/6155/DeviceDetail/open.png" mode="aspectFit"></image>
</view>
@ -611,7 +611,7 @@
let clength = 0;
for (let j = 0; j < item.length; j++) {
const element = item[j];
console.log("第" + i + "包,第" + j + "小包，长度:" + element.length)
// console.log("第" + i + "包,第" + j + "小包，长度:" + element.length)
length += element.length;
clength += element.length;
@ -714,7 +714,7 @@
//发送数据包
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId,
30)
1000)
.then(() => {
let curr = childPacket + (currentPacket - 1) *
@ -732,10 +732,10 @@
childPacket++;
}
setTimeout(sendNextPacket, 100);
setTimeout(sendNextPacket, 1000);
}).catch(err => {
if (err.code == 10007) {
setTimeout(sendNextPacket, 100);
setTimeout(sendNextPacket, 1000);
return;
}
@ -927,7 +927,7 @@
text: "请稍候..."
});
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30).then(() => {
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 100).then(() => {
this.formData.mode = mode;
this.setBleFormData();
}).catch((ex) => {
@ -1091,7 +1091,7 @@
let inteval = parseInt(this.inteval ? this.inteval : 50);
console.log("inteval=", inteval)
ble.sendData(f.deviceId, buffer, f.writeServiceId, f
.wirteCharactId, 30).then(() => {
.wirteCharactId, 100).then(() => {
curr++;
setTimeout(sendNext, inteval);
@ -1259,7 +1259,7 @@
if (f) {
// 发送数据
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30);
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 100);
}
@ -1301,7 +1301,7 @@
if (f) {
// 发送数据
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 30);
ble.sendData(f.deviceId, buffer, f.writeServiceId, f.wirteCharactId, 100);
}

142
pages/common/addBLE/addEquip.vue
View File

@ -10,7 +10,7 @@
<view class="imgContent center">
<view class="img center">
<image src="/static/images/common/bluetooth.png" class="titleIco" mode="aspectFit">
<image src="/static/images/BLEAdd/bluetooth.png" class="titleIco" mode="aspectFit">
</image>
</view>
@ -44,19 +44,31 @@
</view>
</view>
<view class="lblTitle">搜索设备</view>
<view class="lblTitle">
<text>搜索设备</text>
<view @click="refreshBleList()">刷新</view>
</view>
<view class="list searchList">
<view class="item" v-on:click="Link(item,index)" v-for="item, index in EquipMents"
v-show="!item['linkStatu']">
<view class="leftImg ">
<image src="/static/images/common/bluetooth.png" class="titleIco" mode="heightFix">
<image src="/static/images/BLEAdd/bluetooth.png" class="titleIco" mode="heightFix">
</image>
</view>
<view class="centertxt ">
<view class="name" v-text="item.name?item.name:'Unnamed'"></view>
<view class="id" v-text="item.deviceId"></view>
<view class="name">
<text>{{item.name?item.name:'Unnamed'}}</text>
</view>
<view class="id" >
<text>信号强度:{{110+item.RSSI>100?100:110+item.RSSI}}%</text>
</view>
</view>
<view class="rightIco center">
<image :src="isItemLink(item,index)" class="img" mode="aspectFit">
</image>
</view>
@ -154,34 +166,34 @@
these = this;
ble = bleTool.getBleTool();
//已连接过但删除了设备
let delArr = ble.data.deletedEqs.map(v => {
return {
"deviceId": v.deviceId,
"name": v.name,
"RSSI": -99,
"localName": v.name,
}
});
//已连接过但没绑定过的设备
let noDev = ble.data.LinkedList.filter(v => {
return !(v.device && v.device.id);
}).map(v => {
return {
"deviceId": v.deviceId,
"name": v.name,
"RSSI": -99,
"localName": v.name,
}
});
delArr = delArr.concat(noDev);
// let delArr = ble.data.deletedEqs.map(v => {
// return {
// "deviceId": v.deviceId,
// "name": v.name,
// "RSSI": -99,
// "localName": v.name,
// }
// });
// //已连接过但没绑定过的设备
// let noDev = ble.data.LinkedList.filter(v => {
// return !(v.device && v.device.id);
// }).map(v => {
// return {
// "deviceId": v.deviceId,
// "name": v.name,
// "RSSI": -99,
// "localName": v.name,
// }
// });
// delArr = delArr.concat(noDev);
console.log("可能搜不到的设备=", delArr);
this.EquipMents = delArr;
// console.log("可能搜不到的设备=", delArr);
this.EquipMents = []; //delArr;
ble.addDeviceFound((arr) => {
// console.log("发现新设备，",arr);
arr = arr.devices;
for (var i = 0; i < arr.length; i++) {
@ -190,15 +202,18 @@
continue;
}
let f = these.EquipMents.find(function(v) {
return v.deviceId == arr[i].deviceId;
let f = these.EquipMents.find((v, index) => {
if (v.deviceId == arr[i].deviceId) {
// v.RSSI=arr[i].RSSI;//同一设备上报更新信号强度
these.$set(these.EquipMents[index], 'RSSI', arr[i].RSSI);
return true;
}
return false;
});
if (!f) {
if (arr[i].deviceId == '35:06:00:EF:46:51') {
console.log("EquipMents=", these.EquipMents);
console.log("arr[i]=", arr[i]);
}
console.log("发现新设备，", arr[i]);
arr[i].name=arr[i].name.replace('JQZM-','');
these.EquipMents.push(arr[i]);
} else {
@ -237,7 +252,7 @@
// this.EquipMents = [];
this.PairEquip = [];
// this.PairEquip = [];
ble && ble.StartSearch().then(res => {
console.log("开始搜索成功", res);
}).catch((ex) => {
@ -248,6 +263,23 @@
});
},
methods: {
refreshBleList() {
if (!ble) {
return;
}
console.log("111111");
ble.StopSearch().then(res => {
console.log("停止搜索成功");
this.EquipMents = [];
ble.StartSearch().then(result => {
console.log("开始搜索成功");
}).catch(err => {
console.log("err=", err);
});
}).catch(ex => {
console.log("ex=", ex);
});
},
isItemLink: function(item, index) {
let src = '/static/images/BLEAdd/noLink.png';
@ -458,7 +490,7 @@
}
.content {
background-color: #1d1d1d;
background-color: #121212;
color: #ffffffde;
box-sizing: border-box;
overflow: hidden;
@ -533,6 +565,7 @@
.animate .titleIco {
width: 36rpx;
height: 36rpx;
}
.circle {
@ -542,7 +575,7 @@
animation: expand 4s infinite ease-out;
display: inline-block;
transform: translate(-50%, -50%);
border:1rpx solid #bbe6003d;
}
.circle:nth-child(2) {
@ -561,7 +594,7 @@
}
100% {
width: 18.75rem;
@ -575,10 +608,10 @@
padding: 30rpx;
box-sizing: border-box;
width: 100%;
height: calc(100% - 400rpx);
height: calc(100% - 300rpx);
overflow-y: scroll;
position: absolute;
top: 400rpx;
top: 300rpx;
left: 0rpx;
}
@ -594,6 +627,13 @@
width: 100%;
height: 28rpx;
line-height: 28rpx;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
align-items: center;
justify-content: space-between;
margin-bottom: 20rpx;
}
.list {
@ -608,9 +648,10 @@
.list .item {
width: 100%;
height: 120rpx;
min-height: 120rpx;
height: auto;
box-sizing: border-box;
padding: 30rpx;
padding: 20rpx;
border-radius: 8px;
background: #1a1a1a;
display: flex;
@ -627,7 +668,7 @@
}
.list .item .centertxt {
width: calc(100% - 150rpx);
width: calc(100% - 100rpx);
height: 100%;
padding-left: 10rpx;
display: flex;
@ -640,14 +681,21 @@
}
.list .item .rightIco {
width: 50rpx;
width: 40rpx;
height: 100%;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
justify-content: space-between;
align-items: center;
}
.list .item .leftImg .titleIco {
width: 100%;
height: 100%;
filter:invert(100%);
}
.list .item .name {
@ -662,7 +710,7 @@
.list .item .id {
color: #ffffff99;
font-family: "PingFang SC";
font-size: 24rpx;
font-size: 26rpx;
font-weight: 400;
line-height: 36rpx;
text-align: left;
@ -670,8 +718,8 @@
.list .item .rightIco .img {
width: 45rpx;
height: 45rpx;
width: 40rpx;
height: 40rpx;
}
.openBlue {