Skip to content

D
DoorLock
Commit 8a7a6d43 by 朱建香
Options

1.首页获取cid 

2.远程开门失败指令值更改
3.个推推送过来的门铃首页上没有动画和铃声表现
parent 76a6e035
Showing with 48 additions and 60 deletions
dev/src/public/public.js
......@@ -238,8 +238,4 @@ iot.navigator.getCurrentWebView = function (){
return plus.webview.currentWebview();
}
uPublic.loopUtils = function(func, opts, intervalTime, time){
}
export {iot, uPublic, uComponents}
\ No newline at end of file
dev/src/view/addDevice/v_index.js
......@@ -60,9 +60,19 @@ function backTap(){
//tap 扫描绑定设备
function scanAddTap(){
iot.navigator.openWindow({
// iot.navigator.openWindow({
// url: './scanCodeAdd.html',
// id: 'scanCodeAdd'
// });
mui.openWindow({
url: './scanCodeAdd.html',
id: 'scanCodeAdd'
id: 'scanCodeAdd',
show: {
aniShow: "none"
},
waiting: {
autoShow: false
}
});
}
......
dev/src/view/addDevice/v_scanCodeAdd.js
......@@ -11,18 +11,21 @@ import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
console.log("init" + new Date().getTime());
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
const app = new Vue({
data:{
//配置组件
componentsConfig: initComponentsConfig()
componentsConfig: initComponentsConfig(),
barcode: null
},
mounted(){
let self = this;
if (plus.os.name == 'Android') {
iot.permission.checkPermission(['CAMERA'], function (res) {
console.log('success', res);
console.log("openScanCode"+ new Date().getTime());
openScanCode(self);
}, function (err) {
console.log('error', err);
......@@ -34,7 +37,7 @@ function init() {
methods:{
//tap <
onBackTap(){
backTap();
backTap(this);
}
}
}).$mount('#app');
......@@ -57,21 +60,24 @@ function initComponentsConfig() {
}
//tap <
function backTap(){
function backTap(self){
iot.navigator.back();
console.log(self.barcode);
iot.utils.closeScanBarcode(self.barcode);
}
function openScanCode(self){
iot.utils.scanBarcode({
self.barcode = iot.utils.scanBarcode({
data: {
id: 'bcid',
styles: {
frameColor: '#00ffff',
scanbarColor: '#00ffff',
background: '#242b35'
background: '#3a3d54'
}
},
success: (response) => {
console.log("openScanCodeSuccess"+ new Date().getTime());
console.log(response);
let data = uPublic.checkResponseData(response.data);
if(data){
......
dev/src/view/device/v_index.js
......@@ -1025,17 +1025,17 @@ function pushAction(self, msg) {
//推送消息处理方法
function notifyDataProcessing(self, payload){
switch(payload.type){
case 'open':
case 'notify':
case 'alarm':
//开门推送、安全报警、劫持报警
//历史记录信息只拿一遍，不需要轮询
getLockInfo(self);
break;
case 'ring':
//门铃
setBellRing(self, payload.time);
break;
// case 'open':
// case 'notify':
// case 'alarm':
// //开门推送、安全报警、劫持报警
// //历史记录信息只拿一遍，不需要轮询
// getLockInfo(self);
// break;
// case 'ring':
// //门铃
// setBellRing(self, payload.time);
// break;
case 'remoteOpen':
//远程开门
setRemoteOpendoor(self, payload.time);
......@@ -1061,7 +1061,7 @@ function notificationListener(self) {
// 从系统消息中心点击消息启动应用事件
plus.push.addEventListener('click', function (msg) {
// console.log("收到了click");
// pushAction(self, msg);
pushAction(self, msg);
// alert("click"+JSON.stringify(msg));
}, false);
// 应用从推送服务器接收到推送消息事件
......
dev/src/view/login/v_index.js
......@@ -8,6 +8,7 @@
*/
import {iot, uPublic, uComponents} from '../../public/public.js';
import unotify from '../../public/unotify.js';
iot.ready(init);
function init() {
......@@ -25,9 +26,10 @@ function init() {
if(window.iotDebug){
iotDebug.push('start: Debug');
}
var clientInfo = plus.push.getClientInfo();
this.setClientId(clientInfo.clientid);
var self = this;
unotify.getCid(function(ret){
console.log(ret);
self.setClientId(ret);
if (plus.os.name == 'Android') {
iot.permission.checkPermission(['READ_EXTERNAL_STORAGE'], function (res) {
console.log('success', res);
......@@ -38,6 +40,9 @@ function init() {
}else{
loginButtonTap(self);
}
},function(err){
console.log(err);
})
},
methods:{
getShowLoginButtonFlag(){
......@@ -84,17 +89,19 @@ function initComponentsConfig() {
}
function loginButtonTap(self){
// if(window.iotDebug){
// iotDebug.push('start: initSDSLogin');
// }
// window.SDSPlugin.login({},(res)=>{
// console.log(res);
//// alert(res);
// var data = uPublic.checkResponseData(res.data);
// if(data){
//// alert("sds登陆成功");
// cloudsLogin(self, data.UserID);
// }
// },(err)=>{
// alert(error);
// console.log(err);
// })
iot.business.sds.login({
......@@ -102,12 +109,10 @@ function loginButtonTap(self){
userinfo: {}
},
success: (response) => {
// alert(JSON.stringify(response));
console.log(response);
if(window.iotDebug){
iotDebug.push('end: SDSloginSuccees');
}
// alert(JSON.stringify(response));
var data = uPublic.checkResponseData(response.data);
if(data){
self.setShowLoginButtonFlag(false);
......@@ -121,7 +126,6 @@ function loginButtonTap(self){
},
error: (error) => {
console.log(error);
// alert(JSON.stringify(error));
if(window.iotDebug){
iotDebug.push('end: sds登陆失败'+JSON.stringify(error));
}
......@@ -141,7 +145,6 @@ function cloudsLogin(self, id){
iotDebug.push('start: cloudsLogin');
}
iot.business.api.send('user/sds_login',{
// iot.business.user.simpleLogin({
data: {
username: id,
clienId: self.getClientId()
......@@ -153,6 +156,7 @@ function cloudsLogin(self, id){
if (window.iotDebug) {
iotDebug.upload(iot,'登陆流程时间');
}
console.log(response);
var data = uPublic.checkResponseData(response.data);
var infoArray = [];
if(data){
......@@ -179,9 +183,6 @@ function cloudsLogin(self, id){
}
uPublic.openRequestErrorAlert(self);
},
complete: () => {
// uComponents.hideLoading(self);
}
complete: () => {}
},false);
// });
}
\ No newline at end of file
web/lib/js/UIOT.js
This source diff could not be displayed because it is too large. You can view the blob instead.
web/lib/js/mui.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
web/view/addDevice/addDevice.css
......@@ -1184,7 +1184,7 @@ p {
}
.content {
position: absolute;
position: fixed;
top: 1.173rem;
bottom: 0;
left: 0;
......
web/view/addDevice/deviceList.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/addDevice/index.html
......@@ -16,7 +16,6 @@
</style>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/addDevice/scanCodeAdd.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/addDevice/wifiAdd.html
......@@ -17,7 +17,6 @@
<script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/addDevice/wifiAddHelp.html
......@@ -16,7 +16,6 @@
</style>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/bindUser/index.html
......@@ -16,7 +16,6 @@
</style>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/device/alarmInfo.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/device/hijackRecord.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/device/index.html
......@@ -17,7 +17,6 @@
<script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/device/opendoorRecord.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/device/remoteOpendoor.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/doorlockManage/editName.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
<div id="app" v-cloak>
......
web/view/doorlockManage/index.html
......@@ -17,7 +17,6 @@
<script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/doorlockUsers/addUnlockInfo.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/doorlockUsers/addUser.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/doorlockUsers/doorlockUser.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/doorlockUsers/editName.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/doorlockUsers/inviteBind.html
......@@ -17,7 +17,6 @@
<script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/doorlockUsers/unlockInfo.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/login/index.html
......@@ -18,7 +18,6 @@
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/SDSPlugin.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
......
web/view/myInfo/editNickname.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
<div id="app" v-cloak>
......
web/view/myInfo/editPassword.html
......@@ -17,7 +17,6 @@
<!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
<div id="app" v-cloak>
......
web/view/myInfo/index.html
......@@ -17,7 +17,6 @@
<script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/mui.min.js"></script>
</head>
<body ontouchstart="">
<div id="app" v-cloak>
......
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