Skip to content

D
DoorLock
Commit 3dccbc02 by 朱建香
Options

绑定时获取相对应手机好吗 

三条记录bug优化
parent e384f467
Showing with 84 additions and 43 deletions
custom/custom2/src/view/device/v_index.js
...@@ -637,13 +637,15 @@ function getLockInfoSuccess(self, data){ ...@@ -637,13 +637,15 @@ function getLockInfoSuccess(self, data){
}else{ }else{
iot.storage.delMaps(['historyId','history'], (response) => { iot.storage.delMaps(['historyId','history'], (response) => {
console.log(response); console.log(response);
updateHistoryMap(self, historyRecord); // updateHistoryMap(self, historyRecord);
uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]);
self.activeFlag = false;
}, (error) => { }, (error) => {
console.log(error); console.log(error);
}); });
} }
//拼接首页滚动的三条记录 //拼接首页滚动的三条记录
getTreenRecord(self, data.info.history.open); // getTreenRecord(self, data.info.history.open);
emit.emit('getLockInfoSuccess'); emit.emit('getLockInfoSuccess');
}else{ }else{
...@@ -655,22 +657,29 @@ function getLockInfoSuccess(self, data){ ...@@ -655,22 +657,29 @@ function getLockInfoSuccess(self, data){
//拼接首页滚动的三条记录 //拼接首页滚动的三条记录
function getTreenRecord(self, record){ function getTreenRecord(self, record){
if(record && record.length){ if(record && record.length){
self.newMsg = []; let aaaa = [];
console.log(self.newMsg); console.log("开始三条记录");
for(let i = record.length - 1; i >= 0; i--){ console.log(aaaa);
let msg = ''; // for(let i = record.length - 1; i >= 0; i--){
if((record[i].mode != 30) && (record[i].mode != 5)){ // let msg = '';
msg = record[i].nickname; // if((record[i].mode != 30) && (record[i].mode != 5)){
} // msg = record[i].nickname;
self.newMsg.push(moment(record[i].time).format("YY.MM.DD HH:mm")+ ' ' + msg + Vue.t('device.use') + Vue.t('opendoorRecord.'+config.openDoorMode[record[i].mode]+'')); // }
} // newMsg.push(moment(record[i].time).format("YY.MM.DD HH:mm")+ ' ' + msg + Vue.t('device.use') + Vue.t('opendoorRecord.'+config.openDoorMode[record[i].mode]+''));
console.log(self.newMsg); // }
uComponents.changeMarqueeText(self, self.newMsg); // console.log("三条记录");
if(self.newMsg.length >= 2){ // console.log(newMsg);
self.activeFlag = true; // uComponents.changeMarqueeText(self, newMsg);
}else{ // self.newMsg = newMsg;
self.activeFlag = false; // console.log('self.newMsg');
} // console.log(self.newMsg);
// if(newMsg.length >= 2){
// self.activeFlag = true;
// }else{
// self.activeFlag = false;
// }
uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]);
self.activeFlag = false;
}else{ }else{
uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]); uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]);
self.activeFlag = false; self.activeFlag = false;
......
dev/src/public/public.js
...@@ -218,6 +218,24 @@ uPublic.getUrlQuery = function (url){ ...@@ -218,6 +218,24 @@ uPublic.getUrlQuery = function (url){
} }
} }
//获取手机号码
uPublic.getPhoneNumber = function(data){
if(data.relAccounts){
let accounts = data.relAccounts;
let flag = false
for(let i=0; i<accounts.length; i++){
if(data.auid === accounts[i].auid){
return accounts[i].name;
flag = true;
}else if(flag === false){
return false;
}
}
}else{
return false;
}
}
iot.ready(() => { iot.ready(() => {
uPublic.recalc(); uPublic.recalc();
}); });
......
dev/src/view/addDevice/v_scanCodeAdd.js
...@@ -208,9 +208,10 @@ function getInfo(self, lockId, relId, uuid){ ...@@ -208,9 +208,10 @@ function getInfo(self, lockId, relId, uuid){
console.log(response); console.log(response);
let data = uPublic.checkResponseData(response.data); let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
console.log("phoneNumber");
console.log(uPublic.getPhoneNumber(data));
//云端绑定 //云端绑定
deviceBind(self, lockId, relId, data.auid); deviceBind(self, lockId, relId, data.auid);
// deviceBind(self, lockId, relId);
} }
}, },
error: (error) => { error: (error) => {
......
dev/src/view/addDevice/v_wifiAdd.js
...@@ -372,9 +372,10 @@ function getInfo(self, deviceId, productId,uuid){ ...@@ -372,9 +372,10 @@ function getInfo(self, deviceId, productId,uuid){
console.log(response); console.log(response);
let data = uPublic.checkResponseData(response.data); let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
console.log("phoneNumber");
console.log(uPublic.getPhoneNumber(data));
//云端绑定 //云端绑定
bind(self, deviceId, productId, data.auid); bind(self, deviceId, productId, data.auid);
// bind(self, deviceId, productId);
} }
}, },
error: (error) => { error: (error) => {
......
dev/src/view/c_checkwgtu.vue
...@@ -129,10 +129,11 @@ ...@@ -129,10 +129,11 @@
pid: productId pid: productId
}, },
success:function(response){ success:function(response){
console.log(response);
let data = uPublic.checkResponseData(response.data); let data = uPublic.checkResponseData(response.data);
if(data){ if(data){
//检查资源包的更新 //检查资源包的更新
checkWgtuUpdate(self, data, productId); checkWgtuUpdate(self, data.package, productId);
}else{ }else{
//无资源更新，使用默认版本 //无资源更新，使用默认版本
openDefaultIndex(); openDefaultIndex();
...@@ -168,7 +169,7 @@ ...@@ -168,7 +169,7 @@
console.log("必须更新app"); console.log("必须更新app");
updateApp(self); updateApp(self);
}else{ }else{
downloadWgtu(self, productId, data.now.download, data.now.ver, data.info.name); downloadWgtu(self, productId, data.now.download, data.now.ver, data.product.name);
} }
break; break;
case 1: case 1:
...@@ -186,7 +187,7 @@ ...@@ -186,7 +187,7 @@
console.log("必须更新app"); console.log("必须更新app");
updateApp(self); updateApp(self);
}else{ }else{
downloadWgtu(self, productId, data.now.download, data.now.ver, data.info.name); downloadWgtu(self, productId, data.now.download, data.now.ver, data.product.name);
} }
}} }}
); );
......
dev/src/view/device/v_index.js
...@@ -637,13 +637,15 @@ function getLockInfoSuccess(self, data){ ...@@ -637,13 +637,15 @@ function getLockInfoSuccess(self, data){
}else{ }else{
iot.storage.delMaps(['historyId','history'], (response) => { iot.storage.delMaps(['historyId','history'], (response) => {
console.log(response); console.log(response);
updateHistoryMap(self, historyRecord); // updateHistoryMap(self, historyRecord);
uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]);
self.activeFlag = false;
}, (error) => { }, (error) => {
console.log(error); console.log(error);
}); });
} }
//拼接首页滚动的三条记录 //拼接首页滚动的三条记录
getTreenRecord(self, data.info.history.open); // getTreenRecord(self, data.info.history.open);
emit.emit('getLockInfoSuccess'); emit.emit('getLockInfoSuccess');
}else{ }else{
......
web/custom/custom2/lib/js/p.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
web/custom/custom2/view/device/index.js
...@@ -2067,13 +2067,15 @@ function getLockInfoSuccess(self, data) { ...@@ -2067,13 +2067,15 @@ function getLockInfoSuccess(self, data) {
} else { } else {
_public.iot.storage.delMaps(['historyId', 'history'], function (response) { _public.iot.storage.delMaps(['historyId', 'history'], function (response) {
console.log(response); console.log(response);
updateHistoryMap(self, historyRecord); // updateHistoryMap(self, historyRecord);
_public.uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]);
self.activeFlag = false;
}, function (error) { }, function (error) {
console.log(error); console.log(error);
}); });
} }
//拼接首页滚动的三条记录 //拼接首页滚动的三条记录
getTreenRecord(self, data.info.history.open); // getTreenRecord(self, data.info.history.open);
emit.emit('getLockInfoSuccess'); emit.emit('getLockInfoSuccess');
} else { } else {
...@@ -2085,22 +2087,29 @@ function getLockInfoSuccess(self, data) { ...@@ -2085,22 +2087,29 @@ function getLockInfoSuccess(self, data) {
//拼接首页滚动的三条记录 //拼接首页滚动的三条记录
function getTreenRecord(self, record) { function getTreenRecord(self, record) {
if (record && record.length) { if (record && record.length) {
self.newMsg = []; var aaaa = [];
console.log(self.newMsg); console.log("开始三条记录");
for (var i = record.length - 1; i >= 0; i--) { console.log(aaaa);
var msg = ''; // for(let i = record.length - 1; i >= 0; i--){
if (record[i].mode != 30 && record[i].mode != 5) { // let msg = '';
msg = record[i].nickname; // if((record[i].mode != 30) && (record[i].mode != 5)){
} // msg = record[i].nickname;
self.newMsg.push((0, _moment2.default)(record[i].time).format("YY.MM.DD HH:mm") + ' ' + msg + Vue.t('device.use') + Vue.t('opendoorRecord.' + _config2.default.openDoorMode[record[i].mode] + '')); // }
} // newMsg.push(moment(record[i].time).format("YY.MM.DD HH:mm")+ ' ' + msg + Vue.t('device.use') + Vue.t('opendoorRecord.'+config.openDoorMode[record[i].mode]+''));
console.log(self.newMsg); // }
_public.uComponents.changeMarqueeText(self, self.newMsg); // console.log("三条记录");
if (self.newMsg.length >= 2) { // console.log(newMsg);
self.activeFlag = true; // uComponents.changeMarqueeText(self, newMsg);
} else { // self.newMsg = newMsg;
self.activeFlag = false; // console.log('self.newMsg');
} // console.log(self.newMsg);
// if(newMsg.length >= 2){
// self.activeFlag = true;
// }else{
// self.activeFlag = false;
// }
_public.uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]);
self.activeFlag = false;
} else { } else {
_public.uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]); _public.uComponents.changeMarqueeText(self, [Vue.t('device.noNewMsg')]);
self.activeFlag = false; self.activeFlag = false;
......
web/custom/custom2/view/device/index.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
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