diff --git a/miniprogram/app.json b/miniprogram/app.json index 3a02d88..b29f6b8 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -31,7 +31,7 @@ "lazyCodeLoading": "requiredComponents", "plugins": { "ppScale-plugin": { - "version": "0.0.24", + "version": "0.0.25", "provider": "wx0826af4e4908f524" } }, diff --git a/miniprogram/app.ts b/miniprogram/app.ts index 7a5194a..7a83f76 100644 --- a/miniprogram/app.ts +++ b/miniprogram/app.ts @@ -6,13 +6,13 @@ App({ onLaunch() { // 已登录则跳过登录页 - const userInfo = wx.getStorageSync('userInfo') - if (userInfo) { - const connectDeviceInfo = wx.getStorageSync('connectDeviceInfo') - const hasDevice = connectDeviceInfo && Object.keys(connectDeviceInfo).length > 0 - wx.reLaunch({ - url: hasDevice ? '/pages/home/home' : '/pages/connectedDevice/connectedDevice' - }) - } + // const userInfo = wx.getStorageSync('userInfo') + // if (userInfo) { + // const connectDeviceInfo = wx.getStorageSync('connectDeviceInfo') + // const hasDevice = connectDeviceInfo && Object.keys(connectDeviceInfo).length > 0 + // wx.reLaunch({ + // url: hasDevice ? '/pages/home/home' : '/pages/connectedDevice/connectedDevice' + // }) + // } }, }) diff --git a/miniprogram/lefu/index.ts b/miniprogram/lefu/index.ts index 183fad0..36397eb 100644 --- a/miniprogram/lefu/index.ts +++ b/miniprogram/lefu/index.ts @@ -4,7 +4,6 @@ export type { LeFuWifiItem, ProgressData, LockData, - WifiVersion, LeFuConfig, DeviceSetting, DeviceMember, diff --git a/miniprogram/lefu/service.ts b/miniprogram/lefu/service.ts index 09ce6df..7333b1f 100644 --- a/miniprogram/lefu/service.ts +++ b/miniprogram/lefu/service.ts @@ -6,7 +6,6 @@ import type { LeFuWifiItem, ProgressData, LockData, - WifiVersion, LeFuConfig, DeviceSetting, DeviceMember, @@ -204,6 +203,8 @@ class LeFuService { plugin.Blue.setDeviceSetting(DEVICE_SETTINGS) this._subscribeBus() plugin.Blue.stopBluetoothDevicesDiscovery() + // 0.0.25 新增:重新连接前必须清除协议缓存 + plugin.Blue.clearProtocol() plugin.Blue.createBLEConnection(rawDevice) } diff --git a/miniprogram/lefu/types.ts b/miniprogram/lefu/types.ts index 086eceb..c859093 100644 --- a/miniprogram/lefu/types.ts +++ b/miniprogram/lefu/types.ts @@ -4,8 +4,6 @@ export type RawDevice = Record /** 乐福 SDK 插件对象(运行时由 requirePlugin 注入) */ export type LeFuPlugin = Record -/** WiFi 配网协议版本 */ -export type WifiVersion = 'domain1' | 'domain2' /** 设备配置(来自 master device.setting 列表) */ export interface DeviceSetting { diff --git a/miniprogram/pages/connectedWifi/connectedWifi.ts b/miniprogram/pages/connectedWifi/connectedWifi.ts index a752d09..9045918 100644 --- a/miniprogram/pages/connectedWifi/connectedWifi.ts +++ b/miniprogram/pages/connectedWifi/connectedWifi.ts @@ -14,7 +14,7 @@ Page({ data: { status: 'idle' as WifiStatus, deviceName: '智能体重秤', - bleStatus: 'connected' as BleStatus, + bleStatus: 'connecting' as BleStatus, wifiList: [] as WifiItem[], hasConnected: false, selectedSsid: '', diff --git a/miniprogram/pages/connectedWifi/connectedWifi.wxml b/miniprogram/pages/connectedWifi/connectedWifi.wxml index c57c17b..c29d9f7 100644 --- a/miniprogram/pages/connectedWifi/connectedWifi.wxml +++ b/miniprogram/pages/connectedWifi/connectedWifi.wxml @@ -16,7 +16,7 @@ @@ -24,7 +24,7 @@ diff --git a/miniprogram/pages/data/data.ts b/miniprogram/pages/data/data.ts index 91eabc9..dde4b24 100644 --- a/miniprogram/pages/data/data.ts +++ b/miniprogram/pages/data/data.ts @@ -88,12 +88,11 @@ Page({ onLoad() { const raw = wx.getStorageSync('userInfo') as StorageUserInfo | null if (!raw?.userId) return - const storedUserId = raw.userId const userInfo: PageUserInfo = { ...raw, sex_dictText: raw.sex === 1 ? '男' : raw.sex === 2 ? '女' : '', age: calcAge(raw.birthday), - isSelf: raw.userId === storedUserId, + isSelf: true, } this.setData({ userInfo }) this.loadData() diff --git a/miniprogram/pages/home/home.ts b/miniprogram/pages/home/home.ts index c01e53d..7aba48b 100644 --- a/miniprogram/pages/home/home.ts +++ b/miniprogram/pages/home/home.ts @@ -80,6 +80,9 @@ Page({ lefuService.onDisconnected(() => { this.setData({ 'device.connected': false }) }) + }, + + onShow() { this.loadData() }, diff --git a/miniprogram/pages/login/login.ts b/miniprogram/pages/login/login.ts index 32e141b..305a6cc 100644 --- a/miniprogram/pages/login/login.ts +++ b/miniprogram/pages/login/login.ts @@ -65,13 +65,13 @@ Page({ wx.setStorageSync('userInfo', result.user) /* 上次连接设备不为空对象则直接进首页 */ - const connectDeviceInfo = result.user?.connectDeviceInfo - if (connectDeviceInfo && connectDeviceInfo !== '{}') { - wx.setStorageSync('connectDeviceInfo', JSON.parse(connectDeviceInfo)) - wx.reLaunch({ url: '/pages/home/home' }) - } else { + // const connectDeviceInfo = result.user?.connectDeviceInfo + // if (connectDeviceInfo && connectDeviceInfo !== '{}') { + // wx.setStorageSync('connectDeviceInfo', JSON.parse(connectDeviceInfo)) + // wx.reLaunch({ url: '/pages/home/home' }) + // } else { wx.reLaunch({ url: '/pages/connectedDevice/connectedDevice' }) - } + // } }) .catch(() => { this.setData({ loading: false }) diff --git a/miniprogram/utils/request/index.ts b/miniprogram/utils/request/index.ts index 3c02c6f..bf3aef4 100644 --- a/miniprogram/utils/request/index.ts +++ b/miniprogram/utils/request/index.ts @@ -2,7 +2,7 @@ import type { ApiResponse, HttpMethod, RequestOptions } from './types' export type { ApiResponse, RequestOptions } -const BASE_URL = 'http://192.168.1.31:8889/' // 测试环境 +const BASE_URL = 'http://192.168.1.207:8889/' // 测试环境 // const BASE_URL = 'https://device.shuziweidao.com/gateway/' // 正式环境 let _loadingCount = 0