From 656d86b53b4385b0d659e2840eea28420f1e0b30 Mon Sep 17 00:00:00 2001
From: lihua <531456470@qq.com>
Date: Sat, 15 Feb 2020 15:00:05 +0800
Subject: [PATCH] save

---
 common/dateUtils.js        |  22 ++++++++
 main.js                    |   1 +
 manifest.json              |   2 +-
 pages/device/device.vue    | 109 ++++++++++++-------------------------
 pages/device/real-data.vue |  35 ++++++++++++
 pages/home/home.vue        |  30 ----------
 6 files changed, 94 insertions(+), 105 deletions(-)
 create mode 100644 common/dateUtils.js
 create mode 100644 pages/device/real-data.vue

diff --git a/common/dateUtils.js b/common/dateUtils.js
new file mode 100644
index 0000000..835d376
--- /dev/null
+++ b/common/dateUtils.js
@@ -0,0 +1,22 @@
+Date.prototype.format = function(format) {
+	var o = {
+		"M+": this.getMonth() + 1, //month
+		"d+": this.getDate(), //day
+		"h+": this.getHours(), //hour
+		"m+": this.getMinutes(), //minute
+		"s+": this.getSeconds(), //second
+		"q+": Math.floor((this.getMonth() + 3) / 3), //quarter
+		"S": this.getMilliseconds() //millisecond
+	}
+
+	if (/(y+)/.test(format)) {
+		format = format.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+	}
+
+	for (var k in o) {
+		if (new RegExp("(" + k + ")").test(format)) {
+			format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+		}
+	}
+	return format;
+}
diff --git a/main.js b/main.js
index 8558c9f..2a36d73 100644
--- a/main.js
+++ b/main.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import App from './App'
 import store from './store'
+import './common/dateUtils'
 
 Vue.config.productionTip = false
 
diff --git a/manifest.json b/manifest.json
index fea9783..9394a07 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "hello-uni-app",
+    "name" : "humitureApp",
     "appid" : "__UNI__1E9AE51",
     "description" : "",
     "versionName" : "1.0.0",
diff --git a/pages/device/device.vue b/pages/device/device.vue
index 4144a0a..59831a2 100644
--- a/pages/device/device.vue
+++ b/pages/device/device.vue
@@ -1,39 +1,29 @@
 <template>
 	<view @touchstart="refreshStart" @touchmove="refreshMove" @touchend="refreshEnd">
 		<refresh ref="refresh" @isRefresh='isRefresh'></refresh>
+		<mSearch :mode="2" button="inside" @search="search($event)" ></mSearch>
 		
-		<mSearch :mode="2" button="inside" @search="search($event)" backgroundColor="#0081ff"></mSearch>
-		<nav-tab style="margin-top: -10upx;" textFlex :tab-list="tabList" :tabCur="tabCur" @change="tabChange" tab-class="text-center text-white bg-blue " select-class="text-white"></nav-tab>
-		
-		<view class="cu-list menu-avatar margin-top">
+		<view class="cu-list menu-avatar margin-top" v-for="(item,index) in deviceList" :key="index">
 			<view class="cu-item arrow">
 				<view class="cu-avatar round lg" style="background-image:url(/static/humiture.png);"></view>
 				<view class="content padding-tb-sm">
 					<view>
-						<text class="text-xl margin-left-xs">设备1</text> 
+						<text class="text-xl margin-left-xs">{{item.deviceNickName}}</text> 
 					</view>
 					<view class="flex">
-						<text class="flex-sub iconfont icon-wendu text-blue text-xs margin-left-xs">10&#8451;</text>
-						<text class="flex-sub iconfont icon-shidu text-blue text-xs ">12%</text>
+						<text class="flex-sub iconfont icon-wendu text-blue text-xs">
+							<text class="text-black">{{item.temp}}&#8451;</text>
+						</text>
+						<text class="flex-sub iconfont icon-shidu text-blue text-xs ">
+							<text class="text-black">{{item.rh}}%</text>
+						</text>
 					</view>
 				</view>
 				<view class="action">
-					<view class="text-grey text-xs">2019-08-01 22:20:09</view>
+					<view class="text-grey text-xs">{{item.at}}</view>
 				</view>
 			</view>
 		</view>
-		
-		<view class="content">
-			<uni-list v-for="(item,index) in deviceList" :key="index">
-				<uni-list-item
-					:title="item.deviceNickName"
-					:note="item.deviceName"
-					show-extra-icon
-					:extra-icon="getExtraIcon(item.deviceStatus)"
-					@click="handleClickItem(item)"
-				></uni-list-item>
-			</uni-list>
-		</view>
 
 		<uni-fab :pattern="pattern" :content="content" horizontal="right" vertical="bottom" direction="vertical" @trigger="trigger"></uni-fab>
 	</view>
@@ -41,27 +31,17 @@
 
 <script>
 import refresh from '@/components/refresh/refresh.vue';
-import uniNavBar from '@/components/uni-nav-bar/uni-nav-bar.vue';
 import mSearch from '@/components/mehaotian-search/mehaotian-search.vue';
-import navTab from '@/components/wuc-tab/wuc-tab.vue';
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
 import uniFab from '@/components/uni-fab/uni-fab.vue';
