[AI Generated]: feat(*): 对接登录token存储、设备列表自动连接及成员管理蓝牙状态实时同步
This commit is contained in:
17792275749
@@ -1,4 +1,6 @@
|
||||
import { get } from '../../utils/request/index'
|
||||
import { lefuService } from '../../lefu/index'
|
||||
import type { RawDevice } from '../../lefu/types'
|
||||
|
||||
/** API 返回的设备记录 */
|
||||
interface DeviceRecord {
|
||||
@@ -38,6 +40,8 @@ interface DeviceRecord {
|
||||
interface DeviceItem {
|
||||
id: string
|
||||
scaleDeviceId: string
|
||||
scaleDeviceName: string
|
||||
connectDeviceInfo: string
|
||||
realname: string
|
||||
/** 蓝牙连接状态，接口不返回，由业务层更新 */
|
||||
connected: boolean
|
||||
@@ -49,47 +53,127 @@ Page({
|
||||
deviceList: [] as DeviceItem[],
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
onShow() {
|
||||
this.loadData()
|
||||
},
|
||||
|
||||
/** 拉取已绑定设备列表 */
|
||||
onUnload() {
|
||||
lefuService.stopScan()
|
||||
lefuService.onDeviceConnect(() => {})
|
||||
lefuService.onDeviceInfo(() => {})
|
||||
},
|
||||
|
||||
/** 拉取已绑定设备列表，加载完成后检查缓存自动连接 */
|
||||
loadData() {
|
||||
this.setData({ loading: true })
|
||||
get<DeviceRecord[]>('weighingScale/v3/list/device')
|
||||
const userInfo = wx.getStorageSync('userInfo')
|
||||
get<DeviceRecord[]>('weighingScale/v3/list/device', { userId: userInfo?.userId })
|
||||
.then(res => {
|
||||
const list: DeviceItem[] = res.result.map(item => ({
|
||||
id: item.id,
|
||||
scaleDeviceId: item.scaleDeviceId,
|
||||
realname: item.realname,
|
||||
connected: false,
|
||||
}))
|
||||
this.setData({ deviceList: list })
|
||||
const list: DeviceItem[] = res.result.map(item => {
|
||||
let scaleDeviceName = ''
|
||||
try {
|
||||
const info = JSON.parse(item.connectDeviceInfo || '{}')
|
||||
scaleDeviceName = info.name ?? ''
|
||||
} catch {}
|
||||
return {
|
||||
id: item.id,
|
||||
scaleDeviceId: item.scaleDeviceId,
|
||||
scaleDeviceName,
|
||||
connectDeviceInfo: item.connectDeviceInfo ?? '',
|
||||
realname: item.realname,
|
||||
connected: false,
|
||||
}
|
||||
})
|
||||
this.setData({ deviceList: list }, () => {
|
||||
this._checkAndAutoConnect()
|
||||
})
|
||||
})
|
||||
.finally(() => {
|
||||
this.setData({ loading: false })
|
||||
})
|
||||
},
|
||||
|
||||
/* 点击「连接」→ 跳转设备搜索页 */
|
||||
onTapConnect() {
|
||||
wx.navigateTo({
|
||||
url: '/pages/connectedDevice/connectedDevice'
|
||||
})
|
||||
/** 检查缓存设备：已连接则直接标记，未连接则扫描自动连接 */
|
||||
_checkAndAutoConnect() {
|
||||
const cachedRaw = wx.getStorageSync('connectDeviceInfo') as RawDevice | null
|
||||
if (!cachedRaw) return
|
||||
|
||||
// 已连接且 deviceInfo 就绪，直接标记列表
|
||||
if (lefuService.isConnected && lefuService.deviceInfo?.serialNumber) {
|
||||
this._markConnected(lefuService.deviceInfo.serialNumber as string)
|
||||
return
|
||||
}
|
||||
|
||||
// 未连接，直接用缓存对象连，不走扫描
|
||||
wx.showLoading({ title: '连接中...', mask: true })
|
||||
wx.openBluetoothAdapter({
|
||||
success: () => {
|
||||
const target = { name: cachedRaw.scaleDeviceName ?? cachedRaw.name ?? '', raw: cachedRaw, model: {} }
|
||||
lefuService.connect(target)
|
||||
lefuService.onDeviceConnect(() => {
|
||||
wx.hideLoading()
|
||||
})
|
||||
lefuService.onDeviceInfo((info) => {
|
||||
this._markConnected(info.serialNumber as string)
|
||||
})
|
||||
},
|
||||
fail: () => {
|
||||
wx.hideLoading()
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
/* 点击「成员管理」→ 跳转成员管理页，传 SN；userId 由目标页从缓存读取 */
|
||||
onTapMember(e: WechatMiniprogram.TouchEvent) {
|
||||
const sn = e.currentTarget.dataset.sn as string
|
||||
wx.navigateTo({
|
||||
url: `/pages/equipmentMember/equipmentMember?sn=${sn}`
|
||||
})
|
||||
/** 将 serialNumber 对应的列表项标记为已连接，其余置为未连接 */
|
||||
_markConnected(serialNumber: string) {
|
||||
const list = this.data.deviceList.map(item => ({
|
||||
...item,
|
||||
connected: item.scaleDeviceId === serialNumber,
|
||||
}))
|
||||
this.setData({ deviceList: list })
|
||||
},
|
||||
|
||||
/** 点击「连接」：断开当前、直接用 connectDeviceInfo 连接指定设备 */
|
||||
onTapConnect(e: WechatMiniprogram.TouchEvent) {
|
||||
const connectDeviceInfoStr = e.currentTarget.dataset.connectDeviceInfo as string
|
||||
let rawDevice: RawDevice | null = null
|
||||
try {
|
||||
rawDevice = JSON.parse(connectDeviceInfoStr || '{}')
|
||||
} catch {}
|
||||
if (!rawDevice) return
|
||||
|
||||
if (lefuService.isConnected) {
|
||||
lefuService.disconnect()
|
||||
}
|
||||
const list = this.data.deviceList.map(item => ({ ...item, connected: false }))
|
||||
this.setData({ deviceList: list })
|
||||
|
||||
wx.showLoading({ title: '连接中...', mask: true })
|
||||
wx.openBluetoothAdapter({
|
||||
success: () => {
|
||||
const target = { name: rawDevice!.scaleDeviceName ?? rawDevice!.name ?? '', raw: rawDevice!, model: {} }
|
||||
lefuService.connect(target)
|
||||
lefuService.onDeviceConnect(() => {
|
||||
wx.hideLoading()
|
||||
wx.setStorageSync('connectDeviceInfo', rawDevice)
|
||||
})
|
||||
lefuService.onDeviceInfo((info) => {
|
||||
this._markConnected(info.serialNumber as string)
|
||||
})
|
||||
},
|
||||
fail: () => {
|
||||
wx.hideLoading()
|
||||
wx.showToast({ title: '蓝牙未开启', icon: 'none' })
|
||||
},
|
||||
})
|
||||
},
|
||||
|
||||
/* 点击「成员管理」→ 跳转成员管理页，sn 由目标页从缓存读取 */
|
||||
onTapMember() {
|
||||
wx.navigateTo({ url: '/pages/equipmentMember/equipmentMember' })
|
||||
},
|
||||
|
||||
/* 点击「添加设备」→ 跳转设备搜索页 */
|
||||
onTapAdd() {
|
||||
wx.navigateTo({
|
||||
url: '/pages/connectedDevice/connectedDevice'
|
||||
})
|
||||
wx.navigateTo({ url: '/pages/connectedDevice/connectedDevice' })
|
||||
},
|
||||
})
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
<view class="card-top">
|
||||
<view class="card-icon"></view>
|
||||
<view class="card-info">
|
||||
<view class="card-name">{{ item.scaleDeviceId }}</view>
|
||||
<view class="card-user">{{ item.realname }}</view>
|
||||
<view class="card-name">{{ item.scaleDeviceName }}</view>
|
||||
<view class="card-status">
|
||||
<!-- 已连接:绿点 + "已连接" -->
|
||||
<block wx:if="{{ item.connected }}">
|
||||
@@ -36,14 +35,14 @@
|
||||
<block wx:if="{{ item.connected }}">
|
||||
<!-- 已连接:单按钮居中 -->
|
||||
<view class="card-actions card-actions-single">
|
||||
<view class="btn-ghost-full" data-sn="{{ item.scaleDeviceId }}" bind:tap="onTapMember">成员管理</view>
|
||||
<view class="btn-ghost-full" bind:tap="onTapMember">成员管理</view>
|
||||
</view>
|
||||
</block>
|
||||
<block wx:else>
|
||||
<!-- 未连接:双按钮 连接 / 成员管理 -->
|
||||
<view class="card-actions card-actions-double">
|
||||
<view class="btn-ghost-half" data-id="{{ item.id }}" bind:tap="onTapConnect">连接</view>
|
||||
<view class="btn-ghost-half" data-sn="{{ item.scaleDeviceId }}" bind:tap="onTapMember">成员管理</view>
|
||||
<view class="btn-ghost-half" data-connect-device-info="{{ item.connectDeviceInfo }}" bind:tap="onTapConnect">连接</view>
|
||||
<view class="btn-ghost-half" bind:tap="onTapMember">成员管理</view>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user