1211代码优化

76353011 · 朱建香 · fd29a166 · 76353011 · 76353011 · 76353011
Commit 76353011 authored Dec 11, 2017 by 朱建香
29 changed files
--- a/dev/src/lang/zh.json
+++ b/dev/src/lang/zh.json
@@ -37,7 +37,7 @@
        "login": "登录",
        "register": "注册",
        "forgetPassword": "忘记密码",
-        "device": "智能指纹锁",
+        "device": "U智锁",
        "opendoorRecord": "开门记录",
        "alarmInfo": "报警信息",
        "remoteOpendoor": "远程开门",

--- a/dev/src/public/public.js
+++ b/dev/src/public/public.js
@@ -239,31 +239,7 @@ iot.navigator.getCurrentWebView = function (){
 }

 uPublic.loopUtils = function(func, opts, intervalTime, time){
-	var _this = this;
-	var params = _extends({}, opts);
-    var loop = function loop() {
-        var handle = setTimeout(function () {
-            _this.loopUtils(func, opts, intervalTime, time);
-            window.clearTimeout(handle);
-        }, intervalTime);
-    };
-    params.success = function (ret) {
-        if (opts.success(ret) === false) {
-            return;
-        }
-        loop();
-    };
-    params.error = function (err) {
-        if (opts.error(err) === false) {
-            return;
-        }
-        loop();
-    };
-    func();
-	var timeout = setTimeout(function (){
-		window.clearTimeout(handle);
-		window.clearTimeout(timeout);
-	}, time);
+	
 }

 export {iot, uPublic, uComponents}
\ No newline at end of file
--- a/dev/src/view/device/v_index.js
+++ b/dev/src/view/device/v_index.js
@@ -853,7 +853,6 @@ function sdsDataPorcessing(self, data){
 				case '3':
 					//防撬、试错、欠电报警
 					//轮循获取最新的历史记录
-					console.log('欠电报警');
 					loopGetLockInfo(self, config.intervalTime, config.getHistoryTime);
 					break;
 			}
@@ -861,19 +860,24 @@ function sdsDataPorcessing(self, data){
 		case 'lock_log':
 			switch(data.lock_action.value){
 				case '4':
+					//远程开门成功
 					//切换轮循loading样式
 					setRemoteOpenDoorLoading(self, 1, Vue.t('remoteOpendoor.openDoorSuccess'), Vue.t('btn.confirm'));
 				case '1':
 					//轮循获取最新的历史记录
 					loopGetLockInfo(self, config.intervalTime, config.getHistoryTime);
 				break;
+				case '5':
+					//远程开门失败
+					setRemoteOpenDoorLoading(self, 2, Vue.t('remoteOpendoor.openDoorFailure'), Vue.t('remoteOpendoor.remoteOpendoorAgain'));
+				break;
 			}
 		break;
 	}
-	if(data.ErrorCode.value == 1){
-		//远程开门失败
-		setRemoteOpenDoorLoading(self, 2, Vue.t('remoteOpendoor.openDoorFailure'), Vue.t('remoteOpendoor.remoteOpendoorAgain'));
-	}
+//	if(data.ErrorCode.value == 1){
+//		//远程开门失败
+//		setRemoteOpenDoorLoading(self, 2, Vue.t('remoteOpendoor.openDoorFailure'), Vue.t('remoteOpendoor.remoteOpendoorAgain'));
+//	}
 }

 //设置电量百分比、电量icon
