Skip to content

W
wx-program
Commit f8aaae7e by 陈玉桐
Options

首页获取设备屏幕信息

parent 5827d754
Showing with 238 additions and 41 deletions
app.json
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/trainReport/trainReport",
"pages/historyDetail/historyDetail",
"pages/message/message",
"pages/eyesight/eyesight",
"pages/setting/setting",
"pages/childInfo/childInfo",
"pages/trainSort/trainSort",
"pages/updatePlan/updatePlan", "pages/updatePlan/updatePlan",
"pages/plan/plan", "pages/plan/plan",
"pages/historyDetail/historyDetail",
"pages/user/user", "pages/user/user",
"pages/mine/mine", "pages/mine/mine",
"pages/idea/idea", "pages/idea/idea",
"pages/message/message",
"pages/trainReport/trainReport",
"pages/starSort/starSort", "pages/starSort/starSort",
"pages/trainSort/trainSort",
"pages/eyesight/eyesight",
"pages/setting/setting",
"pages/whiteList/whiteList", "pages/whiteList/whiteList",
"pages/childInfo/childInfo",
"pages/targetList/targetList" "pages/targetList/targetList"
], ],
"window": { "window": {
......
assets/guide1.png
assets/guide1.png

29 KB | W: | H:

assets/guide1.png

31.6 KB | W: | H:

assets/guide1.png
assets/guide1.png
assets/guide1.png
assets/guide1.png
  • 2-up
  • Swipe
  • Onion skin
assets/indexDefault.png
assets/indexDefault.png

2.71 KB | W: | H:

assets/indexDefault.png

4.23 KB | W: | H:

assets/indexDefault.png
assets/indexDefault.png
assets/indexDefault.png
assets/indexDefault.png
  • 2-up
  • Swipe
  • Onion skin
pages/eyesight/eyesight.js
...@@ -61,6 +61,15 @@ Page({ ...@@ -61,6 +61,15 @@ Page({
}, },
eyesightNext: function () { eyesightNext: function () {
let me = this; let me = this;
console.log(me.data.luoData)
if(me.data.luoData.left=='-' || me.data.luoData.right=='-' || me.data.luoData.left=='' || me.data.luoData.right==''){
wx.showModal({
title: '提示',
showCancel: false,
content: '裸眼视力未选择'
})
return
}
// 是否第一次点击下一步 // 是否第一次点击下一步
if(me.data.first){ if(me.data.first){
// 如果是有弱视斜视散光，弹窗 // 如果是有弱视斜视散光，弹窗
......
pages/eyesight/eyesight.json
{ {
"navigationBarTitleText": "完善信息", "navigationBarTitleText": "初始视力",
"usingComponents": { "usingComponents": {
} }
} }
\ No newline at end of file
pages/eyesight/eyesight.wxml
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<!-- <view class="{{show?'eyesightBom':'eyesightPos'}}"> --> <!-- <view class="{{show?'eyesightBom':'eyesightPos'}}"> -->
<view class="eyesightPos"> <view class="eyesightPos">
<view id="eyesightBox"> <view id="eyesightBox">
<button id="eyesightBack" bindtap='eyesightBack'>上一步</button> <!-- <button id="eyesightBack" bindtap='eyesightBack'>上一步</button> -->
<button id="eyesightNext" bindtap='eyesightNext'>下一步</button> <button id="eyesightNext" bindtap='eyesightNext'>下一步</button>
</view> </view>
</view> </view>
......
pages/eyesight/eyesight.wxss
...@@ -163,7 +163,8 @@ switch{ ...@@ -163,7 +163,8 @@ switch{
padding:0 40rpx; padding:0 40rpx;
} }
#eyesightBox>button{ #eyesightBox>button{
width: 315rpx; /* width: 315rpx; */
width: 100%;
height: 94rpx; height: 94rpx;
line-height: 94rpx; line-height: 94rpx;
font-size: 36rpx; font-size: 36rpx;
......
pages/historyDetail/historyDetail.wxss
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
/* 常用应用 */ /* 常用应用 */
#common{ #common{
padding: 0 50rpx; padding: 0 50rpx 50rpx;
} }
#commonList{ #commonList{
display: flex; display: flex;
......
pages/index/index.js
...@@ -381,13 +381,15 @@ Page({ ...@@ -381,13 +381,15 @@ Page({
resultSortList:[], resultSortList:[],
timerId: '',// 定时器id timerId: '',// 定时器id
checkImg: '../../assets/indexDefault.png', checkImg: '../../assets/indexDefault.png',
trainingStatus: 2,//训练状态 1正在训练 0：未训练
trainingTime: 0,//当前训练时间
watchImgText: '加载中',//当前训练时间
mustUpdate: true, mustUpdate: true,
status: 1, status: 1,
currentSwiper: 0, currentSwiper: 0,
isRun: false,//训练状态
beginDay: '', beginDay: '',
endDay: '', endDay: '',
weekDuration: '',//周训练时长 weekDuration: '',//周训练时长
...@@ -476,6 +478,109 @@ Page({ ...@@ -476,6 +478,109 @@ Page({
}) })
} }
//获取当前时间戳
var timestamp = Date.parse(new Date());
timestamp = timestamp / 1000;
wx.request({
url: app.globalData.apiUrl + 'devices/watchingPic',
method: 'POST',
data: {
token: wx.getStorageSync('token'),
nowTime: timestamp // 当前时间戳，服务端会获取大于当前时间戳的图片信息
},
success: function (res) {
// 请求成功后关闭Loading
wx.hideLoading();
if(res.data.errno==200){
if(res.data.data){
me.setData({
trainingStatus: res.data.data.trainingStatus,//训练状态 1正在训练 0：未训练
checkImg: res.data.data.thumb,
trainingTime: 0
})
}else{
// 加载中
me.setData({
trainingStatus: 2,//训练状态 1正在训练 0：未训练
checkImg: '../../assets/indexDefault.png'
})
let times = 1
let timer = setInterval(function(){
// console.log(timestamp)
times++
console.log(times)
if(times>4){
me.setData({
watchImgText: '正在加载,马上就好了...',
})
}else{
me.setData({
watchImgText: '加载中',
})
}
if(times>16){
clearInterval(timer)
// 获取失败
me.setData({
trainingStatus: 4,//1正在训练 0：未训练 2加载中 3未在线 4获取失败
checkImg: '../../assets/indexDefault.png'
})
wx.showModal({
title: '提示',
showCancel: false,
content: '监控画面加载失败,请您手动刷新'
})
}
wx.request({
url: app.globalData.apiUrl + 'devices/watchingPic',
method: 'POST',
data: {
token: wx.getStorageSync('token'),
nowTime: timestamp // 当前时间戳，服务端会获取大于当前时间戳的图片信息
},
success: function (res) {
if(res.data.errno==200){
if(res.data.data){
me.setData({
trainingStatus: res.data.data.trainingStatus,//训练状态 1正在训练 0：未训练
checkImg: res.data.data.thumb,
trainingTime: res.data.data.nowTrainingDuration
})
clearInterval(timer)
}
}else{
// wx.showModal({
// title: '提示',
// showCancel: false,
// content: res.data.msg
// })
// 设备未在线
me.setData({
trainingStatus: 3,//训练状态 1正在训练 0：未训练
checkImg: '../../assets/indexDefault.png'
})
clearInterval(timer)
}
}
})
},1000)
}
}else{
// wx.showModal({
// title: '提示',
// showCancel: false,
// content: res.data.msg
// })
// 设备未在线
me.setData({
trainingStatus: 3,//训练状态 1正在训练 0：未训练
checkImg: '../../assets/indexDefault.png'
})
}
}
})
me.setData({ me.setData({
imgUrls: res.data.data.focusMap, imgUrls: res.data.data.focusMap,
bindDeviceStatus: res.data.data.bindDeviceStatus, bindDeviceStatus: res.data.data.bindDeviceStatus,
...@@ -678,10 +783,17 @@ Page({ ...@@ -678,10 +783,17 @@ Page({
}, },
// 刷新获取设备屏幕图片 // 刷新获取设备屏幕图片
refresh: function () { refresh: function () {
let me = this
//获取当前时间戳 //获取当前时间戳
var timestamp = Date.parse(new Date()); var timestamp = Date.parse(new Date());
timestamp = timestamp / 1000; timestamp = timestamp / 1000;
console.log("当前时间戳为：" + timestamp); console.log("当前时间戳为：" + timestamp);
// 加载中
me.setData({
watchImgText: '加载中',
trainingStatus: 2,//训练状态 1正在训练 0：未训练 2加载中 3未在线
checkImg: '../../assets/indexDefault.png'
})
// 请求前加Loading // 请求前加Loading
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
...@@ -695,15 +807,75 @@ Page({ ...@@ -695,15 +807,75 @@ Page({
nowTime: timestamp // 当前时间戳，服务端会获取大于当前时间戳的图片信息 nowTime: timestamp // 当前时间戳，服务端会获取大于当前时间戳的图片信息
}, },
success: function (res) { success: function (res) {
// // 请求成功后关闭Loading // 请求成功后关闭Loading
wx.hideLoading(); wx.hideLoading();
if(res.data.errno==200){ if(res.data.errno==200){
if(res.data.data){ if(res.data.data){
console.log(res.data.data.trainingStatus)//训练状态，1正在训练、0：未训练
console.log(res.data.data.thumb)
me.setData({ me.setData({
trainingStatus: res.data.data.trainingStatus,//训练状态 1正在训练 0：未训练
checkImg: res.data.data.thumb checkImg: res.data.data.thumb
}) })
}else{
let times = 1
let timer = setInterval(function(){
// console.log(timestamp)
times++
console.log(times)
if(times>4){
me.setData({
watchImgText: '正在加载,马上就好了...',
})
}else{
me.setData({
watchImgText: '加载中',
})
}
if(times>16){
clearInterval(timer)
// 获取失败
me.setData({
trainingStatus: 4,//1正在训练 0：未训练 2加载中 3未在线 4获取失败
checkImg: '../../assets/indexDefault.png'
})
wx.showModal({
title: '提示',
showCancel: false,
content: '监控画面加载失败,请您手动刷新'
})
}
wx.request({
url: app.globalData.apiUrl + 'devices/watchingPic',
method: 'POST',
data: {
token: wx.getStorageSync('token'),
nowTime: timestamp // 当前时间戳，服务端会获取大于当前时间戳的图片信息
},
success: function (res) {
if(res.data.errno==200){
if(res.data.data){
me.setData({
trainingStatus: res.data.data.trainingStatus,//训练状态 1正在训练 0：未训练
checkImg: res.data.data.thumb,
trainingTime: res.data.data.nowTrainingDuration
})
clearInterval(timer)
}
}else{
wx.showModal({
title: '提示',
showCancel: false,
content: res.data.msg
})
// 设备未在线
me.setData({
trainingStatus: 3,//训练状态 1正在训练 0：未训练
checkImg: '../../assets/indexDefault.png'
})
clearInterval(timer)
}
}
})
},1000)
} }
}else{ }else{
wx.showModal({ wx.showModal({
...@@ -711,6 +883,11 @@ Page({ ...@@ -711,6 +883,11 @@ Page({
showCancel: false, showCancel: false,
content: res.data.msg content: res.data.msg
}) })
// 设备未在线
me.setData({
trainingStatus: 3,//训练状态 1正在训练 0：未训练
checkImg: '../../assets/indexDefault.png'
})
} }
} }
}) })
...@@ -851,7 +1028,7 @@ Page({ ...@@ -851,7 +1028,7 @@ Page({
url: '/pages/out/out?url='+e.currentTarget.dataset.url url: '/pages/out/out?url='+e.currentTarget.dataset.url
}) })
}, },
onPullDownRefresh: function() { // onPullDownRefresh: function() {
wx.stopPullDownRefresh(); // wx.stopPullDownRefresh();
}, // },
}) })
\ No newline at end of file
pages/index/index.json
{ {
"usingComponents": { "usingComponents": {
"ec-canvas": "../../component/ec-canvas/ec-canvas" "ec-canvas": "../../component/ec-canvas/ec-canvas"
}, }
"enablePullDownRefresh": true
} }
\ No newline at end of file
pages/index/index.wxml
...@@ -48,16 +48,19 @@ ...@@ -48,16 +48,19 @@
<!-- 监控 --> <!-- 监控 -->
<view class="checkCon"> <view class="checkCon">
<view class="checkDes"> <view class="checkDes">
<text id="trainTime">设备使用中，今日已训练0分钟</text> <text id="trainTime" wx:if="{{trainingStatus==2}}">{{watchImgText}}</text>
<text id="trainTime" wx:elif="{{trainingStatus==3}}">设备未在线</text>
<text id="trainTime" wx:elif="{{trainingStatus==4}}">监控画面加载失败,请您手动刷新</text>
<text id="trainTime" wx:else>设备使用中，今日已训练{{trainingTime}}分钟</text>
<view id="powerBox" bindtap="PowerOff"> <view id="powerBox" bindtap="PowerOff">
<text class="PowerOff">立即关机</text> <text class="PowerOff">立即关机</text>
<image src="../../assets/power.png" /> <image src="../../assets/power.png" />
</view> </view>
</view> </view>
<view class="checkImg"> <view class="checkImg">
<view id="checkImgNo" wx:if="{{!isRun}}"> <view id="checkImgNo" wx:if="{{trainingStatus==2 || trainingStatus==3 || trainingStatus==4}}">
<image src="../../assets/indexDefault.png" /> <image src="../../assets/indexDefault.png" />
<view hidden="{{true}}" id="checkImgNoRefreshBox"><text id="checkImgNoRefresh">手动刷新</text></view> <view id="checkImgNoRefreshBox"><text wx:if="{{trainingStatus==2}}" id="checkImgNoRefresh">加载中</text><text wx:else bindtap="refresh" id="checkImgNoRefresh">刷新</text></view>
</view> </view>
<view id="checkImgConBox" wx:else> <view id="checkImgConBox" wx:else>
<image id="checkImgCon" src="{{checkImg}}" /> <image id="checkImgCon" src="{{checkImg}}" />
......
pages/index/index.wxss
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
height: 20rpx; height: 20rpx;
} }
.swiperBox{ .swiperBox{
padding: 10rpx 20rpx 20rpx; padding: 0 0 20rpx;
height: 220rpx; height: 230rpx;
background-color: #e6ece5; background-color: #e6ece5;
} }
.swiperCon{ /* .swiperCon{
border-radius:20rpx; border-radius:20rpx;
} } */
.slideImage{ .slideImage{
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -223,16 +223,20 @@ ...@@ -223,16 +223,20 @@
} }
#checkImgNoRefreshBox{ #checkImgNoRefreshBox{
position: absolute; position: absolute;
bottom: 0; top: 26rpx;
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
#checkImgNoRefresh{ #checkImgNoRefresh{
background: #e6ece5; display: inline-block;
border-radius: 10rpx; background: #50e3c2;
padding: 4rpx 10rpx; height: 50rpx;
color: #10d9b8; line-height: 50rpx;
font-size: 28rpx; border-radius: 50rpx;
text-align: center;
width: 130rpx;
color: #fff;
font-size: 24rpx;
} }
/* 目标 */ /* 目标 */
...@@ -621,10 +625,10 @@ ...@@ -621,10 +625,10 @@
} }
#guide1{ #guide1{
position: absolute; position: absolute;
top: 320rpx; top: 230rpx;
left: 0; left: 0;
width: 100%; width: 100%;
height: 387rpx; height: 308rpx;
} }
#guide2{ #guide2{
position: absolute; position: absolute;
......
pages/message/message.wxss
...@@ -29,7 +29,7 @@ switch{ ...@@ -29,7 +29,7 @@ switch{
#trainTipBom{ #trainTipBom{
background: #F8F7F5; background: #F8F7F5;
font-size: 34rpx; font-size: 30rpx;
color: #4F5051; color: #4F5051;
} }
#trainTipBomItem{ #trainTipBomItem{
...@@ -42,10 +42,11 @@ switch{ ...@@ -42,10 +42,11 @@ switch{
.trainLeft{ .trainLeft{
display: flex; display: flex;
align-items: center; align-items: center;
padding-left: 25rpx;
} }
.trainLeft>image{ .trainLeft>image{
width: 70rpx; width: 60rpx;
height: 70rpx; height: 60rpx;
margin-right: 15rpx; margin-right: 15rpx;
} }
pages/setting/setting.js
...@@ -322,7 +322,7 @@ Page({ ...@@ -322,7 +322,7 @@ Page({
settingDone: function (e){ settingDone: function (e){
wx.showModal({ wx.showModal({
title: '重要提示', title: '提示',
showCancel: true, showCancel: true,
content: '请确认是否保存', content: '请确认是否保存',
success (res) { success (res) {
......
pages/trainSort/trainSort.wxml
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<view>{{name}}</view> <view>{{name}}</view>
</view> </view>
<view class="sortListMeDetail"> <view class="sortListMeDetail">
<view>本周训练 <text>{{we.toFixed(userTraining/60)}}</text> 分钟</view> <view>训练 <text>{{we.toFixed(userTraining/60)}}</text> 分钟</view>
<view id="sortListMeDetailSort">本周排名 <text>{{userRanking}}</text></view> <view id="sortListMeDetailSort">排名 <text>{{userRanking}}</text></view>
</view> </view>
</view> </view>
</view> </view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment