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

添加时间同步

Browse Source
This commit is contained in:
17792275749
2025-06-04 14:25:38 +08:00
parent 68bc3c267e
commit 3070b2b821
3 changed files with 84 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app.js
+6 -1
View File
@@ -153,7 +153,12 @@ App({
this.reconnectDevice() this.reconnectDevice()
} }
wx.hideLoading(); wx.hideLoading();
}); });
// 同步时间
this.globalData.ppScale.plugin.bus.subscribe("syncDeviceTimeSuccess", (res) => {
console.log("app.js ===> syncDeviceTimeSuccess", res);
})
// 设备自动断开监听 // 设备自动断开监听
this.globalData.ppScale.plugin.bus.subscribe("deviceWillDisconnect", (res) => { this.globalData.ppScale.plugin.bus.subscribe("deviceWillDisconnect", (res) => {
pages/configureDevice/configureDevice.js
+75 -71
View File
@@ -14,102 +14,106 @@ Page({
onLoad() { onLoad() {
ppScale.plugin.bus.subscribe("devicesModel", (res) => { ppScale.plugin.bus.subscribe("devicesModel", (res) => {
console.log("searchDevice ===》devicesModel", res); console.log("===》devicesModel", res);
ppScale.device.mac = res.deviceMac; ppScale.device.mac = res.deviceMac;
ppScale.plugin.bus.subscribe("deviceConnect", (res) => { ppScale.plugin.bus.subscribe("deviceConnect", (res) => {
console.log('connectedDevice ===》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("connectedDevice ===》codeUpdateMTU", res); console.log("===》codeUpdateMTU", res);
ppScale.activeProtocol.codeFetchBindingState((res) => { ppScale.activeProtocol.codeFetchBindingState((res) => {
console.log("connectedDevice ===》codeFetchBindingState", res); console.log("===》codeFetchBindingState", res);
wx.hideLoading(); ppScale.activeProtocol.codeSyncTime((codeSyncTime) => {
if (res === 1) { console.log("===》codeSyncTime", codeSyncTime)
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) { wx.hideLoading();
let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); if (res === 1) {
let params = { wx.showModal({
equipmentCode: scaleDeviceId, title: '提示',
}; content: '当前设备已被绑定，你确定要覆盖绑定吗？',
$.ajax("weighingScale/del/device", params, "POST", true, "正在初始化设备...").then(res => { 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(); ppScale.plugin.Blue.stop();
wx.showToast({ wx.showToast({
icon: "none", icon: "none",
title: "设备初始化成功，请重新绑定。", title: "设备初始化失败。",
}) })
// device.list = []; }
// device.mac = null; })
setTimeout(() => { } else if (res.cancel) {
wx.navigateBack({ // device.mac = null;
delta: 1 ppScale.plugin.Blue.stop();
}) }
}, 1500);
});
} else {
ppScale.plugin.Blue.stop();
wx.showToast({
icon: "none",
title: "设备初始化失败。",
})
}
})
} else if (res.cancel) {
// device.mac = null;
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; 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({
title: "暂无用户信息，请手动补充",
icon: "none"
})
setTimeout(() => {
this.setProgress();
}, 1500)
}
}).catch(() => {
wx.showToast({ wx.showToast({
title: "暂无用户信息，请手动补充", title: "用户信息同步失败，请手动补充",
icon: "none" icon: "none"
}) })
setTimeout(() => { setTimeout(() => {
this.setProgress(); this.setProgress();
}, 1500) }, 1500)
}
}).catch(() => {
wx.showToast({
title: "用户信息同步失败，请手动补充",
icon: "none"
}) })
setTimeout(() => { }
this.setProgress();
}, 1500)
})
} }
} })
}) })
}); });
}); });
pages/searchDevice/searchDevice.js
+1 -1
View File
@@ -218,7 +218,7 @@ Page({
let deviceNames = seviceList.map(item => item.deviceName); let deviceNames = seviceList.map(item => item.deviceName);
app.globalData.ppScale.plugin.Blue.start(deviceNames, false); app.globalData.ppScale.plugin.Blue.start(deviceNames, false);
app.globalData.ppScale.plugin.bus.subscribe("devicesList", (res) => { app.globalData.ppScale.plugin.bus.subscribe("devicesList", (res) => {
console.log("searchDevice ===> devicesList", res); // console.log("searchDevice ===> devicesList", res);
this.setData({ this.setData({
devicesList: res devicesList: res
}); });