@@ -893,8 +897,7 @@ function setBatteryPercentAndIcon(self, value){
 //设置门铃
 function setBellRing(self, time){
 	let now = moment(new Date(), "YYYY-MM-DD hh:mm:ss");
-	time = moment(time, "YY-MM-DD-hh-mm-ss");
-	console.log(now.diff(time,'seconds'));
+	time = moment(time, "YYYY-MM-DD hh:mm:ss");
 	if(now.diff(time,'seconds') < config.ringBell_timeout && now.diff(time,'seconds') >= 0){
 		self.setRingingTime(now.format("HH:mm"));
 		ringBell(self);
@@ -904,7 +907,7 @@ function setBellRing(self, time){
 //设置远程开门
 function setRemoteOpendoor(self, time){
 	let now = moment(new Date(), "YYYY-MM-DD hh:mm:ss");
-	time = moment(time, "YY-MM-DD-hh-mm-ss");
+	time = moment(time, "YYYY-MM-DD hh:mm:ss");
 	console.log(now.diff(time,'seconds'));
 	if(now.diff(time,'seconds') < config.remote_timeout && now.diff(time,'seconds') >= 0){
 		self.setValueRemoteOpendoor(true);
@@ -979,7 +982,6 @@ function simpleRingBell(self,i){

 function pushAction(self, msg) {
    var payload = msg.payload;
-    console.log(payload);
    if (typeof payload == 'string') {
        payload = JSON.parse(msg.payload);
    }
@@ -1023,7 +1025,9 @@ function pushAction(self, msg) {
 //推送消息处理方法
 function notifyDataProcessing(self, payload){
 	switch(payload.type){
-    	case 'open' || 'notify' || 'alarm':
+    	case 'open':
+    	case 'notify':
+    	case 'alarm':
    		//开门推送、安全报警、劫持报警
    		//历史记录信息只拿一遍，不需要轮询
    		getLockInfo(self);
@@ -1040,30 +1044,30 @@ function notifyDataProcessing(self, payload){
 }

 function notificationListener(self) {
-	if (plus.os.name == 'Android') {
-        setInterval(function () {
-            var pushMsgArray = plus.push.getAllMessage();
-//          console.log(pushMsgArray);
-            if (pushMsgArray) {
-                var pushMsgLength = pushMsgArray.length;
-                if (pushMsgLength) {
-                    var pushMsg = pushMsgArray[(pushMsgArray.length - 1)];
-                    pushAction(self, pushMsg);
-                    plus.push.clear();
-                }
-            }
-        }, 2000);
-    }
+//	if (plus.os.name == 'Android') {
+//      setInterval(function () {
+//          var pushMsgArray = plus.push.getAllMessage();
+////          console.log(pushMsgArray);
+//          if (pushMsgArray) {
+//              var pushMsgLength = pushMsgArray.length;
+//              if (pushMsgLength) {
+//                  var pushMsg = pushMsgArray[(pushMsgArray.length - 1)];
+//                  pushAction(self, pushMsg);
+//                  plus.push.clear();
+//              }
+//          }
+//      }, 2000);
+//  }
    // 从系统消息中心点击消息启动应用事件
    plus.push.addEventListener('click', function (msg) {
-    	console.log("收到了click");
-        pushAction(self, msg);
+//  	console.log("收到了click");
+//      pushAction(self, msg);
 //      alert("click"+JSON.stringify(msg));
    }, false);
    // 应用从推送服务器接收到推送消息事件
    plus.push.addEventListener('receive', function (msg) {
 //  	alert("收到了receive");
-        pushAction(self, msg);
+//      pushAction(self, msg);
 //      alert("receive"+JSON.stringify(msg));
    }, false);
 }
@@ -1077,7 +1081,14 @@ function myInfoTap(self){
        extras: {
        	nickname: self.nickname
        }
-   });
+    });
+// uPublic.openWindow({
+// 	 	url: '../myInfo/index.html',
+//      id: 'myInfo',
+//      extras: {
+//      	nickname: self.nickname
+//      }
+// });
 }

 //tap 绑定门锁

--- a/dev/webpack.config.js
+++ b/dev/webpack.config.js
@@ -55,7 +55,8 @@ module.exports = {
    },
    resolve: {
        alias: {
-            'vue-i18n$': 'vue-i18n/dist/vue-i18n.common.js'
+            'vue-i18n$': 'vue-i18n/dist/vue-i18n.common.js',
+            'mui': '../src/public/mui.js'
        }
    },
    plugins: [

--- a/web/lib/js/UIOT.js
+++ b/web/lib/js/UIOT.js
@@ -5915,8 +5915,17 @@ var App = function (_Base) {
    _createClass(App, [{
        key: 'openWindow',
        value: function openWindow(params) {
-            var wv = plus.webview.create(params.url, params.id, { styles: params.styles || {} }, { IOTData: params.extras });
+            var wv = plus.webview.create(params.url, params.id, { styles:{backgroundColor:'#000000'} }, { IOTData: params.extras });
            wv.show('slide-in-right');
+//			var IOTData = params.extras;
+//			var webview = mui.openWindow({
+//				url: params.url,
+//				id: params.id,
+//				extras: IOTData,
+//				waiting:{
+//   				autoShow:false//自动显示等待框，默认为true
+//   			}
+//			},"slide-in-right");
        }
    }, {
        key: 'getExtras',

--- a/web/resources/lang/zh.json
+++ b/web/resources/lang/zh.json
--- a/web/view/addDevice/deviceList.html
+++ b/web/view/addDevice/deviceList.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/addDevice/index.html
+++ b/web/view/addDevice/index.html
@@ -16,6 +16,7 @@
    </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="">


--- a/web/view/addDevice/scanCodeAdd.html
+++ b/web/view/addDevice/scanCodeAdd.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/addDevice/wifiAdd.html
+++ b/web/view/addDevice/wifiAdd.html
@@ -17,6 +17,7 @@
    <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="">


--- a/web/view/addDevice/wifiAddHelp.html
+++ b/web/view/addDevice/wifiAddHelp.html
@@ -16,6 +16,7 @@
    </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="">


--- a/web/view/bindUser/index.html
+++ b/web/view/bindUser/index.html
@@ -16,6 +16,7 @@
    </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="">


--- a/web/view/device/alarmInfo.html
+++ b/web/view/device/alarmInfo.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/device/hijackRecord.html
+++ b/web/view/device/hijackRecord.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/device/index.html
+++ b/web/view/device/index.html
@@ -17,6 +17,7 @@
    <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="">


--- a/web/view/device/opendoorRecord.html
+++ b/web/view/device/opendoorRecord.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/device/remoteOpendoor.html
+++ b/web/view/device/remoteOpendoor.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/doorlockManage/editName.html
+++ b/web/view/doorlockManage/editName.html
@@ -17,6 +17,7 @@
    <!--<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>

--- a/web/view/doorlockManage/index.html
+++ b/web/view/doorlockManage/index.html
@@ -17,6 +17,7 @@
    <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="">


--- a/web/view/doorlockUsers/addUnlockInfo.html
+++ b/web/view/doorlockUsers/addUnlockInfo.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/doorlockUsers/addUser.html
+++ b/web/view/doorlockUsers/addUser.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/doorlockUsers/doorlockUser.html
+++ b/web/view/doorlockUsers/doorlockUser.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/doorlockUsers/editName.html
+++ b/web/view/doorlockUsers/editName.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/doorlockUsers/inviteBind.html
+++ b/web/view/doorlockUsers/inviteBind.html
@@ -17,6 +17,7 @@
    <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="">


--- a/web/view/doorlockUsers/unlockInfo.html
+++ b/web/view/doorlockUsers/unlockInfo.html
@@ -17,6 +17,7 @@
    <!--<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="">


--- a/web/view/login/index.html
+++ b/web/view/login/index.html
@@ -18,6 +18,7 @@
    <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="">


--- a/web/view/myInfo/editNickname.html
+++ b/web/view/myInfo/editNickname.html
@@ -17,6 +17,7 @@
 	    <!--<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>

--- a/web/view/myInfo/editPassword.html
+++ b/web/view/myInfo/editPassword.html
@@ -17,6 +17,7 @@
 	    <!--<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>

--- a/web/view/myInfo/index.html
+++ b/web/view/myInfo/index.html
@@ -17,6 +17,7 @@
 	    <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>