-import { getDeviceList } from '@/api/device.js'; 
+import { getDeviceList,getDeviceLatestUpMessage } from '@/api/device.js'; 
 export default {
 	components: {
 		refresh,
-		uniNavBar,
 		mSearch,
-		navTab,
-		uniList,
-		uniListItem,
 		uniFab
 	},
 	data() {
 		return {
-			tabCur: 0,
-			tabList: [{ name: '网关' }, { name: '终端' }],
 			deviceList: [],
 			pattern: {
                 color: '#7A7E83',
@@ -70,12 +50,6 @@ export default {
                 buttonColor:"#007AFF"
             },
 			content: [
-                {
-                    iconPath: '/static/gateway.png',
-                    selectedIconPath: '/static/gateway.png',
-                    text: '添加网关',
-                    active: false
-                },
                 {
                     iconPath: '/static/dtu.png',
                     selectedIconPath: '/static/dtu.png',
@@ -85,33 +59,27 @@ export default {
             ]
 		};
 	},
-	onLoad(e){
-		if(e.data !== undefined){
-			this.tabChange(e.data);
-		}else{
-			this.fetchDeviceList();
-		}
-	
+	onLoad(){
+		this.fetchDeviceList();
 	},
 	methods: {
-		getExtraIcon(active){
-			let color = '#e6e6e6';
-			if(active === 1){
-				color = '#4cd964';
-			}
-			return { color: color, size: '22', type: 'circle-filled'}
-		},
 		fetchDeviceList(){
 			getDeviceList().then(response => {
 				this.deviceList = []
 				if(response.data.list && response.data.list.length > 0){
 					response.data.list.forEach(item => {
-						if(this.tabCur === 0 && item.isGateway === 1){
-							this.deviceList.push(item)
-						}else if(this.tabCur === 1 && item.isGateway === 0){
-							
-							this.deviceList.push(item)
-						}
+						getDeviceLatestUpMessage(item.productId,item.deviceName).then(res =>{
+							if(res.data && res.data.data && res.data.data.app && res.data.data.app.userdata && res.data.data.app.userdata.payload){
+								const userdata = new Buffer(res.data.data.app.userdata.payload, 'base64');
+								try{
+									const json = JSON.parse(userdata.toString());
+									Object.assign(item, json);
+									item.at = new Date(res.data.timestamp).format('yyyy-MM-dd hh:mm:ss')
+									this.deviceList.push(item)
+								}catch(e){
+								}
+							}
+						})
 					})
 				}
 			})
@@ -144,29 +112,22 @@ export default {
 			})
 			this.deviceList = tempList;
 		},
-		tabChange(index) {
-			this.tabCur = index;
-			this.fetchDeviceList()
-		},
 		handleClickItem(item){
 			uni.navigateTo({
 				url: `detail/index?productId=${item.productId}&deviceName=${item.deviceName}`
 			})
 		},
 		trigger(e) {
-            console.log(e);
-            this.content[e.index].active = !e.item.active;
-            uni.showModal({
-                title: '提示',
-                content: `您${this.content[e.index].active?'选中了':'取消了'}${e.item.text}`,
-                success: function(res) {
-                    if (res.confirm) {
-                        console.log('用户点击确定');
-                    } else if (res.cancel) {
-                        console.log('用户点击取消');
-                    }
-                }
-            });
+			console.log(e);
+			this.content[e.index].active = !e.item.active;
+			uni.scanCode({
+			    onlyFromCamera: true,
+			    success: function (res) {
+					console.log(res)
+			        console.log('条码类型：' + res.scanType);
+			        console.log('条码内容：' + res.result);
+			    }
+			});
         }
 	}
 };
diff --git a/pages/device/real-data.vue b/pages/device/real-data.vue
new file mode 100644
index 0000000..f24a129
--- /dev/null
+++ b/pages/device/real-data.vue
@@ -0,0 +1,35 @@
+<template>
+	<view>
+		<uni-list v-for="(item,index) in realData" :key="index">
+			<uni-list-item :show-arrow="false" :title="item.name" :note="item.data"></uni-list-item>
+		</uni-list>
+	</view>
+</template>
+
+<script>
+	import uniList from '@/components/uni-list/uni-list.vue'
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue'
+	export default {
+		components: {
+			uniList,
+			uniListItem
+		},
+		props:{
+			msg:{
+				type: Object,
+				default: null
+			}
+		},
+		data() {
+			return {
+				realData: [{name:'温度',data:'21.1'},{name:'湿度',data:'11.1'},{name:'温度',data:'21.1'}]
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index e31a8cc..32836cb 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -5,16 +5,6 @@
 				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"><image :src="item.src" /></swiper-item>
 			</swiper>
 		</view>
-		<view class="cate-section">
-			<view class="cate-item" hover-class="hover" @tap="tapGateway">
-				<image src="/static/gateway.png"></image>
-				<text>网关</text>
-			</view>
-			<view class="cate-item" hover-class="hover" @tap="tapDtu">
-				<image src="/static/dtu.png"></image>
-				<text>终端</text>
-			</view>
-		</view>
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt"><view class="qiun-title-dot-light">设备概览</view></view>
 			<view class="qiun-charts"><canvas canvas-id="canvasRing" id="canvasRing" class="charts" @touchstart="touchRing"></canvas></view>
@@ -68,26 +58,6 @@ export default {
 				this.showRing('canvasRing', this.chartData);
 			});
 		},
-		tapGateway() {
-			uni.switchTab({
-				url: '/pages/device/device',
-				success: function(e) {
-					var page = getCurrentPages().pop();
-					if (page == undefined || page == null) return;
-					page.onLoad({ data: 0 });
-				}
-			});
-		},
-		tapDtu() {
-			uni.switchTab({
-				url: '/pages/device/device',
-				success: function(e) {
-					var page = getCurrentPages().pop();
-					if (page == undefined || page == null) return;
-					page.onLoad({ data: 1 });
-				}
-			});
-		},
 		showRing(canvasId, chartData) {
 			canvaRing = new uCharts({
 				$this: _self,