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

Merge pull request 'new-20250827' (#39) from liubiao/APP:new-20250827 into main

Browse Source 
Reviewed-on: #39
This commit is contained in:
liubiao
2026-03-24 15:18:48 +08:00
parent 0e66d375fc c286660a10
commit ded31de046
14 changed files with 438 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
App.vue
View File

@ -31,7 +31,7 @@
// uni.removeStorageSync(val);
// }
// });
uni.clearStorageSync();
// uni.clearStorageSync();
//以上代码仅在开发时使用,否则会出现不可预知的问题。
// #ifdef APP|APP-PLUS
@ -67,10 +67,10 @@
});
}
if (plus.os.name == 'Android') {
if(plus.runtime.isAgreePrivacy()){
if (plus.runtime.isAgreePrivacy()) {
initOS();
}
}else{
} else {
initOS();
}
@ -111,8 +111,12 @@
_bleDisconnectTimer = null;
let ble2 = bleTool.getBleTool();
if (ble2) {
console.log("App隐藏了,断开所有蓝牙设备,停止搜索");
ble2.StopSearch().catch(ex => {});
ble2.disconnectDevice().catch(ex => {});
console.log("断开所有蓝牙设备");
ble2.disconnectDevice();
}
}, BLE_DISCONNECT_DELAY);
// #endif

5
manifest.json
View File

@ -2,7 +2,7 @@
"name" : "星汉物联",
"appid" : "__UNI__A21EF43",
"description" : "设备管控",
"versionName" : "1.0.22",
"versionName" : "1.0.24",
"versionCode" : 101,
"transformPx" : false,
/* 5+App特有相关 */
@ -56,7 +56,8 @@
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.a\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/>"
"<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\"/>"
],
"minSdkVersion" : 21,
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],

22
pages/100/HBY100.vue
View File

@ -194,7 +194,7 @@
<view class="slider-container">
<slider min="10" max="100" step="10" :disabled="false" :value="formData.sta_LightDimmer"
activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
@change="onBrightnessChanging" @changing="onBrightnessChanging" class="custom-slider" />
@change="onBrightnessChanged" @changing="onBrightnessChanging" class="custom-slider" />
</view>
<view class="line"></view>
@ -206,7 +206,7 @@
<view class="slider-container">
<slider min="0.5" max="10" step="0.5" :disabled="false" :value="formData.sta_LightFreq"
activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
@change="onFreqChanging" @changing="onFreqChanging" class="custom-slider" />
@change="onFreqChanged" @changing="onFreqChanging" class="custom-slider" />
</view>
<view class="line"></view>
@ -218,7 +218,7 @@
<view class="slider-container">
<slider min="1" max="8" step="1" :disabled="false" :value="formData.sta_VoiceVolume"
activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
@change="onVolumeChanging" @changing="onVolumeChanging" class="custom-slider" />
@change="onVolumeChanged" @changing="onVolumeChanging" class="custom-slider" />
</view>
@ -850,9 +850,11 @@
});
},
onFreqChanging(e){
this.formData.sta_LightFreq = e.detail.value;
},
//频率
onFreqChanging(e) {
onFreqChanged(e) {
let f = this.getDevice();
// #ifdef APP-PLUS
if (!f) {
@ -897,8 +899,11 @@
}, 100);
},
onVolumeChanging(e){
this.formData.sta_VoiceVolume = e.detail.value;
},
//音量
onVolumeChanging(e) {
onVolumeChanged(e) {
let f = this.getDevice();
// #ifdef APP-PLUS
if (!f) {
@ -938,8 +943,11 @@
}, 100);
},
onBrightnessChanging(e){
this.formData.sta_LightDimmer = e.detail.value;
},
// 亮度调节
onBrightnessChanging(e) {
onBrightnessChanged(e) {
let f = this.getDevice();
// #ifdef APP-PLUS
if (!f) {

105
pages/100J/HBY100-J.vue
View File

@ -50,7 +50,8 @@
</view>
<view class="item" @click.top="bleStatuToggle">
<text class="lbl">蓝牙状态</text>
<text class="value" :class="formData.bleStatu?'green':'red'">{{device.getbleStatu}}</text>
<text class="value"
:class="(!formData.bleStatu || formData.bleStatu==='err')?'red':'green'">{{getbleStatu}}</text>
</view>
<view class="item">
<text class="lbl">设备状态</text>
@ -469,6 +470,17 @@
onLoad: function() {
const eventChannel = this.getOpenerEventChannel();
var these = this;
this.$watch("deviceInfo.batteryPercentage", (newVal, oldVal) => {
if (newVal <= 20) {
uni.showToast({
title: '设备电量低',
icon: 'none',
duration: 2000
});
}
});
eventChannel.on('detailData', function(data) {
var device = data.data;
these.device = device;
@ -609,7 +621,9 @@
}
// 尝试连接蓝牙：需先扫描获取 BLE deviceId，不能直接用 MAC；延迟 500ms 确保蓝牙适配器就绪
if (data.data.deviceMac) {
setTimeout(() => { these.tryConnect100JBle(data.data.deviceMac); }, 500);
setTimeout(() => {
these.tryConnect100JBle(data.data.deviceMac);
}, 500);
}
});
this.createThrottledFunctions();
@ -641,10 +655,53 @@
this.Status.pageHide = false;
},
computed: {
getbleStatu() {
if (this.formData.bleStatu === true) {
return '已连接';
}
if (this.formData.bleStatu === 'connecting') {
return '连接中';
}
if (this.formData.bleStatu === 'dicconnect') {
return '正在断开';
}
if (this.formData.bleStatu === 'err') {
return '连接异常';
}
return '未连接';
}
},
methods: {
bleStatuToggle() {
let f = bleTool.data.LinkedList.find((v) => {
return v.macAddress == this.device.deviceMac;
});
if (!f) {
this.tryConnect100JBle(this.device.deviceMac);
return;
}
if (this.formData.bleStatu === true) {
this.formData.bleStatu = 'dicconnect';
bleTool.disconnectDevice(f.deviceId).finally(r => {
this.formData.bleStatu = false;
});
return;
}
if (this.formData.bleStatu === false || this.formData.bleStatu === 'err') {
this.formData.bleStatu = 'connecting';
bleTool.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
these.formData.bleStatu = true;
}).catch(ex => {
these.formData.bleStatu = 'err';
});
return;
}
},
createThrottledFunctions() {
// 创建节流函数
this.throttledBrightnessChange = this.throttle(this.handleBrightnessChange, 500);
@ -1014,20 +1071,31 @@
const NOTIFY = '0000AE02-0000-1000-8000-00805F9B34FB';
if (cached && cached.deviceId) {
console.log('[100J] 使用缓存设备连接', cached.deviceId);
that.formData.bleStatu = 'connecting';
bleTool.LinkBlue(cached.deviceId, SVC, WRITE, NOTIFY, 2).then(() => {
console.log('100J 蓝牙连接成功(缓存)');
that.bleStateRecovry({ deviceId: cached.deviceId });
that.formData.bleStatu = true;
that.bleStateRecovry({
deviceId: cached.deviceId
});
}).catch(err => {
console.log('100J 蓝牙连接失败(缓存)，尝试扫描', err);
that.formData.bleStatu = 'err';
that.connect100JByScan(deviceMac, last6);
});
return;
}
// 2. 无缓存：先尝试直连。Android 上 deviceId 多为 MAC 反序(11:22:33:44:55:02->02:55:44:33:22:11)
that.formData.bleStatu = 'connecting';
const tryDirect = (id) => bleTool.LinkBlue(id, SVC, WRITE, NOTIFY, 2).then(() => {
console.log('100J 蓝牙连接成功(直连)', id);
that.bleStateRecovry({ deviceId: id });
that.formData.bleStatu = true;
that.bleStateRecovry({
deviceId: id
});
}).catch(ex => {
that.formData.bleStatu = 'err';
});
const deviceIdReversed = macToDeviceId(deviceMac);
console.log('[100J] 尝试直连', deviceIdReversed, '(MAC反序)');
@ -1070,11 +1138,16 @@
bleTool.StopSearch();
bleTool.removeDeviceFound('HBY100J_SCAN');
console.log('[100J] 扫描到目标设备', match.name, match.deviceId);
that.formData.bleStatu = 'connecting';
bleTool.LinkBlue(match.deviceId, SVC, WRITE, NOTIFY, 2).then(() => {
console.log('100J 蓝牙连接成功(扫描)');
that.bleStateRecovry({ deviceId: match.deviceId });
that.formData.bleStatu = true;
that.bleStateRecovry({
deviceId: match.deviceId
});
}).catch(err => {
console.log('100J 蓝牙连接失败，将使用4G', err);
that.formData.bleStatu = 'err';
});
}
}, 'HBY100J_SCAN');
@ -1091,6 +1164,7 @@
});
},
bleStateBreak() {
this.formData.bleStatu = false;
updateBleStatus(false, '', this.deviceInfo.deviceId);
},
bleStateRecovry(res) {
@ -1115,7 +1189,8 @@
previewImg(img) {},
bleValueNotify: function(receive, device, path, recArr) { //订阅消息
// 仅处理当前设备的数据（device 为 LinkedList 中匹配 receive.deviceId 的项）
if (device && device.device && this.deviceInfo.deviceId && device.device.id != this.deviceInfo.deviceId) return;
if (device && device.device && this.deviceInfo.deviceId && device.device.id != this.deviceInfo
.deviceId) return;
// 解析蓝牙上报数据 (协议: FC=MAC主动上报, FB=指令响应)
if (!receive.bytes || receive.bytes.length < 3) return;
const parsedData = parseBleData(receive.bytes);
@ -1144,9 +1219,7 @@
this.$set(this.deviceInfo, 'batteryRemainingTime', parsedData.batteryRemainingTime);
}
if (this.deviceInfo.batteryPercentage <= 20) {
uni.showToast({ title: '设备电量低', icon: 'none', duration: 2000 });
}
// 设备物理按键切换：蓝牙响应同步到 APP 页面（与 4G MQTT 逻辑一致）
const fc = parsedData.funcCode;
@ -1191,13 +1264,17 @@
else if (this.formData.sta_VoiceType === '7') this.formData.sta_VoiceType = '-1';
}
if (parsedData.volume !== undefined) this.formData.volume = parsedData.volume;
if (parsedData.strobeFrequency !== undefined) this.formData.strobeFrequency = parsedData.strobeFrequency;
if (parsedData.redBrightness !== undefined) this.formData.lightBrightness = parsedData.redBrightness;
if (parsedData.strobeFrequency !== undefined) this.formData.strobeFrequency = parsedData
.strobeFrequency;
if (parsedData.redBrightness !== undefined) this.formData.lightBrightness = parsedData
.redBrightness;
}
// 0x09 音量、0x0D 亮度：单独响应时同步
if (fc === 0x09 && parsedData.volume !== undefined) this.formData.volume = parsedData.volume;
if (fc === 0x0B && parsedData.strobeFrequency !== undefined) this.formData.strobeFrequency = parsedData.strobeFrequency;
if (fc === 0x0D && parsedData.redBrightness !== undefined) this.formData.lightBrightness = parsedData.redBrightness;
if (fc === 0x0B && parsedData.strobeFrequency !== undefined) this.formData.strobeFrequency = parsedData
.strobeFrequency;
if (fc === 0x0D && parsedData.redBrightness !== undefined) this.formData.lightBrightness = parsedData
.redBrightness;
},
showBleUnConnect() {},

119
pages/102/HBY102.vue
View File

@ -60,12 +60,12 @@
</view>
<view class="item" @click.top="bleStatuToggle">
<text class="lbl">蓝牙状态</text>
<text class="value" :class="formData.bleStatu?'green':'red'">{{getbleStatu}}</text>
<text class="value" :class="(!formData.bleStatu || formData.bleStatu==='err')?'red':'green'">{{getbleStatu}}</text>
</view>
<view class="item">
<text class="lbl">信道:{{formData.sta_Channel}}</text>
<text class="value green" @click.stop="ShowChannelEdit()">修改</text>
</view>
<!-- <view class="item">
<text class="lbl">设备状态</text>
<text class="value">{{formData.sta_charge?dic.sta_charge[formData.sta_charge]:"" }}</text>
</view> -->
</view>
<view class="warnnig" v-for="item,index in warnDevices">
@ -177,7 +177,14 @@
: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" @closePop="closePop" :buttonCancelText="Status.Pop.buttonCancelText"
:showCancel="Status.Pop.showCancel" @cancelPop="closePop" />
:showCancel="Status.Pop.showCancel" @cancelPop="closePop" :showSlot="Status.Pop.showSlot">
<view v-if="Status.ShowEditChannel" class="popup-prompt">
<text class="popup-prompt-title">修改信道</text>
<input class="popup-prompt-input" type="number" placeholder="1-125的整数"
placeholder-class="popup-prompt-input-placeHolder" v-model="formData.ins_Channel" />
</view>
</MessagePopup>
<!-- 下方菜单 -->
@ -221,6 +228,7 @@
curr: 0,
total: 0,
pageHide: false,
ShowEditChannel: false,
Pop: {
showPop: false, //是否显示弹窗
popType: 'custom',
@ -325,8 +333,8 @@
warnTime: '',
sta_sosadd: "",
sta_sosName: '',
sta_IntrusTime: ''
sta_IntrusTime: '',
ins_Channel:23
},
dic: {
sta_LightType: [
@ -519,7 +527,7 @@
});
}
this.getLinkedCnt();
// this.getLinkedCnt();
},
computed: {
Distance: function() {
@ -561,6 +569,73 @@
}
},
methods: {
onChannelChanging() {
let f = this.getDevice();
// #ifdef APP-PLUS
if (!f) {
this.showBleUnConnect();
return;
}
// #endif
let regex = /^([1-9]|[1-7][0-9]|80)$/;
if (!regex.test(this.formData.ins_Channel)) {
uni.showModal({
title: '提示',
content: '只能输入1-80整数'
});
return;
}
var buffer = {
ins_Channel: this.formData.ins_Channel
}
ble.sendString(f.deviceId, buffer);
},
ShowChannelEdit() {
if (!this.permissions.includes('55') && this.Status.apiType !== 'listA') {
this.showPop({
message: '无操作权限',
iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
borderColor: "#e034344d",
buttonBgColor: "#E03434",
okCallback: null,
buttonText: "确定"
})
return;
}
this.Status.ShowEditChannel = true;
this.showPop({
showPop: true, //是否显示弹窗
popType: 'custom',
bgColor: '#383934bd',
borderColor: '#BBE600',
textColor: '#ffffffde',
buttonBgColor: '#BBE600',
buttonTextColor: '#232323DE',
iconUrl: '',
message: '',
buttonText: '确定',
clickEvt: '',
visiblePrompt: false,
promptTitle: '',
modelValue: '',
visibleClose: false,
okCallback: () => {
this.onChannelChanging();
this.Status.ShowEditChannel = false;
},
showSlot: true,
buttonCancelText: '取消',
showCancel: true,
cancelCallback: () => {
this.Status.ShowEditChannel = false;
}
});
},
getLinkedCnt() { //获取在线设备的数量
let f = this.getDevice();
@ -2266,4 +2341,30 @@
/deep/ .uni-navbar--fixed {
top: 0px;
}
.popup-prompt-input {
width: 100%;
height: 60rpx;
line-height: 60rpx;
color: rgba(255, 255, 255, 0.87);
box-sizing: border-box;
border-bottom: 2rpx solid rgba(255, 255, 255, 0.4);
font-size: 28rpx;
font-weight: 400;
letter-spacing: 0.14px;
}
.popup-prompt-input-placeHolder {
color: rgba(255, 255, 255, 0.4);
font-family: PingFang SC;
font-size: 28rpx;
font-weight: 400;
letter-spacing: 0.14px;
text-align: center;
}
</style>

39
pages/102/HBY102_History.vue
View File

@ -10,8 +10,8 @@
</uni-nav-bar>
<view class="contentBg">
<view class="row">
<view class="typeItem fleft" :class="{'active':Status.tabType=='link'}" @click.stop="tabChange('link')">
连接记录</view>
<!-- <view class="typeItem fleft" :class="{'active':Status.tabType=='link'}" @click.stop="tabChange('link')">
连接记录</view> -->
<view class="typeItem fleft" :class="{'active':Status.tabType=='warn'}" @click.stop="tabChange('warn')">
报警记录</view>
<view class="filterIco fright" @click.stop="showFilter()">
@ -90,7 +90,7 @@
<view class="mothItem center" :class="{active:Status.filterDayType=='monthThree'}"
@click.stop="mothItemChange('monthThree')">近三个月</view>
<view class="mothItem center" :class="{active:Status.filterDayType=='monthOne'}"
@click.stop="mothItemChange('monthOne')" }>近一个月</view>
@click.stop="mothItemChange('monthOne')" >近一个月</view>
<view class="mothItem center" :class="{active:Status.filterDayType=='customer'}"
@click.stop="mothItemChange('customer')">自定义</view>
@ -204,7 +204,7 @@
filterMode: true, //是否筛选日期
filterDayMode: 'end', //当前筛选的是开始还是结束
filterDayType: 'customer', //当前筛选的日期是哪种类型
tabType: 'link',
tabType: 'warn',
datePickValue: [999, 999, 999] //日期选择控件绑定的值
@ -251,10 +251,10 @@
let eventChannel = this.getOpenerEventChannel();
eventChannel.on('detailData', function(data) {
eventChannel.on('detailData', (data)=> {
var device = data.data;
these.device = device;
these.tabChange('link');
this.device = device;
this.tabChange('warn');
});
@ -304,7 +304,7 @@
let today = new Date();
let end = Common.DateFormat(today, 'yyyy-MM-dd');
let start = Common.DateFormat(today.setMonth(diff), 'yyyy-MM-dd');
let start = Common.DateFormat(today.setMonth(today.getMonth()+ diff), 'yyyy-MM-dd');
this.filter.start = start;
this.filter.end = end;
@ -595,7 +595,9 @@
if (!these.Status.filterMode) {
if (these.filter.MM) {
start = new Date(these.filter.MM + '-01');
end = start.setMonth(1);
end = new Date(these.filter.MM + '-01')
end.setMonth(end.getMonth()+1);
end.setDate(end.getDate()+1);
data = data.filter(v => {
let t = v.linkEqs[0].linkTime
@ -613,7 +615,7 @@
console.log("these.filter.end=",these.filter.end);
start = new Date(these.filter.start);
end = new Date(these.filter.end);
end.setMonth(1);
end.setDate(end.getDate()+1);
console.log("start=",start);
console.log("end=",end);
if(start && end){
@ -643,7 +645,8 @@
return t >= start;
});
} else if (these.filter.end) {
end = new Date(these.filter.end).setMonth(1);
end = new Date(these.filter.end);
end.setDate(end.getDate()+1);
data = data.filter(v => {
@ -680,7 +683,7 @@
if (systemInfo.uniPlatform == 'web') {
for (let i = 0; i < 20; i++) {
const timestamp = 1710072900000 + (i * 3600000); // 每小时递增
const timestamp = new Date().getTime() - (i * 3600000); // 每小时递增
const numItems = Math.floor(Math.random() * 5) + 1; // 1-5条
const item = {
@ -740,7 +743,8 @@
console.log("hese.filter.end=" + these.filter.end);
let start = new Date(these.filter.start);
let end = new Date(these.filter.end);
end.setMonth(1);
end.setDate(end.getDate()+ 1);
data = data.filter(v => {
let t = v.warnTime
@ -748,7 +752,7 @@
t = new Date(v.warnTime);
}
return t >= start && t <= end;
return t >= start && t < end;
});
} else if (these.filter.start) {
let start = new Date(these.filter.start);
@ -762,7 +766,8 @@
return t >= start;
});
} else if (these.filter.end) {
let end = new Date(these.filter.end).setMonth(1);
let end = new Date(these.filter.end);
end.setDate(end.getDate()+ 1);
data = data.filter(v => {
let t = v.warnTime
if (!(t instanceof Date)) {
@ -774,7 +779,9 @@
} else {
if (these.filter.MM) {
let start = new Date(these.filter.MM + '-01');
let end = start.setMonth(1);
let end = new Date(these.filter.MM + '-01');
end.setMonth(end.getMonth()+1);
end.setDate(end.getDate()+1);
data = data.filter((v) => {
let t = v.warnTime
if (!(t instanceof Date)){

17
pages/6155/BJQ6155.vue
View File

@ -74,7 +74,7 @@
<view class="slider-container">
<slider min="1" max="100" step="1" :disabled="false" :value="formData.liangDu" activeColor="#bbe600"
backgroundColor="#00000000" block-size="20" block-color="#ffffffde" @change="sliderChange"
backgroundColor="#00000000" block-size="20" block-color="#ffffffde" @change="sliderChange" @changing="sliderChanging"
class="custom-slider" />
</view>
@ -385,7 +385,7 @@
}
let f = ble.data.LinkedList.find((v) => {
if (v.macAddress == device.deviceMac) {
console.log("找到设备了", v);
// console.log("找到设备了", v);
these.formData.deviceId = v.deviceId;
return true;
}
@ -824,7 +824,7 @@
let packetData = these.rgb565Data.slice(startIndex,
endIndex);
// 构建数据包
let bufferSize = os == 'Android' ? 505 :133; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
let bufferSize = os ==packetSize.length*2+5; // 5 + packetData.length * 2; // 头部5字节 + 数据部分
let buffer = new ArrayBuffer(bufferSize);
let dataView = new DataView(buffer);
@ -1784,6 +1784,9 @@
});
},
sliderChanging(evt){
this.formData.liangDu = evt.detail.value;
},
sliderChange: function(evt) {
if (!this.permissions.includes('1') && this.Status.apiType !== 'listA') {
@ -1834,10 +1837,10 @@
dataView.setUint8(0, 0x55); // 帧头
dataView.setUint8(1, 0x07); // 帧类型：亮度调节
dataView.setUint8(2, 0x01); // 包序号
dataView.setUint8(3, 0x00); // 包序号
dataView.setUint8(4, 0x01); // 数据长度
dataView.setUint8(5, liangDu); // 数据长度
dataView.setUint8(2, 0x01);
dataView.setUint8(3, 0x00);
dataView.setUint8(4, 0x01); //
dataView.setUint8(5, liangDu); // 数据
let f = this.getDevice();
if (f) {

6
pages/7305/BJQ7305.vue
View File

@ -74,7 +74,7 @@
<view class="slider-container">
<slider min="1" max="100" step="1" :disabled="false" :value="formData.liangDu" activeColor="#bbe600"
backgroundColor="#00000000" block-size="20" block-color="#ffffffde" @change="sliderChange"
@changing="sliderChange" class="custom-slider" />
@changing="sliderChanging" class="custom-slider" />
</view>
</view>
@ -1394,6 +1394,10 @@ debugger;
});
},
sliderChanging(evt){
this.formData.liangDu = evt.detail.value;
},
sliderChange: function(evt) {
this.formData.liangDu = evt.detail.value;
clearTimeout(BrighInteval)

31
pages/common/addBLE/LinkBle.vue
View File

@ -53,7 +53,9 @@
Statu: {
bound: null,
timeInteval: null,
isSearch: false
isSearch: false,
pageHide:false,
isBind:false
},
device: {
"deviceId": "",
@ -115,17 +117,32 @@
return "";
}
},
onShow() {
this.Statu.pageHide=false;
},
onHide() {
this.Statu.pageHide=true;
},
onUnload() {
console.log("返回取消订阅");
clearInterval(inteval);
ble.removeAllCallback(pagePath);
if(!this.Statu.isBind && these.device.deviceId){
ble.disconnectDevice(these.device.deviceId).catch(ex=>{
console.error("无法断开蓝牙连接");
});
}
},
onLoad(option) {
these = this;
ble = bleTool.getBleTool();
ble.addStateBreakCallback(res => {
if(this.Statu.pageHide){
return;
}
these.device.linkStatu = false;
hideLoading(these);
uni.showToast({
@ -135,6 +152,9 @@
},pagePath);
ble.addStateRecoveryCallback(res => {
if(this.Statu.pageHide){
return;
}
if (these.device.deviceId) {
showLoading(these, {
text: '蓝牙已恢复正在连接设备'
@ -144,6 +164,9 @@
}
},pagePath);
ble.addDisposeCallback(res => {
if(this.Statu.pageHide){
return;
}
console.log("处理蓝牙断开连接");
these.device.linkStatu = false;
if (these.device.deviceId == res.deviceId) {
@ -156,6 +179,9 @@
},pagePath);
ble.addReceiveCallback((receive, f, path) => {
if(this.Statu.pageHide){
return;
}
console.log("收到设备消息，", receive);
if (these.device.deviceId == receive.deviceId) {
console.log("11111:", receive);
@ -372,6 +398,7 @@
clearTimeout(this.Statu.timeInteval);
this.device.macAddress = null;
this.Statu.timeInteval = null;
this.Statu.isBind=true;
uni.$emit("refreshDeviceList");
setTimeout(() => {
uni.switchTab({

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

@ -23,9 +23,10 @@
<view class="p100">
<view class="lblTitle">配对设备</view>
<view class="list" style="margin-bottom: 30rpx;">
<view class="item " v-for="item, index in PairEquip" v-show="PairEquip.length>0">
<view class="item " @click.stop="disConnect(item,index)" v-for="item, index in PairEquip" v-show="PairEquip.length>0">
<view class="leftImg ">
<image src="/static/images/common/bluetooth.png" class="titleIco filterNone"
mode="heightFix">
@ -33,9 +34,7 @@
</view>
<view class="centertxt ">
<view class="name" v-text="item.name"></view>
<view class="id">
<text>信号:{{item.RSSI}}dBm</text>
</view>
</view>
<view class="rightIco center">
<image src="/static/images/BLEAdd/linked.png" class="img" mode="aspectFit">
@ -134,6 +133,7 @@
data() {
return {
Status: {
navigateTO: false,
isPageHidden: false,
intval: null,
time: null,
@ -165,11 +165,14 @@
},
search: '', //筛选
PairEquip: [], //已配对设备
tmpLink:[],//本次已配对
EquipMents: [], //搜索出来的设备
device: null,
item: {
deviceId: ''
}
},
}
},
computed: {
@ -189,9 +192,20 @@
if (ble) {
ble.StopSearch();
ble.removeAllCallback(pagePath);
if (!this.device && !this.Status.navigateTO) {
if (this.tmpLink && this.tmpLink.length && this.tmpLink.length > 0) {
console.error("页面卸载时，断开所有连接")
let f = this.tmpLink.forEach((v) => {
ble.disconnectDevice(v.deviceId).catch(ex => {
console.error("无法断开设备连接", ex);
});
});
}
}
}
},
onLoad(option) {
debugger;
eventChannel = this.getOpenerEventChannel();
eventChannel.on('detailData', function(rec) {
@ -211,7 +225,7 @@
const systemInfo = uni.getSystemInfoSync();
ble = bleTool.getBleTool(); // Ensure ble is initialized
// Ensure ble is initialized
if (systemInfo.uniPlatform == 'web') {
@ -236,86 +250,19 @@
"name": "EF4651",
"linkStatu": false,
"isTarget": true
},
{
"RSSI": -69,
"advertisData": "",
"advertisServiceUUIDs": [
"0000FFE0-0000-1000-8000-00805F9B34FB"
],
"deviceId": "4F0DAC91-4391-CB07-905E-72D7F03EFCD3",
"name": "4877-BF743D",
"linkStatu": false
},
{
"RSSI": -55,
"advertisData": "",
"advertisServiceUUIDs": [
"0000FFE0-0000-1000-8000-00805F9B34FB"
],
"deviceId": "EBDA4E6F-3A28-FF65-A845-AE8CC7B78375",
"name": "HBY670-BF74EA",
"linkStatu": false
},
{
"RSSI": -61,
"advertisData": "",
"advertisServiceUUIDs": [
"0000FFE0-0000-1000-8000-00805F9B34FB"
],
"deviceId": "469FB381-B47E-1E40-8073-EF50B5704AAB",
"name": "EF4651",
"linkStatu": false,
"isTarget": true
},
{
"RSSI": -69,
"advertisData": "",
"advertisServiceUUIDs": [
"0000FFE0-0000-1000-8000-00805F9B34FB"
],
"deviceId": "4F0DAC91-4391-CB07-905E-72D7F03EFCD3",
"name": "4877-BF743D",
"linkStatu": false
}, {
"RSSI": -55,
"advertisData": "",
"advertisServiceUUIDs": [
"0000FFE0-0000-1000-8000-00805F9B34FB"
],
"deviceId": "EBDA4E6F-3A28-FF65-A845-AE8CC7B78375",
"name": "HBY670-BF74EA",
"linkStatu": false
},
{
"RSSI": -61,
"advertisData": "",
"advertisServiceUUIDs": [
"0000FFE0-0000-1000-8000-00805F9B34FB"
],
"deviceId": "469FB381-B47E-1E40-8073-EF50B5704AAB",
"name": "EF4651",
"linkStatu": false,
"isTarget": true
},
{
"RSSI": -69,
"advertisData": "",
"advertisServiceUUIDs": [
"0000FFE0-0000-1000-8000-00805F9B34FB"
],
"deviceId": "4F0DAC91-4391-CB07-905E-72D7F03EFCD3",
"name": "4877-BF743D",
"linkStatu": false
}
];
console.error("1111111111")
this.PairEquip=[this.EquipMents[0]];
these.PairEquip = [this.EquipMents[0]];
this.$forceUpdate();
return;
}
ble = bleTool.getBleTool();
this.refreshLinked();
let StartSubsrib = () => {
these.EquipMents = [];
if (!ble) {
ble = bleTool.getBleTool();
@ -327,6 +274,7 @@
}
console.log("处理蓝牙不可用");
hideLoading(these);
console.error("1111111111")
these.PairEquip = [];
these.EquipMents = [];
uni.showToast({
@ -338,11 +286,12 @@
}, pagePath);
//蓝牙恢复可用的回调
ble.addStateRecoveryCallback(res=>{
ble.addStateRecoveryCallback(res => {
if (these.Status.isPageHidden) {
return;
}
these.Status.BottomMenu.show = false;
console.error("1111111111")
these.PairEquip = [];
these.EquipMents = [];
uni.showToast({
@ -350,7 +299,7 @@
title: '蓝牙恢复可用'
});
these.refreshBleList();
}),pagePath;
}), pagePath;
//蓝牙断开连接的回调
ble.addDisposeCallback(res => {
@ -360,10 +309,7 @@
// console.log("处理蓝牙断开连接");
these.PairEquip.find(function(v, ind) {
these.PairEquip.splice(ind, 1);
return v.deviceId == res.deviceId;
});
these.refreshLinked();
setTimeout(() => {
hideLoading(these);
@ -422,39 +368,31 @@
these.EquipMents.sort((a, b) => b.RSSI - a.RSSI); //信号好的排前面，一般信号好的是目标设备
}
}, pagePath);
}
let startValidDevice = () => {
if (these.device) {
console.log("进入配对模式，启用连接恢复和验证逻辑。");
//蓝牙连接已恢复的回调
ble.addRecoveryCallback(res => {
if (these.Status.isPageHidden) {
return;
}
// hideLoading(these);
these.EquipMents.find(function(v, ind) {
if (v.deviceId == res.deviceId) {
these.PairEquip.push(v);
return true;
}
return false;
});
if (these.device) {
clearInterval(this.Status.intval);
showLoading(these, {
text: '蓝牙连接已恢复,正在验证设备'
});
these.refreshLinked();
setTimeout(() => {
these.DeviceVerdict(res.deviceId);
}, 0);
} else {
// hideLoading(these);
if (!these.device) {
hideLoading(these);
}else{
clearInterval(this.Status.intval);
these.DeviceVerdict(res.deviceId);
}
}, pagePath);
}
let startValidDevice = () => {
if (these.device) {
console.log("进入配对模式，启用连接恢复和验证逻辑。");
//收到设备的消息回调
ble.addReceiveCallback((receivData, f, path, arr) => {
@ -490,13 +428,31 @@
},
onShow: function() {
debugger;
this.Status.isPageHidden = false;
this.Status.navigateTO = false;
this.refreshBleList();
this.refreshLinked();
},
methods: {
refreshLinked(){
if(ble){
let arr=[];
arr=ble.data.LinkedList.filter(v=>{
return v.Linked;
});
this.PairEquip=arr;
}
},
checkAndRequestLocationPermission() {
return new Promise((resolve) => {
@ -517,14 +473,19 @@
// console.warn('定位权限被拒绝');
MsgClear(these);
showPop({headerTxt:'权限提醒',message:'扫描蓝牙设备，需要您开启定位权限',buttonText:'去开启',okCallback:uni.openSetting},these,true);
showPop({
headerTxt: '权限提醒',
message: '扫描蓝牙设备，需要您开启定位权限',
buttonText: '去开启',
okCallback: uni.openSetting
}, these, true);
resolve(false);
}
},
(error) => {
MsgError('请求定位权限失败:'+error.code,'确定',these);
MsgError('请求定位权限失败:' + error.code, '确定', these);
resolve(false);
}
);
@ -565,10 +526,10 @@
time = setTimeout(() => {
these.EquipMents = [];
these.PairEquip = [];
ble.StartSearch().then(result => {
console.log("开始搜索成功", result);
// console.log("开始搜索成功", result);
}).catch(err => {
console.error("开始搜索失败:", err);
@ -577,7 +538,7 @@
} else {
MsgClear(these);
MsgError('出现错误:' + err.msg,'确定',these);
MsgError('出现错误:' + err.msg, '确定', these);
}
}).finally(() => {
@ -587,8 +548,8 @@
}
ble.StopSearch().catch(err=>{
console.error("err=",err);
ble.StopSearch().catch(err => {
console.error("err=", err);
}).finally(startSearch);
@ -716,13 +677,14 @@
text: "等待设备上报Mac地址," + these.Status.time + 's'
});
console.log("11111111", this.Status.time);
clearInterval(this.Status.intval);
this.Status.intval = null;
this.Status.intval = setInterval(() => {
this.Status.time = this.Status.time - 1;
if (this.Status.time < 0) {
hideLoading(these);
console.log("停止倒计时", this.Status.time);
clearInterval(this.Status.intval)
this.Status.intval = null;
@ -742,9 +704,12 @@
}
updateLoading(these, {
text: "等待设备上报Mac地址," + these.Status.time + 's'
});
}, 1000);
return undefined;
}
}
@ -761,13 +726,6 @@
let total = 5;
let linkCallback = (res) => {
let c = these.PairEquip.find(function(v) {
return v.deviceId == item.deviceId;
});
if (!c) {
these.PairEquip.push(item);
}
console.log("连接成功", these.device);
if (!these.device) {
console.log("跳转到绑定")
@ -778,14 +736,13 @@
},
success(res) {
these.Status.navigateTO = true;
res.eventChannel.emit('LinkItem', item);
}
});
return;
}
// console.log("验证设备")
// these.DeviceVerdict(item.deviceId);
}
let execLink = () => {
return new Promise((resolve, reject) => {
@ -798,6 +755,7 @@
return;
}
ble.LinkBlue(item.deviceId).then((res) => {
this.tmpLink=[item];
console.log("连接成功");
ble.StopSearch();
resolve(res);
@ -826,13 +784,29 @@
console.error("ex=", ex)
MsgClear(these);
MsgError("连接失败:" + ex.msg,'确定',these);
MsgError("连接失败:" + ex.msg, '确定', these);
hideLoading(these);
});
},
disConnect:function(item,index){
// #ifdef H5|WEB
this.PairEquip.splice(index,1);
// #endif
// #ifdef APP|APP-PLUS
if(ble){
ble.disconnectDevice(item.deviceId).catch(ex=>{
console.error("无法断开连接",ex);
});
}
// #endif
}
}
}
@ -972,7 +946,7 @@
position: absolute;
top: 240rpx;
left: 0rpx;
/* border: 1px solid #BBE600; */
z-index: 101;
}
@ -1016,7 +990,7 @@
box-sizing: border-box;
padding: 20rpx;
border-radius: 8px;
background: #1a1a1a;
background: #1a1a1a9e;
display: flex;
flex-direction: row;
flex-wrap: nowrap;

4
pages/common/index/index.vue
View File

@ -304,14 +304,14 @@
},
bleBreak(res) {
console.error("蓝牙断开连接", res);
// console.error("蓝牙断开连接", res);
if (res.deviceId) {
this.updateBleStatu(res.deviceId);
}
},
bleRecovery(res) {
console.log("蓝牙连接成功", res);
// console.log("蓝牙连接成功", res);
if (res.deviceId) {
this.updateBleStatu(res.deviceId);
}

24
utils/BleHelper.js
View File

@ -36,7 +36,7 @@ class BleHelper {
linkedDevices = uni.getStorageSync(this.StorageKey);
}
if (linkedDevices && linkedDevices.length && linkedDevices.length > 0) {
console.log("111111", linkedDevices);
// console.log("111111", linkedDevices);
linkedDevices = linkedDevices.filter((v) => {
if (v) {
v.Linked = false;
@ -614,13 +614,13 @@ class BleHelper {
if (this.data.isSubscribe) { //整个App生命周期，只订阅一次
return;
}
console.error("开始订阅各类变化消息");
// console.error("开始订阅各类变化消息");
this.data.isSubscribe = true;
this.BleStateChange(); //蓝牙适配器变化
this.BleConnChange(); //蓝牙连接变化
this.BleDeviceFound(); //发现新设备
this.BleReceive(); //收到消息
console.error("订阅各类变化消息完成");
// console.error("订阅各类变化消息完成");
},
fail: (ex2) => {
console.error("蓝牙模块启动失败", ex2);
@ -963,7 +963,7 @@ class BleHelper {
}
} else {
console.log("蓝牙连接已恢复", res);
// console.log("蓝牙连接已恢复", res);
// 系统级连接恢复：更新 LinkedList 并通知业务层，避免 sendData 误判未连接而重复 createBLEConnection
let f = this.data.LinkedList.find(v => v.deviceId == res.deviceId);
if (f) {
@ -1099,7 +1099,7 @@ class BleHelper {
services: [],
allowDuplicatesKey: true,
success: (res) => {
console.log('开始搜索蓝牙设备成功');
// console.log('开始搜索蓝牙设备成功');
resolve(res);
},
@ -1238,11 +1238,11 @@ class BleHelper {
characteristicId: characteristicId,
state: state,
success: (res) => {
if (state) {
console.log("订阅消息成功", res);
} else {
console.log("取消订阅成功", res);
}
// if (state) {
// console.log("订阅消息成功", res);
// } else {
// console.log("取消订阅成功", res);
// }
this.data.LinkedList.find((v) => {
if (v.deviceId == deviceId) {
@ -1312,13 +1312,13 @@ class BleHelper {
results.forEach((result, index) => {
if (result.status === "fulfilled") {
console.log(`订阅消息操作${index + 1}成功:`, result.value);
// console.log(`订阅消息操作${index + 1}成功:`, result.value);
} else {
console.error(`订阅消息操作${index + 1}失败:`, result
.reason);
}
});
console.log("订阅消息完成，deviceId:", deviceId);
// console.log("订阅消息完成，deviceId:", deviceId);
resolve();
}).catch((ex) => {
console.error("异常,ex=", ex);

3
utils/BleReceive.js
View File

@ -14,8 +14,7 @@ class BleReceive {
'/pages/100/HBY100': this.Receive_100.bind(this),
'/pages/102/HBY102': this.Receive_102.bind(this),
'/pages/6170/deviceControl/index':this.Receive_6170.bind(this),
'/pages/100J/HBY100-J': this.Receive_100J.bind(this),
'/pages/102/HBY102': this.Receive_102.bind(this)
'/pages/100J/HBY100-J': this.Receive_100J.bind(this)
};
}

2
utils/Common.js
View File

@ -340,7 +340,7 @@ export default {
value: "55",
label: "修改信道",
checked: false,
type: ['4877']
type: ['4877','102']
},
{
value: "56",