Former-commit-id: 187bb3045680b2f5ae5f75f4897efc3b71c00c0e
Former-commit-id: 317ebc4e3e02461f488d7c0a3c41cdcea1a81e2f
TSXN
wanggang 5 years ago
parent ebbe16a7ee
commit 1fb492ccb9

@ -606,15 +606,16 @@ namespace IoTNode.DeviceServices.FBee
var state = BitConverter.ToInt16(ms.Read(2));
this.UpdateData(deviceRepo, device, device.CreateData(Keys.Warning, state == 1 ? "警报" : "正常", DeviceDataType.String, "状态", timestamp: timestamp));
}
else if(device.Name=="门锁")
{
var state = BitConverter.ToInt16(ms.Read(2));
}
//var historyData = ms.ReadHexString((int)(ms.Length - ms.Position));
//device.AddorUpdateData(device.CreateData(Keys.Data, historyData, DeviceDataType.String, Keys.Data, hidden: true));
this.UpdateData(deviceRepo, device, device.CreateData(Keys.ZoneType, zoneType, DeviceDataType.String, Keys.ZoneType, hidden: true, timestamp: timestamp));
//deviceRepo.SaveChanges();
//var deviceDto = device.To<EditDeviceModel>();
//this.SendToServer(Methods.EditDevice, deviceDto);
if (deviceId == 0x00a)
{
}
this.UpdateStatus(device);
}
else
@ -743,7 +744,7 @@ namespace IoTNode.DeviceServices.FBee
{
var list = new List<byte>
{
status,0x06,0x01,0x02,0x03,0x04,0x05,0x06
status,0x06,0x01^0x46,0x02^0x45,0x03^0x49,0x04^0x42,0x05^0x49,0x06^0x47
};
this.Write(sn, RequestType.x82, ieee, list, ep: ep);
}
@ -1318,6 +1319,7 @@ namespace IoTNode.DeviceServices.FBee
}
else if (clusterId == ClusterId.doorlock)
{
this.UpdateData(deviceRepo, device, device.CreateData(Keys.State, "远程开锁", DeviceDataType.String, "状态", timestamp: timestamp));
}
if (deviceId == 0x0163)
{

@ -25,6 +25,16 @@
"library": "vuex@3.2.0",
"destination": "wwwroot/lib/vuex",
"files": [ "vuex.min.js" ]
},
{
"library": "moment.js@2.26.0",
"destination": "wwwroot/lib/moment.js",
"files": ["locale/zh-cn.js","moment.min.js"]
},
{
"library": "ant-design-vue@1.5.3",
"destination": "wwwroot/lib/ant-design-vue",
"files": [ "antd.min.css", "antd.min.js"]
}
]
}

@ -2,6 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
<link rel="stylesheet" href="lib/ant-design-vue/antd.min.css" />
<title>loading</title>
</head>
<body>
@ -13,6 +14,11 @@
<script src="lib/vue/vue.min.js"></script>
<script src="lib/vuex/vuex.min.js"></script>
<script src="lib/vue-router/vue-router.min.js"></script>
<!--ui-->
<script src="lib/moment.js/moment.min.js"></script>
<script src="lib/moment.js/locale/zh-cn.js"></script>
<script src="lib/ant-design-vue/antd.min.js"></script>
<script src="lib/ant-design-vue/antd.min.js"></script>
<script src="js/index.js"></script>
</body>
</html>

