yuchunlei/bodyWeight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"version": "1.2.19"

Browse Source
This commit is contained in:
17792275749
2025-12-16 18:15:44 +08:00
parent 21e69f06c3
commit 6924a1ff5b
3 changed files with 184 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.json
+2 -2
View File
@@ -32,8 +32,8 @@
"style": "v2", "style": "v2",
"plugins": { "plugins": {
"ppScale-plugin": { "ppScale-plugin": {
"version": "0.0.19", "version": "1.2.19",
"provider": "wx0826af4e4908f524" "provider": "wx0ffb48417ce6345c"
} }
}, },
"permission": { "permission": {
components/configureDevice_2/configureDevice_2.js
+4
View File
@@ -150,6 +150,10 @@ Component({
}, },
setUserInfo() { 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.connectState == this.data.BLUE_STATE.CONNECTSUCCESS) {
if(this.data.userId) { if(this.data.userId) {
app.globalData.ppScale.activeProtocol.dataSyncUserInfo({ app.globalData.ppScale.activeProtocol.dataSyncUserInfo({
pages/configureDevice/configureDevice.js
+173 -172
View File
@@ -3,193 +3,194 @@ import $ from "../../utils/request";
Page({ Page({
data: { data: {
progress: { progress: {
index: 0, index: 0,
data: ['配置蓝牙', '初始化用户信息', '配备网络', '完成'] data: ['配置蓝牙', '初始化用户信息', '配备网络', '完成']
}, },
progressNext: false, progressNext: false,
device: null device: null
}, },
onLoad() { onLoad() {
ppScale.plugin.bus.subscribe("deviceInfo", (res) => { ppScale.plugin.bus.subscribe("deviceInfo", (res) => {
console.log("===》deviceInfo", res); console.log("===》deviceInfo", res);
ppScale.device.mac = res.serialNumber; ppScale.device.mac = res.serialNumber;
}); });
ppScale.plugin.bus.subscribe("deviceConnect", (res) => { ppScale.plugin.bus.subscribe("deviceConnect", (res) => {
console.log('===》deviceConnect', res); console.log('===》deviceConnect', res);
ppScale.plugin.ScaleAction.startDataProgress(true); ppScale.plugin.ScaleAction.startDataProgress(true);
ppScale.activeProtocol = ppScale.plugin.ScaleAction.getActiveProtocol(); ppScale.activeProtocol = ppScale.plugin.ScaleAction.getActiveProtocol();
ppScale.activeProtocol.codeUpdateMTU((res) => { ppScale.activeProtocol.codeUpdateMTU((res) => {
console.log("===》codeUpdateMTU", res); console.log("===》codeUpdateMTU", res);
ppScale.activeProtocol.codeFetchBindingState((res) => { ppScale.activeProtocol.codeFetchBindingState((res) => {
console.log("===》codeFetchBindingState", res); console.log("===》codeFetchBindingState", res);
ppScale.activeProtocol.codeSyncTime((codeSyncTime) => { ppScale.activeProtocol.codeSyncTime((codeSyncTime) => {
console.log("===》codeSyncTime", codeSyncTime) console.log("===》codeSyncTime", codeSyncTime)
wx.hideLoading(); wx.hideLoading();
if (res === 1) { if (res === 1) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '当前设备已被绑定，你确定要覆盖绑定吗？', content: '当前设备已被绑定，你确定要覆盖绑定吗？',
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
wx.showLoading({ wx.showLoading({
title: "正在初始化设备...", title: "正在初始化设备...",
mask: true mask: true
}); });
ppScale.activeProtocol.codeClearDeviceData("00", (res) => { ppScale.activeProtocol.codeClearDeviceData("00", (res) => {
console.log("deviceInfo === codeClearDeviceData", res); console.log("deviceInfo === codeClearDeviceData", res);
wx.hideLoading(); wx.hideLoading();
if(res === 0) { if (res === 0) {
let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); let scaleDeviceId = ppScale.device.mac.replace(/:/g, '');
let params = { let params = {
equipmentCode: scaleDeviceId, equipmentCode: scaleDeviceId,
}; };
$.ajax("weighingScale/del/device", params, "POST", true, "正在初始化设备...").then(res => { $.ajax("weighingScale/del/device", params, "POST", true, "正在初始化设备...").then(res => {
ppScale.plugin.Blue.stop(); ppScale.plugin.Blue.stop();
wx.showToast({ wx.showToast({
icon: "none", icon: "none",
title: "设备初始化成功，请重新绑定。", title: "设备初始化成功，请重新绑定。",
}) })
// device.list = []; // device.list = [];
// device.mac = null; // device.mac = null;
setTimeout(() => { setTimeout(() => {
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 1
}) })
}, 1500); }, 1500);
}); });
} else { } else {
ppScale.plugin.Blue.stop(); ppScale.plugin.Blue.stop();
wx.showToast({ wx.showToast({
icon: "none", icon: "none",
title: "设备初始化失败。", title: "设备初始化失败。",
}) })
} }
}) })
} else if (res.cancel) { } else if (res.cancel) {
// device.mac = null; // device.mac = null;
ppScale.plugin.Blue.stop(); ppScale.plugin.Blue.stop();
} }
} }
}) })
} else { } else {
ppScale.device.name = this.data.device.name; ppScale.device.name = this.data.device.name;
ppScale.device.connection = this.data.device; ppScale.device.connection = this.data.device;
const nameArr = this.data.device.name.split("-"); const nameArr = this.data.device.name.split("-");
ppScale.version = nameArr.length === 5 ? "domain2" : "domain1"; ppScale.version = nameArr.length === 5 ? "domain2" : "domain1";
if(this.data.progressNext) { if (this.data.progressNext) {
let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); let scaleDeviceId = ppScale.device.mac.replace(/:/g, '');
let params = { let params = {
sn: scaleDeviceId, sn: scaleDeviceId,
}; };
$.ajax("weighingScale/getUserInfoBySn", params, "GET", true, "正在同步用户信息...").then(res => { $.ajax("weighingScale/getUserInfoBySn", params, "GET", true, "正在同步用户信息...").then(res => {
if(res.result) { if (res.result) {
wx.setStorageSync("userInfo", res.result); wx.setStorageSync("userInfo", res.result);
this.setProgress(); this.setProgress();
} else { } else {
wx.removeStorageSync("userInfo"); wx.removeStorageSync("userInfo");
wx.showToast({ wx.showToast({
title: "暂无用户信息，请手动补充", title: "暂无用户信息，请手动补充",
icon: "none" icon: "none"
}) })
setTimeout(() => { setTimeout(() => {
this.setProgress(); this.setProgress();
}, 1500) }, 1500)
} }
}).catch(() => { }).catch(() => {
wx.showToast({ wx.showToast({
title: "用户信息同步失败，请手动补充", title: "用户信息同步失败，请手动补充",
icon: "none" icon: "none"
}) })
setTimeout(() => { setTimeout(() => {
this.setProgress(); this.setProgress();
}, 1500) }, 1500)
}) })
} }
} }
}) })
}) })
}); });
}); });
}, },
// 选择了某个设备 // 选择了某个设备
deviceChange(e) { deviceChange(e) {
let status = e.detail.status; let status = e.detail.status;
if(status) { if (status) {
wx.showLoading({ wx.showLoading({
title: "蓝牙配对中...", title: "蓝牙配对中...",
mask: true mask: true
}); });
this.setData({ this.setData({
progressNext: true progressNext: true
}) })
let device = e.detail.device; let device = e.detail.device;
this.connectedDevice_(device); this.connectedDevice_(device);
} }
}, },
connectedDevice(e) { connectedDevice(e) {
wx.showLoading({ ppScale.plugin.Blue.stop();
title: "正在尝试连接...", wx.showLoading({
mask: true title: "正在尝试连接...",
}); mask: true
this.setData({ });
progressNext: false this.setData({
}) progressNext: false
let device = e.detail.device; })
this.connectedDevice_(device); let device = e.detail.device;
}, this.connectedDevice_(device);
},
connectedDevice_(device) { connectedDevice_(device) {
if(device) { if (device) {
this.setData({ this.setData({
device: device device: device
}) })
ppScale.plugin.Blue.createBLEConnection(device); ppScale.plugin.Blue.createBLEConnection(device);
} }
}, },
setDeviceUserInfo(e) { setDeviceUserInfo(e) {
this.setData({ this.setData({
progressNext: true progressNext: true
}) })
let status = e.detail.status; let status = e.detail.status;
if(status) { if (status) {
this.setProgress(); this.setProgress();
} }
}, },
setDeviceConfig(e) { setDeviceConfig(e) {
let status = e.detail.status; let status = e.detail.status;
if(status) { if (status) {
this.setProgress(); this.setProgress();
} }
}, },
setConfigSuccessful() { setConfigSuccessful() {
ppScale.plugin.Blue.stop(); ppScale.plugin.Blue.stop();
wx.switchTab({ wx.switchTab({
url: "/pages/home/home" url: "/pages/home/home"
}) })
}, },
setProgress() { setProgress() {
this.setData({ this.setData({
["progress.index"]: this.data.progress.index + 1 ["progress.index"]: this.data.progress.index + 1
}) })
}, },
onUnload() { onUnload() {
ppScale.plugin.Blue.stop(); ppScale.plugin.Blue.stop();
} }
}) })