|
|
@@ -37,14 +37,17 @@ Page({
|
|
|
formattedTime: '00:00:00', // 用于存储格式化后的时间
|
|
|
isRunning: false, // 计时器是否在运行
|
|
|
steps: 0, //运动步数
|
|
|
- startsteps: 0,
|
|
|
defferentstep: 0,
|
|
|
distance: 0,
|
|
|
calorie: 0,
|
|
|
pace: 0,
|
|
|
|
|
|
//
|
|
|
- activitdateid: '',
|
|
|
+ activitdateid: '', //ActivityData的id
|
|
|
+ show2: false, //继续上次运动
|
|
|
+ runlogList: [],
|
|
|
+
|
|
|
+ iscontinue: false
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -68,19 +71,159 @@ Page({
|
|
|
contentHeight,
|
|
|
navheight,
|
|
|
});
|
|
|
+ if (options.id) {
|
|
|
+ this.setData({
|
|
|
+ title: options.id
|
|
|
+ })
|
|
|
+ }
|
|
|
+ // 地图
|
|
|
+ this.Getlocation();
|
|
|
+ this.getWeRunData2(); // 获取初始步数
|
|
|
+ //判断是否继续运动
|
|
|
+ this.searchrulog()
|
|
|
+ },
|
|
|
+
|
|
|
+ //查询是否有为完成的记录
|
|
|
+ async searchrulog() {
|
|
|
+ const currentUser = Parse.User.current();
|
|
|
+ const {
|
|
|
+ startOfDay,
|
|
|
+ endOfDay
|
|
|
+ } = this.getTodayRange(); // 获取今天的日期范围
|
|
|
+
|
|
|
+ let query = new Parse.Query('ActivityRunLog');
|
|
|
+ query.equalTo('company', company);
|
|
|
+ query.equalTo('user', currentUser.id);
|
|
|
+ query.notEqualTo('isDeleted', true);
|
|
|
+ query.greaterThanOrEqualTo('createdAt', startOfDay);
|
|
|
+ query.lessThanOrEqualTo('createdAt', endOfDay);
|
|
|
+ query.descending('createdAt');
|
|
|
+
|
|
|
+ let P = await query.find();
|
|
|
+ let runlogList = P.map(item => item.toJSON());
|
|
|
+
|
|
|
+ if (runlogList.length == 0) {
|
|
|
+ console.log('今日无数据');
|
|
|
+ // 今日无数据
|
|
|
+ this.startdate(); // 创建开始数据
|
|
|
+ this.getWeRunData2(); // 获取初始步数
|
|
|
+ this.startbackgroumd(); // 开启后台定位
|
|
|
+ return
|
|
|
+
|
|
|
+ } else {
|
|
|
+ console.log('今日有数据');
|
|
|
+ console.log(runlogList);
|
|
|
+
|
|
|
+ if (runlogList[0].stage == 'end') {
|
|
|
+ console.log('可以开始');
|
|
|
+ this.startdate(); // 创建开始数据
|
|
|
+ this.getWeRunData2(); // 获取初始步数
|
|
|
+ this.startbackgroumd(); // 开启后台定位
|
|
|
+
|
|
|
+ return
|
|
|
+ } else {
|
|
|
+ console.log('是否继续运动');
|
|
|
+ this.setData({
|
|
|
+ runlogList,
|
|
|
+ show2: true,
|
|
|
+ })
|
|
|
+ this.stop()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
+ // 继续上次运动
|
|
|
+ async continueLastActivity(lastRunlog) {
|
|
|
+ console.log(lastRunlog);
|
|
|
+ const id = await this.getActivityDataid(); // 获取 ActivityData ID
|
|
|
+ console.log('id', id);
|
|
|
this.setData({
|
|
|
- title: options.id
|
|
|
+ distance: lastRunlog.distance,
|
|
|
+ totalSeconds: lastRunlog.sportDate,
|
|
|
+ defferentstep: lastRunlog.steps,
|
|
|
+ calorie: lastRunlog.burnCalories,
|
|
|
+ activitdateid: id,
|
|
|
})
|
|
|
- // 获取初始步数
|
|
|
- // 获取初始步数
|
|
|
- this.getWeRunData2()
|
|
|
- console.log(this.data.startsteps);
|
|
|
- // 地图
|
|
|
- await this.Getlocation();
|
|
|
- //开启后台定位
|
|
|
- this.startbackgroumd()
|
|
|
- //创建开始数据
|
|
|
- this.startdate()
|
|
|
+ this.startbackgroumd(); // 开启后台定位
|
|
|
+ },
|
|
|
+
|
|
|
+ // 开启新运动
|
|
|
+ async startNewActivity() {
|
|
|
+ await this.getWeRunData2(); // 获取初始步数
|
|
|
+ this.startbackgroumd(); // 开启后台定位
|
|
|
+ await this.startdate(); // 创建开始数据
|
|
|
+ },
|
|
|
+ //今天时间范围
|
|
|
+ getTodayRange() {
|
|
|
+ const now = new Date();
|
|
|
+ const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0, 0); // 今天的开始时间
|
|
|
+ const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999); // 今天的结束时间
|
|
|
+ return {
|
|
|
+ startOfDay,
|
|
|
+ endOfDay
|
|
|
+ };
|
|
|
+ },
|
|
|
+ //查找继续运动的ActivityData的id
|
|
|
+ async getActivityDataid() {
|
|
|
+ try {
|
|
|
+ const currentUser = Parse.User.current();
|
|
|
+ const {
|
|
|
+ startOfDay,
|
|
|
+ endOfDay
|
|
|
+ } = this.getTodayRange(); // 获取今天的日期范围
|
|
|
+
|
|
|
+ // 查询最近一条 stage 为 "start" 的 ActivityRunLog
|
|
|
+ const runlogQuery = new Parse.Query('ActivityRunLog');
|
|
|
+ runlogQuery.equalTo('company', company);
|
|
|
+ runlogQuery.equalTo('user', currentUser.id);
|
|
|
+ runlogQuery.notEqualTo('isDeleted', true);
|
|
|
+ runlogQuery.equalTo('stage', 'start');
|
|
|
+ runlogQuery.greaterThanOrEqualTo('createdAt', startOfDay);
|
|
|
+ runlogQuery.lessThanOrEqualTo('createdAt', endOfDay);
|
|
|
+ runlogQuery.descending('createdAt');
|
|
|
+ runlogQuery.limit(1);
|
|
|
+
|
|
|
+ const latestRunlog = await runlogQuery.first();
|
|
|
+ if (!latestRunlog) {
|
|
|
+ throw new Error('未找到符合条件的 ActivityRunLog 记录');
|
|
|
+ }
|
|
|
+ // 查询对应的 ActivityData
|
|
|
+ const activityDataQuery = new Parse.Query('ActivityData');
|
|
|
+ activityDataQuery.equalTo('company', company);
|
|
|
+ activityDataQuery.equalTo('user', currentUser.id);
|
|
|
+ activityDataQuery.notEqualTo('isDeleted', true);
|
|
|
+ activityDataQuery.equalTo('runlog', latestRunlog.id); // 使用 latestRunlog.id
|
|
|
+
|
|
|
+ const activityData = await activityDataQuery.first();
|
|
|
+ if (!activityData) {
|
|
|
+ throw new Error('未找到对应的 ActivityData 记录');
|
|
|
+ }
|
|
|
+
|
|
|
+ return activityData.id; // 返回 ActivityData 的 objectId
|
|
|
+ } catch (error) {
|
|
|
+ console.error('获取 ActivityData ID 失败:', error);
|
|
|
+ throw error;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //取消弹窗
|
|
|
+ onClose2() {
|
|
|
+ this.setData({
|
|
|
+ show2: false,
|
|
|
+ });
|
|
|
+ this.getWeRunData2(); // 获取初始步数
|
|
|
+ this.continue()
|
|
|
+ this.startNewActivity()
|
|
|
+ },
|
|
|
+ //确认返回
|
|
|
+ onConfirm2() {
|
|
|
+ this.setData({
|
|
|
+ show2: false,
|
|
|
+ iscontinue: true
|
|
|
+ });
|
|
|
+ this.getWeRunData2(); // 获取初始步数
|
|
|
+ this.continue()
|
|
|
+ this.continueLastActivity(this.data.runlogList[0]);
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -94,7 +237,7 @@ Page({
|
|
|
* 生命周期函数--监听页面显示
|
|
|
*/
|
|
|
onShow: function () {
|
|
|
- if (!this.data.isRunning && !this.data.isstop) {
|
|
|
+ if (!this.data.isstop) {
|
|
|
this.startTimer();
|
|
|
}
|
|
|
},
|
|
|
@@ -198,16 +341,20 @@ Page({
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ //继续计时
|
|
|
+ continue () {
|
|
|
+ this.setData({
|
|
|
+ isstop: false
|
|
|
+ })
|
|
|
+ this.startTimer()
|
|
|
+ },
|
|
|
+ //停止计时
|
|
|
stop() {
|
|
|
|
|
|
this.setData({
|
|
|
- isstop: !this.data.isstop
|
|
|
+ isstop: true,
|
|
|
})
|
|
|
- if (this.data.isstop) {
|
|
|
- this.stopTimer()
|
|
|
- } else {
|
|
|
- this.startTimer()
|
|
|
- }
|
|
|
+ this.stopTimer()
|
|
|
|
|
|
console.log(this.data.isstop);
|
|
|
},
|
|
|
@@ -280,7 +427,7 @@ Page({
|
|
|
goback() {
|
|
|
this.setData({
|
|
|
show: true,
|
|
|
- isstop: false,
|
|
|
+ isstop: true,
|
|
|
})
|
|
|
},
|
|
|
//取消弹窗
|
|
|
@@ -294,7 +441,7 @@ Page({
|
|
|
wx.navigateBack({
|
|
|
delta: 1 // 返回的页面层数，1 表示返回上一页
|
|
|
});
|
|
|
- this.stopBackgroundLocation()// 停止后台定位和位置监听
|
|
|
+ this.stopBackgroundLocation() // 停止后台定位和位置监听
|
|
|
},
|
|
|
//开始计时或继续计时
|
|
|
startTimer: function () {
|
|
|
@@ -357,7 +504,7 @@ Page({
|
|
|
this.decryptData(encryptedData, iv, session_key).then(async steps => {
|
|
|
console.log('再次赋值');
|
|
|
await this.setData({
|
|
|
- startsteps: steps,
|
|
|
+ steps: steps,
|
|
|
});
|
|
|
console.log('用户步数:', this.data.steps);
|
|
|
}).catch(err => {
|
|
|
@@ -382,9 +529,11 @@ Page({
|
|
|
// 假设你有一个解密函数 decryptData
|
|
|
this.decryptData(encryptedData, iv, session_key).then(async steps => {
|
|
|
console.log('再次赋值');
|
|
|
+ const defferentstep = steps - this.data.steps + this.data.defferentstep
|
|
|
await this.setData({
|
|
|
- steps: steps,
|
|
|
- defferentstep: steps - this.data.startsteps
|
|
|
+ // defferentstep: steps - this.data.startsteps
|
|
|
+ defferentstep,
|
|
|
+ steps,
|
|
|
});
|
|
|
console.log('用户步数:', this.data.steps);
|
|
|
}).catch(err => {
|
|
|
@@ -410,14 +559,6 @@ Page({
|
|
|
sessionKey: session_key
|
|
|
},
|
|
|
success: (res) => {
|
|
|
- // if (res.data && res.data.steps) {
|
|
|
- // console.log(res.data.steps);
|
|
|
- // // resolve(res.data.steps); // 返回步数
|
|
|
- // // const steps = 123456
|
|
|
- // resolve(steps);
|
|
|
- // } else {
|
|
|
- // reject('解密返回数据格式错误');
|
|
|
- // }
|
|
|
if (res.data.data) {
|
|
|
const stepInfoList = res.data.data.stepInfoList
|
|
|
const todaylist = stepInfoList.filter(item => {
|
|
|
@@ -448,6 +589,7 @@ Page({
|
|
|
},
|
|
|
// 开启后台定位
|
|
|
startbackgroumd() {
|
|
|
+ console.log('后台定位函数执行');
|
|
|
wx.startLocationUpdateBackground({
|
|
|
success: (res) => {
|
|
|
// 开始监听GPS数据
|
|
|
@@ -455,8 +597,10 @@ Page({
|
|
|
// 在这里处理位置变化的逻辑
|
|
|
console.log('位置已更新:', res);
|
|
|
});
|
|
|
+ console.log('后台定位打开');
|
|
|
},
|
|
|
fail: (res) => {
|
|
|
+ console.log(res);
|
|
|
// 授权失败后引导用户打开定位信息
|
|
|
// 可以添加提示或引导用户操作的代码
|
|
|
}
|
|
|
@@ -474,17 +618,27 @@ Page({
|
|
|
// 更新总距离
|
|
|
const totalDistance = parseFloat((Number(this.data.distance) + Number(distance)).toFixed(3));
|
|
|
|
|
|
- if(totalDistance!=this.data.distance){
|
|
|
+ if (totalDistance != this.data.distance) {
|
|
|
this.progressdate()
|
|
|
this.progressActivitydate()
|
|
|
}
|
|
|
// 计算卡路里
|
|
|
const calorie = this.getCalorie(60, totalDistance); // 假设体重为60kg
|
|
|
- let pace =0
|
|
|
- if(res.speed>0){
|
|
|
- pace = parseFloat(Number((res.speed*3.6).toFixed(2))); // 配速（km/h）
|
|
|
- console.log(pace);
|
|
|
+ let pace = 0
|
|
|
+ // if (this.data.title == '步行') {
|
|
|
+ // pace = (totalDistance / (this.data.totalSeconds / 3600)) || 0;
|
|
|
+ // pace = parseFloat(pace.toFixed(2));
|
|
|
+ // }else{
|
|
|
+
|
|
|
+ // }
|
|
|
+ if(this.data.totalSeconds&&totalDistance){
|
|
|
+ pace = ((this.data.totalSeconds / 60)/totalDistance) || 0;
|
|
|
+ pace = parseFloat(pace.toFixed(2));
|
|
|
}
|
|
|
+ // if (res.speed > 0) {
|
|
|
+ // pace = parseFloat(Number((res.speed * 3.6).toFixed(2))); // 配速（km/h）
|
|
|
+ // console.log(pace);
|
|
|
+ // }
|
|
|
console.log('总距离', totalDistance, '段距离', distance, '总卡路里', calorie, '配速', pace);
|
|
|
// 更新状态
|
|
|
this.setData({
|
|
|
@@ -586,31 +740,33 @@ Page({
|
|
|
},
|
|
|
//创建开始数据
|
|
|
async startdate() {
|
|
|
- const currentUser = Parse.User.current();
|
|
|
- let Userquery = new Parse.Query('_User');
|
|
|
- Userquery.equalTo('company', company);
|
|
|
- Userquery.equalTo('objectId', currentUser.id);
|
|
|
- Userquery.notEqualTo('isDeleted', true)
|
|
|
- let user = await Userquery.first();
|
|
|
-
|
|
|
- let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
|
|
|
- let query = new Parse.Object('ActivityRunLog');
|
|
|
- query.set('user', user.toPointer())
|
|
|
- query.set('company', companyPointer)
|
|
|
- query.set('stage', 'start ')
|
|
|
- query.set('steps', 0) //步数
|
|
|
- query.set('distance', 0) //距离
|
|
|
- query.set('matchSpeed', 0) //配速
|
|
|
- query.set('sportDate', 0) //运动时间
|
|
|
- query.set('burnCalories', 0) //卡路里
|
|
|
- try {
|
|
|
- let saveDate2 = await query.save();
|
|
|
- console.log(saveDate2);
|
|
|
- const id = saveDate2.id
|
|
|
- await this.startActivitdate(id)
|
|
|
- console.log("新数据保存成功");
|
|
|
- } catch (error) {
|
|
|
- console.error("保存数据时出现错误:", error);
|
|
|
+ if (!this.data.iscontinue) {
|
|
|
+ const currentUser = Parse.User.current();
|
|
|
+ let Userquery = new Parse.Query('_User');
|
|
|
+ Userquery.equalTo('company', company);
|
|
|
+ Userquery.equalTo('objectId', currentUser.id);
|
|
|
+ Userquery.notEqualTo('isDeleted', true)
|
|
|
+ let user = await Userquery.first();
|
|
|
+
|
|
|
+ let companyPointer = Parse.Object.extend('Company').createWithoutData(company);
|
|
|
+ let query = new Parse.Object('ActivityRunLog');
|
|
|
+ query.set('user', user.toPointer())
|
|
|
+ query.set('company', companyPointer)
|
|
|
+ query.set('stage', 'start')
|
|
|
+ query.set('steps', 0) //步数
|
|
|
+ query.set('distance', 0) //距离
|
|
|
+ query.set('matchSpeed', 0) //配速
|
|
|
+ query.set('sportDate', 0) //运动时间
|
|
|
+ query.set('burnCalories', 0) //卡路里
|
|
|
+ try {
|
|
|
+ let saveDate2 = await query.save();
|
|
|
+ console.log(saveDate2);
|
|
|
+ const id = saveDate2.id
|
|
|
+ await this.startActivitdate(id)
|
|
|
+ console.log("创建开始数据");
|
|
|
+ } catch (error) {
|
|
|
+ console.error("保存数据时出现错误:", error);
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
//创建ActivityData数据
|
|
|
@@ -632,6 +788,16 @@ Page({
|
|
|
query.set('user', user.toPointer())
|
|
|
query.set('company', companyPointer)
|
|
|
query.set('runlog', Activit.toPointer())
|
|
|
+ // if (this.data.title == '步行') {
|
|
|
+ // query.set('type', 'walk')
|
|
|
+ // } else if (this.data.title == '跑步') {
|
|
|
+ // query.set('type', 'run')
|
|
|
+ // } else {
|
|
|
+ // query.set('type', 'activity')
|
|
|
+ // }
|
|
|
+ if (this.data.title) {
|
|
|
+ query.set('type', 'activity')
|
|
|
+ }
|
|
|
try {
|
|
|
let saveDate2 = await query.save();
|
|
|
this.setData({
|
|
|
@@ -658,7 +824,7 @@ Page({
|
|
|
let query = new Parse.Object('ActivityRunLog');
|
|
|
query.set('user', user.toPointer())
|
|
|
query.set('company', companyPointer)
|
|
|
- query.set('stage', 'progress ')
|
|
|
+ query.set('stage', 'progress')
|
|
|
query.set('steps', this.data.defferentstep) //步数
|
|
|
query.set('distance', this.data.distance) //距离
|
|
|
query.set('matchSpeed', this.data.pace) //配速
|
|
|
@@ -681,7 +847,7 @@ Page({
|
|
|
query.equalTo('objectId', this.data.activitdateid);
|
|
|
query.notEqualTo('isDeleted', true)
|
|
|
let Activit = await query.first();
|
|
|
- console.log('Activit',Activit);
|
|
|
+ console.log('Activit', Activit);
|
|
|
if (Activit) {
|
|
|
Activit.set('steps', this.data.defferentstep) //步数
|
|
|
Activit.set('distance', this.data.distance) //距离
|
|
|
@@ -710,7 +876,7 @@ Page({
|
|
|
let query = new Parse.Object('ActivityRunLog');
|
|
|
query.set('user', user.toPointer())
|
|
|
query.set('company', companyPointer)
|
|
|
- query.set('stage', 'end ')
|
|
|
+ query.set('stage', 'end')
|
|
|
query.set('steps', this.data.defferentstep) //步数
|
|
|
query.set('distance', this.data.distance) //距离
|
|
|
query.set('matchSpeed', this.data.pace) //配速
|
