From 6924a1ff5bf0d20a067cd46b3d2c350b668de287 Mon Sep 17 00:00:00 2001 From: 17792275749 <812100002@qq.com> Date: Tue, 16 Dec 2025 18:15:44 +0800 Subject: [PATCH] "version": "1.2.19" --- app.json | 4 +- .../configureDevice_2/configureDevice_2.js | 4 + pages/configureDevice/configureDevice.js | 355 +++++++++--------- 3 files changed, 184 insertions(+), 179 deletions(-) diff --git a/app.json b/app.json index 8cd843a..c0a4fb5 100644 --- a/app.json +++ b/app.json @@ -32,8 +32,8 @@ "style": "v2", "plugins": { "ppScale-plugin": { - "version": "0.0.19", - "provider": "wx0826af4e4908f524" + "version": "1.2.19", + "provider": "wx0ffb48417ce6345c" } }, "permission": { diff --git a/components/configureDevice_2/configureDevice_2.js b/components/configureDevice_2/configureDevice_2.js index 0cdd0b6..34676ca 100644 --- a/components/configureDevice_2/configureDevice_2.js +++ b/components/configureDevice_2/configureDevice_2.js @@ -150,6 +150,10 @@ Component({ }, setUserInfo() { + // app.globalData.ppScale.activeProtocol.codeClearDeviceData("00", (res) => { + // console.log("deviceInfo === codeClearDeviceData", res); + // }) + if(this.data.connectState == this.data.BLUE_STATE.CONNECTSUCCESS) { if(this.data.userId) { app.globalData.ppScale.activeProtocol.dataSyncUserInfo({ diff --git a/pages/configureDevice/configureDevice.js b/pages/configureDevice/configureDevice.js index c89774d..e0e8213 100644 --- a/pages/configureDevice/configureDevice.js +++ b/pages/configureDevice/configureDevice.js @@ -3,193 +3,194 @@ import $ from "../../utils/request"; Page({ data: { - progress: { - index: 0, - data: ['配置蓝牙', '初始化用户信息', '配备网络', '完成'] - }, + progress: { + index: 0, + data: ['配置蓝牙', '初始化用户信息', '配备网络', '完成'] + }, - progressNext: false, - device: null - }, - - onLoad() { - ppScale.plugin.bus.subscribe("deviceInfo", (res) => { - console.log("===》deviceInfo", res); - ppScale.device.mac = res.serialNumber; - }); + progressNext: false, + device: null + }, - ppScale.plugin.bus.subscribe("deviceConnect", (res) => { - console.log('===》deviceConnect', res); + onLoad() { + ppScale.plugin.bus.subscribe("deviceInfo", (res) => { + console.log("===》deviceInfo", res); + ppScale.device.mac = res.serialNumber; + }); - ppScale.plugin.ScaleAction.startDataProgress(true); - ppScale.activeProtocol = ppScale.plugin.ScaleAction.getActiveProtocol(); + ppScale.plugin.bus.subscribe("deviceConnect", (res) => { + console.log('===》deviceConnect', res); - ppScale.activeProtocol.codeUpdateMTU((res) => { - console.log("===》codeUpdateMTU", res); - - ppScale.activeProtocol.codeFetchBindingState((res) => { - console.log("===》codeFetchBindingState", res); - - ppScale.activeProtocol.codeSyncTime((codeSyncTime) => { - console.log("===》codeSyncTime", codeSyncTime) - - wx.hideLoading(); - if (res === 1) { - wx.showModal({ - title: '提示', - content: '当前设备已被绑定，你确定要覆盖绑定吗？', - success: (res) => { - if (res.confirm) { - wx.showLoading({ - title: "正在初始化设备...", - mask: true - }); - ppScale.activeProtocol.codeClearDeviceData("00", (res) => { - console.log("deviceInfo === codeClearDeviceData", res); - wx.hideLoading(); - - if(res === 0) { - let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); - let params = { - equipmentCode: scaleDeviceId, - }; - $.ajax("weighingScale/del/device", params, "POST", true, "正在初始化设备...").then(res => { - ppScale.plugin.Blue.stop(); - wx.showToast({ - icon: "none", - title: "设备初始化成功，请重新绑定。", - }) - // device.list = []; - // device.mac = null; - setTimeout(() => { - wx.navigateBack({ - delta: 1 - }) - }, 1500); - }); - } else { - ppScale.plugin.Blue.stop(); - wx.showToast({ - icon: "none", - title: "设备初始化失败。", - }) - } - }) - } else if (res.cancel) { - // device.mac = null; - ppScale.plugin.Blue.stop(); - } - } - }) - } else { - ppScale.device.name = this.data.device.name; - ppScale.device.connection = this.data.device; - const nameArr = this.data.device.name.split("-"); - ppScale.version = nameArr.length === 5 ? "domain2" : "domain1"; - if(this.data.progressNext) { - let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); - let params = { - sn: scaleDeviceId, - }; - $.ajax("weighingScale/getUserInfoBySn", params, "GET", true, "正在同步用户信息...").then(res => { - if(res.result) { - wx.setStorageSync("userInfo", res.result); - this.setProgress(); - } else { - wx.removeStorageSync("userInfo"); - wx.showToast({ - title: "暂无用户信息，请手动补充", - icon: "none" - }) - setTimeout(() => { - this.setProgress(); - }, 1500) - } - }).catch(() => { - wx.showToast({ - title: "用户信息同步失败，请手动补充", - icon: "none" - }) - setTimeout(() => { - this.setProgress(); - }, 1500) - }) - } - } - }) - }) - }); - }); - }, + ppScale.plugin.ScaleAction.startDataProgress(true); + ppScale.activeProtocol = ppScale.plugin.ScaleAction.getActiveProtocol(); - // 选择了某个设备 - deviceChange(e) { - let status = e.detail.status; - if(status) { - wx.showLoading({ - title: "蓝牙配对中...", - mask: true - }); - this.setData({ - progressNext: true - }) - let device = e.detail.device; - this.connectedDevice_(device); - } - }, + ppScale.activeProtocol.codeUpdateMTU((res) => { + console.log("===》codeUpdateMTU", res); - connectedDevice(e) { - wx.showLoading({ - title: "正在尝试连接...", - mask: true - }); - this.setData({ - progressNext: false - }) - let device = e.detail.device; - this.connectedDevice_(device); - }, + ppScale.activeProtocol.codeFetchBindingState((res) => { + console.log("===》codeFetchBindingState", res); - connectedDevice_(device) { - if(device) { - this.setData({ - device: device - }) - ppScale.plugin.Blue.createBLEConnection(device); - } - }, + ppScale.activeProtocol.codeSyncTime((codeSyncTime) => { + console.log("===》codeSyncTime", codeSyncTime) - setDeviceUserInfo(e) { - this.setData({ - progressNext: true - }) - let status = e.detail.status; - if(status) { - this.setProgress(); - } - }, + wx.hideLoading(); + if (res === 1) { + wx.showModal({ + title: '提示', + content: '当前设备已被绑定，你确定要覆盖绑定吗？', + success: (res) => { + if (res.confirm) { + wx.showLoading({ + title: "正在初始化设备...", + mask: true + }); + ppScale.activeProtocol.codeClearDeviceData("00", (res) => { + console.log("deviceInfo === codeClearDeviceData", res); + wx.hideLoading(); - setDeviceConfig(e) { - let status = e.detail.status; - if(status) { - this.setProgress(); - } - }, + if (res === 0) { + let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); + let params = { + equipmentCode: scaleDeviceId, + }; + $.ajax("weighingScale/del/device", params, "POST", true, "正在初始化设备...").then(res => { + ppScale.plugin.Blue.stop(); + wx.showToast({ + icon: "none", + title: "设备初始化成功，请重新绑定。", + }) + // device.list = []; + // device.mac = null; + setTimeout(() => { + wx.navigateBack({ + delta: 1 + }) + }, 1500); + }); + } else { + ppScale.plugin.Blue.stop(); + wx.showToast({ + icon: "none", + title: "设备初始化失败。", + }) + } + }) + } else if (res.cancel) { + // device.mac = null; + ppScale.plugin.Blue.stop(); + } + } + }) + } else { + ppScale.device.name = this.data.device.name; + ppScale.device.connection = this.data.device; + const nameArr = this.data.device.name.split("-"); + ppScale.version = nameArr.length === 5 ? "domain2" : "domain1"; + if (this.data.progressNext) { + let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); + let params = { + sn: scaleDeviceId, + }; + $.ajax("weighingScale/getUserInfoBySn", params, "GET", true, "正在同步用户信息...").then(res => { + if (res.result) { + wx.setStorageSync("userInfo", res.result); + this.setProgress(); + } else { + wx.removeStorageSync("userInfo"); + wx.showToast({ + title: "暂无用户信息，请手动补充", + icon: "none" + }) + setTimeout(() => { + this.setProgress(); + }, 1500) + } + }).catch(() => { + wx.showToast({ + title: "用户信息同步失败，请手动补充", + icon: "none" + }) + setTimeout(() => { + this.setProgress(); + }, 1500) + }) + } + } + }) + }) + }); + }); + }, - setConfigSuccessful() { - ppScale.plugin.Blue.stop(); - wx.switchTab({ - url: "/pages/home/home" - }) - }, + // 选择了某个设备 + deviceChange(e) { + let status = e.detail.status; + if (status) { + wx.showLoading({ + title: "蓝牙配对中...", + mask: true + }); + this.setData({ + progressNext: true + }) + let device = e.detail.device; + this.connectedDevice_(device); + } + }, - setProgress() { - this.setData({ - ["progress.index"]: this.data.progress.index + 1 - }) - }, + connectedDevice(e) { + ppScale.plugin.Blue.stop(); + wx.showLoading({ + title: "正在尝试连接...", + mask: true + }); + this.setData({ + progressNext: false + }) + let device = e.detail.device; + this.connectedDevice_(device); + }, - onUnload() { - ppScale.plugin.Blue.stop(); - } + connectedDevice_(device) { + if (device) { + this.setData({ + device: device + }) + ppScale.plugin.Blue.createBLEConnection(device); + } + }, + + setDeviceUserInfo(e) { + this.setData({ + progressNext: true + }) + let status = e.detail.status; + if (status) { + this.setProgress(); + } + }, + + setDeviceConfig(e) { + let status = e.detail.status; + if (status) { + this.setProgress(); + } + }, + + setConfigSuccessful() { + ppScale.plugin.Blue.stop(); + wx.switchTab({ + url: "/pages/home/home" + }) + }, + + setProgress() { + this.setData({ + ["progress.index"]: this.data.progress.index + 1 + }) + }, + + onUnload() { + ppScale.plugin.Blue.stop(); + } }) \ No newline at end of file