@ -2,7 +2,8 @@
function parseModel(name, response) {
var html = new DOMParser().parseFromString(response.data, 'text/html');
var template = html.getElementsByTagName('template')[0].innerHTML;
var script = html.getElementsByTagName('script')[0].innerHTML + '//# sourceURL=' + name;
var script = html.getElementsByTagName('script')[0].innerHTML;
script = '(' + script.replace(/^\s*export\s*default\s*/, '').replace(/;\s*$/,'') + ')\n//# sourceURL=' + name;
var model = eval(script);
model.template = template;
return model;
@ -53,15 +54,14 @@ router.beforeEach((to, from, next) => {
}
});
//app
var isMobile = /(iPhone|iPad|iPod|iOS|Android)/i.test(navigator.userAgent);
const app = new Vue({
store: store,
router,
data: {
},
mounted: function () {
console.log('mounted:app');
setTimeout(function () {
PubSub.publish('msg','data');
PubSub.publish('msg', 'data');
}, 5000)
}
}).$mount('#app');

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1,129 @@
//! moment.js locale configuration
//! locale : Chinese (China) [zh-cn]
//! author : suupic : https://github.com/suupic
//! author : Zeno Zeng : https://github.com/zenozeng
//! author : uu109 : https://github.com/uu109
;(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined'
&& typeof require === 'function' ? factory(require('../moment')) :
typeof define === 'function' && define.amd ? define(['../moment'], factory) :
factory(global.moment)
}(this, (function (moment) { 'use strict';
//! moment.js locale configuration
var zhCn = moment.defineLocale('zh-cn', {
months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split(
'_'
),
monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split(
'_'
),
weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
weekdaysShort: '周日_周一_周二_周三_周四_周五_周六'.split('_'),
weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
longDateFormat: {
LT: 'HH:mm',
LTS: 'HH:mm:ss',
L: 'YYYY/MM/DD',
LL: 'YYYY年M月D日',
LLL: 'YYYY年M月D日Ah点mm分',
LLLL: 'YYYY年M月D日ddddAh点mm分',
l: 'YYYY/M/D',
ll: 'YYYY年M月D日',
lll: 'YYYY年M月D日 HH:mm',
llll: 'YYYY年M月D日dddd HH:mm',
},
meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
meridiemHour: function (hour, meridiem) {
if (hour === 12) {
hour = 0;
}
if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
return hour;
} else if (meridiem === '下午' || meridiem === '晚上') {
return hour + 12;
} else {
// '中午'
return hour >= 11 ? hour : hour + 12;
}
},
meridiem: function (hour, minute, isLower) {
var hm = hour * 100 + minute;
if (hm < 600) {
return '凌晨';
} else if (hm < 900) {
return '早上';
} else if (hm < 1130) {
return '上午';
} else if (hm < 1230) {
return '中午';
} else if (hm < 1800) {
return '下午';
} else {
return '晚上';
}
},
calendar: {
sameDay: '[今天]LT',
nextDay: '[明天]LT',
nextWeek: function (now) {
if (now.week() !== this.week()) {
return '[下]dddLT';
} else {
return '[本]dddLT';
}
},
lastDay: '[昨天]LT',
lastWeek: function (now) {
if (this.week() !== now.week()) {
return '[上]dddLT';
} else {
return '[本]dddLT';
}
},
sameElse: 'L',
},
dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
ordinal: function (number, period) {
switch (period) {
case 'd':
case 'D':
case 'DDD':
return number + '日';
case 'M':
return number + '月';
case 'w':
case 'W':
return number + '周';
default:
return number;
}
},
relativeTime: {
future: '%s后',
past: '%s前',
s: '几秒',
ss: '%d 秒',
m: '1 分钟',
mm: '%d 分钟',
h: '1 小时',
hh: '%d 小时',
d: '1 天',
dd: '%d 天',
M: '1 个月',
MM: '%d 个月',
y: '1 年',
yy: '%d 年',
},
week: {
// GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
dow: 1, // Monday is the first day of the week.
doy: 4, // The week that contains Jan 4th is the first week of the year.
},
});
return zhCn;
})));

File diff suppressed because one or more lines are too long

@ -1,12 +1,15 @@
<template>
<h2>{{title}}</h2>
<a-button type="primary" v-if="isMobile">
Primary
</a-button>
<h2 v-else>{{title}}</h2>
</template>
<script>
({
data: function(){
export default {
data: function () {
return {
title: '首页',
token:null
token: null
}
},
mounted: function () {
@ -18,5 +21,5 @@
beforeDestroy: function () {
PubSub.unsubscribe(this.token);
}
});
}
</script>

@ -2,7 +2,7 @@
<h2>{{title}}</h2>
</template>
<script>
({
export default {
data: function (){
return {
title: '登录',
@ -12,5 +12,5 @@
mounted: function () {
document.querySelector('title').innerHTML = this.title;
}
});
}
</script>
Loading…
Cancel
Save