diff --git a/apps/miniprogram/native/pkg-veepoo/index.js b/apps/miniprogram/native/pkg-veepoo/index.js index 0938116..a66516e 100644 --- a/apps/miniprogram/native/pkg-veepoo/index.js +++ b/apps/miniprogram/native/pkg-veepoo/index.js @@ -241,7 +241,8 @@ Page({ try { // eslint-disable-next-line no-undef var status = wx.getStorageSync('deviceChipStatus'); - if (status === 'successfulVerification' || status === 'passTheVerification') { + // SDK 可能写入字符串或布尔值 true + if (status === 'successfulVerification' || status === 'passTheVerification' || status === true) { clearInterval(self._authTimer); self._authTimer = null; self._onReady(); @@ -279,10 +280,12 @@ Page({ var type = data.type; if (type === SDK_EVENT_AUTH) { - var password = (data.content || {}).VPDevicepassword; + var content = data.content || {}; // eslint-disable-next-line no-undef - console.log('[veepoo-native] 认证事件: VPDevicepassword=' + password); - if (password === 'passTheVerification' || password === 'successfulVerification') { + console.log('[veepoo-native] 认证事件: VPDeviceAck=' + content.VPDeviceAck + ' VPDevicepassword=' + content.VPDevicepassword); + // VPDeviceAck 是认证结果(successfulVerification/passTheVerification) + // VPDevicepassword 是设备密码原始值(如 "0000"),不是认证结果 + if (content.VPDeviceAck === 'successfulVerification' || content.VPDeviceAck === 'passTheVerification') { if (this._authTimer) { clearInterval(this._authTimer); this._authTimer = null; } if (this._authTimeout) { clearTimeout(this._authTimeout); this._authTimeout = null; } this._onReady();