Skip to content

D
DoorLock
Commit 0b2f0ad1 by 朱建香
Options

1027

parent 88c74ce6
Showing with 159 additions and 158 deletions
dev/src/view/addDevice/v_wifiAdd.js
......@@ -298,7 +298,7 @@ function bind(self, deviceId, productId){
console.log(response);
let data = response.data;
if(data.success){
uComponents.changeCommLoadingStatusAndText(self, 1, Vue.t('addDevice.scanCodeAdd'));
uComponents.changeCommLoadingStatusAndText(self, 1, Vue.t('addDevice.bindSuccess'));
self.setStatus(1);
}
},
......
dev/src/view/device/v_hijackRecord.js
......@@ -111,20 +111,20 @@ function initComponentsConfig() {
if(data.hasOwnProperty('info')){
self.setUserInfo(data.info);
}
console.log(config.hijackMode[20]);
for(let i=0; i<record.length; i++){
list[i] = {
value: record[i].openId,
leftImage: '../../resources/image/green_hijackMode5_icon.png',
title: "ID:"+record[i].openId,
leftImage: '../../resources/image/green_hijackMode20_icon.png',
subtitle: Vue.t('hijackRecord.'+config.hijackMode[record[i].mode]+''),
// title: ('ID:'+record[i].id),
rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss")
};
for(let j=0; j<self.getUserInfo().length; j++){
if(record[i].openId == self.getUserInfo()[j].openId && record[i].mode == self.getUserInfo()[j].mode){
if(self.getUserInfo()[j].nickname != null && self.getUserInfo()[j].id != null){
list[i].title = self.getUserInfo()[j].nickname + " ID:"+self.getUserInfo()[j].id;
}else if(self.getUserInfo()[j].nickname != null){
list[i].title = "ID:"+self.getUserInfo()[j].id;
if(self.getUserInfo()[j].nickname != null){
list[i].title = self.getUserInfo()[j].nickname;
}
}
}
......
dev/src/view/device/v_index.js
......@@ -382,7 +382,7 @@ function getLockInfo(self){
getDeviceStatus(self);
self.setIsFirstGetLockInfo(false);
}
if(data.info){
if(data.info && data.info.length){
self.newMsg = moment(data.info[0].time).format("YY.MM.DD HH:mm") + data.info[0].nickname + Vue.t('opendoorRecord.'+config.openDoorMode[data.info[0].mode]+'');
uComponents.changeMarqueeText(self, self.newMsg);
}else{
......@@ -414,12 +414,16 @@ function setDevceInfo(self, data) {
if(data.action.value == 'notify'){
if(data.notify_type.value == 104){
//门铃响了
self.setDoorbellRingingFlag(true);
self.setTextDoorbellRingingFlag(true);
self.setRingingTime(moment(data.time.value, "YY-MM-DD-hh-mm-ss").format("HH:mm"));
setTimeout(() => {
self.setDoorbellRingingFlag(false);
},3000);
let now = moment();
let time = moment(data.time.value, "YY-MM-DD-hh-mm-ss");
if(now.diff(time,'hours') < 24){
self.setDoorbellRingingFlag(true);
self.setTextDoorbellRingingFlag(true);
self.setRingingTime(time.format("HH:mm"));
setTimeout(() => {
self.setDoorbellRingingFlag(false);
},3000);
}
}else if(data.notify_type.value == 5){
//请求远程开门
self.setRemoteOpendoorFlag(true);
......
dev/src/view/doorlockUsers/v_doorlockUser.js
......@@ -41,6 +41,8 @@ function init() {
getUserInfo(self);
});
getUserInfo(this);
// showGuide(this);
},
methods:{
getBindShowFlag(){
......
dev/src/view/doorlockUsers/v_index.js
......@@ -237,11 +237,6 @@ function onTapUserList(self, listIndex) {
id: 'doorlockUser',
extras: {
id: self.getUserListData()[listIndex].id,
// userId: self.getUserListData()[listIndex].user_id,
// nickname: self.getUserListData()[listIndex].nickname,
// username: self.getUserListData()[listIndex].username,
// deviceId: self.getUserListData()[listIndex].device_id,
// role: self.getUserListData()[listIndex].role,
uuid: self.extras.uuid,
lockId: self.extras.lockId,
role: self.extras.role
......
web/view/addDevice/wifiAdd.js
......@@ -307,7 +307,7 @@ function bind(self, deviceId, productId) {
console.log(response);
var data = response.data;
if (data.success) {
_public.uComponents.changeCommLoadingStatusAndText(self, 1, Vue.t('addDevice.scanCodeAdd'));
_public.uComponents.changeCommLoadingStatusAndText(self, 1, Vue.t('addDevice.bindSuccess'));
self.setStatus(1);
}
},
......
web/view/device/hijackRecord.js
......@@ -15916,149 +15916,149 @@ var PAGE_SIZE = 10; /**
_public.iot.ready(init);
function init() {
//通用 list、dialog、loading组件
_public.uPublic.componentsInit(['u-list', 'u-dialog', 'u-loading']);
var app = new Vue({
data: {
//配置组件
componentsConfig: initComponentsConfig(),
list: [],
startId: 0,
deviceId: null,
userInfo: []
},
mounted: function mounted() {
resolve(this);
},
methods: {
getList: function getList() {
return this.list;
},
setList: function setList(list) {
this.list = list;
},
getStartId: function getStartId() {
return this.startId;
},
setStartId: function setStartId(id) {
this.startId = id;
},
getDeviceId: function getDeviceId() {
return this.deviceId;
},
setDeviceId: function setDeviceId(id) {
this.deviceId = id;
},
getUserInfo: function getUserInfo() {
return this.userInfo;
},
setUserInfo: function setUserInfo(info) {
this.userInfo = info;
},
onListLoadTap: function onListLoadTap() {
listLoadTap(this);
},
//tap <
onBackTap: function onBackTap() {
backTap();
}
}
}).$mount('#app');
//通用 list、dialog、loading组件
_public.uPublic.componentsInit(['u-list', 'u-dialog', 'u-loading']);
var app = new Vue({
data: {
//配置组件
componentsConfig: initComponentsConfig(),
list: [],
startId: 0,
deviceId: null,
userInfo: []
},
mounted: function mounted() {
resolve(this);
},
methods: {
getList: function getList() {
return this.list;
},
setList: function setList(list) {
this.list = list;
},
getStartId: function getStartId() {
return this.startId;
},
setStartId: function setStartId(id) {
this.startId = id;
},
getDeviceId: function getDeviceId() {
return this.deviceId;
},
setDeviceId: function setDeviceId(id) {
this.deviceId = id;
},
getUserInfo: function getUserInfo() {
return this.userInfo;
},
setUserInfo: function setUserInfo(info) {
this.userInfo = info;
},
onListLoadTap: function onListLoadTap() {
listLoadTap(this);
},
//tap <
onBackTap: function onBackTap() {
backTap();
}
}
}).$mount('#app');
}
//配置组件参数
function initComponentsConfig() {
return {
hijackRecordList: {
initParam: {
class: 'custom-list',
// list: [
// {value: 1, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'测试用户02', subtitle: '劫持指纹开门', rightText: '2017.07.1306:10:10'},
// {value: 2, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'ID:117', subtitle: '劫持指纹开门', rightText: '2017.07.0322:57:44'}
// ],
list: [],
tip: Vue.t('hijackRecord.noRecordTip')
}
},
dialog: {
initParam: {
class: 'custom-dialog'
}
},
loading: {
initParam: {
class: 'custom-loading'
}
}
};
return {
hijackRecordList: {
initParam: {
class: 'custom-list',
// list: [
// {value: 1, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'测试用户02', subtitle: '劫持指纹开门', rightText: '2017.07.1306:10:10'},
// {value: 2, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'ID:117', subtitle: '劫持指纹开门', rightText: '2017.07.0322:57:44'}
// ],
list: [],
tip: Vue.t('hijackRecord.noRecordTip')
}
},
dialog: {
initParam: {
class: 'custom-dialog'
}
},
loading: {
initParam: {
class: 'custom-loading'
}
}
};
}
function resolve(self) {
self.setDeviceId(_public.iot.navigator.getExtras().deviceId);
_public.uComponents.showLoading(self);
_public.iot.business.api.sendCustom('lock/getHistoryRecord', {
data: {
device_id: self.getDeviceId(),
action: 3,
start_id: self.getStartId(),
page_size: PAGE_SIZE
},
success: function success(response) {
var data = _public.uPublic.checkResponseData(response.data);
if (data) {
console.log(data);
var list = [];
var record = data.record;
if (data.hasOwnProperty('info')) {
self.setUserInfo(data.info);
}
for (var i = 0; i < record.length; i++) {
list[i] = {
value: record[i].openId,
leftImage: '../../resources/image/green_hijackMode5_icon.png',
subtitle: Vue.t('hijackRecord.' + _config2.default.hijackMode[record[i].mode] + ''),
// title: ('ID:'+record[i].id),
rightText: (0, _moment2.default)(record[i].time).format("YYYY.MM.DD HH:mm:ss")
};
for (var j = 0; j < self.getUserInfo().length; j++) {
if (record[i].openId == self.getUserInfo()[j].openId && record[i].mode == self.getUserInfo()[j].mode) {
if (self.getUserInfo()[j].nickname != null && self.getUserInfo()[j].id != null) {
list[i].title = self.getUserInfo()[j].nickname + " ID:" + self.getUserInfo()[j].id;
} else if (self.getUserInfo()[j].nickname != null) {
list[i].title = "ID:" + self.getUserInfo()[j].id;
}
}
}
}
self.setList(self.getList().concat(list));
if (record.length > 0) {
self.setStartId(record[record.length - 1].id);
self.setDeviceId(_public.iot.navigator.getExtras().deviceId);
_public.uComponents.showLoading(self);
_public.iot.business.api.sendCustom('lock/getHistoryRecord', {
data: {
device_id: self.getDeviceId(),
action: 3,
start_id: self.getStartId(),
page_size: PAGE_SIZE
},
success: function success(response) {
var data = _public.uPublic.checkResponseData(response.data);
if (data) {
console.log(data);
var list = [];
var record = data.record;
if (data.hasOwnProperty('info')) {
self.setUserInfo(data.info);
}
console.log(_config2.default.hijackMode[20]);
for (var i = 0; i < record.length; i++) {
list[i] = {
value: record[i].openId,
title: "ID:" + record[i].openId,
leftImage: '../../resources/image/green_hijackMode20_icon.png',
subtitle: Vue.t('hijackRecord.' + _config2.default.hijackMode[record[i].mode] + ''),
// title: ('ID:'+record[i].id),
rightText: (0, _moment2.default)(record[i].time).format("YYYY.MM.DD HH:mm:ss")
};
for (var j = 0; j < self.getUserInfo().length; j++) {
if (record[i].openId == self.getUserInfo()[j].openId && record[i].mode == self.getUserInfo()[j].mode) {
if (self.getUserInfo()[j].nickname != null) {
list[i].title = self.getUserInfo()[j].nickname;
}
}
}
}
self.setList(self.getList().concat(list));
if (record.length > 0) {
self.setStartId(record[record.length - 1].id);
}
//更新列表数据
_public.uComponents.changeList(self, self.getList());
} else {}
_public.uComponents.hideLoading(self);
},
error: function error(err) {
_public.uPublic.openRequestErrorAlert(self);
console.log(err);
},
complete: function complete() {
_public.uComponents.hideLoading(self);
}
//更新列表数据
_public.uComponents.changeList(self, self.getList());
} else {}
_public.uComponents.hideLoading(self);
},
error: function error(err) {
_public.uPublic.openRequestErrorAlert(self);
console.log(err);
},
complete: function complete() {
_public.uComponents.hideLoading(self);
}
});
});
}
//tap <
function backTap() {
_public.iot.navigator.back();
_public.iot.navigator.back();
}
//tap 点击加载更多
function listLoadTap(self) {
resolve(self);
resolve(self);
}
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1)["default"]))
......
web/view/device/index.js
......@@ -16293,7 +16293,7 @@ function getLockInfo(self) {
getDeviceStatus(self);
self.setIsFirstGetLockInfo(false);
}
if (data.info) {
if (data.info && data.info.length) {
self.newMsg = (0, _moment2.default)(data.info[0].time).format("YY.MM.DD HH:mm") + data.info[0].nickname + Vue.t('opendoorRecord.' + _config2.default.openDoorMode[data.info[0].mode] + '');
_public.uComponents.changeMarqueeText(self, self.newMsg);
} else {
......@@ -16324,12 +16324,16 @@ function setDevceInfo(self, data) {
if (data.action.value == 'notify') {
if (data.notify_type.value == 104) {
//门铃响了
self.setDoorbellRingingFlag(true);
self.setTextDoorbellRingingFlag(true);
self.setRingingTime((0, _moment2.default)(data.time.value, "YY-MM-DD-hh-mm-ss").format("HH:mm"));
setTimeout(function () {
self.setDoorbellRingingFlag(false);
}, 3000);
var now = (0, _moment2.default)();
var time = (0, _moment2.default)(data.time.value, "YY-MM-DD-hh-mm-ss");
if (now.diff(time, 'hours') < 24) {
self.setDoorbellRingingFlag(true);
self.setTextDoorbellRingingFlag(true);
self.setRingingTime(time.format("HH:mm"));
setTimeout(function () {
self.setDoorbellRingingFlag(false);
}, 3000);
}
} else if (data.notify_type.value == 5) {
//请求远程开门
self.setRemoteOpendoorFlag(true);
......
web/view/doorlockUsers/doorlockUser.js
......@@ -835,6 +835,7 @@ function init() {
getUserInfo(self);
});
getUserInfo(this);
// showGuide(this);
},
methods: {
......
web/view/doorlockUsers/index.js
......@@ -1059,11 +1059,6 @@ function _onTapUserList(self, listIndex) {
id: 'doorlockUser',
extras: {
id: self.getUserListData()[listIndex].id,
// userId: self.getUserListData()[listIndex].user_id,
// nickname: self.getUserListData()[listIndex].nickname,
// username: self.getUserListData()[listIndex].username,
// deviceId: self.getUserListData()[listIndex].device_id,
// role: self.getUserListData()[listIndex].role,
uuid: self.extras.uuid,
lockId: self.extras.lockId,
role: self.extras.role
......
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