稳定版

dev/src/view/device/v_index.js

@@ -755,8 +755,9 @@ async function ringBell(self){
 
 function sleep(time){
 	return new Promise(function(resolve, reject){
-		setTimeout(()=>{
+		let timeOut = setTimeout(()=>{
 			resolve(time);
+			clearTimeout(timeOut);
 		},time);
 	})
 }
@@ -798,12 +799,12 @@ function notificationListener(self) {
 	if (plus.os.name == 'Android') {
         setInterval(function () {
             var pushMsgArray = plus.push.getAllMessage();
-            console.log(pushMsgArray);
+//          console.log(pushMsgArray);
             if (pushMsgArray) {
                 var pushMsgLength = pushMsgArray.length;
                 if (pushMsgLength) {
                     var pushMsg = pushMsgArray[(pushMsgArray.length - 1)];
-//                  pushAction(self, pushMsg);
+                    pushAction(self, pushMsg);
                     plus.push.clear();
                 }
             }

web/lib/js/start.js

@@ -11,7 +11,7 @@ UIOT_Debug.prototype.push = function (key) {
 };
 UIOT_Debug.prototype.upload = function (iot,title) {
     var logData = this.logData;
-    console.log(logData);
+//  console.log(logData);
     var http = new XMLHttpRequest();
     iot.business.websql.getMap('userinfo', function (userinfo) {
         var params = {
@@ -29,10 +29,10 @@ UIOT_Debug.prototype.upload = function (iot,title) {
         http.onreadystatechange = () => {
             if (http.readyState === 4 && http.status === 200) {
                 var response = JSON.parse(http.responseText);
-                console.log(response);
+//              console.log(response);
             }
         };
-        http.send(JSON.stringify(params));
+//      http.send(JSON.stringify(params));
     }, function (error) {
     });
 };

web/view/device/index.js

@@ -24684,8 +24684,9 @@ function ringBell(self) {
 
 function sleep(time) {
   return new Promise(function (resolve, reject) {
-    setTimeout(function () {
+    var timeOut = setTimeout(function () {
       resolve(time);
+      clearTimeout(timeOut);
     }, time);
   });
 }
@@ -24727,12 +24728,12 @@ function notificationListener(self) {
   if (plus.os.name == 'Android') {
     setInterval(function () {
       var pushMsgArray = plus.push.getAllMessage();
-      console.log(pushMsgArray);
+      //          console.log(pushMsgArray);
       if (pushMsgArray) {
         var pushMsgLength = pushMsgArray.length;
         if (pushMsgLength) {
           var pushMsg = pushMsgArray[pushMsgArray.length - 1];
-          //                  pushAction(self, pushMsg);
+          pushAction(self, pushMsg);
           plus.push.clear();
         }
       }

web/view/doorlockUsers/addUnlockInfo.html

@@ -41,7 +41,7 @@
                 <u-switch :value="valueSetHijack" v-show="recordSelectList.length && selectedMode == 2" 
                 	:init-param="componentsConfig.setHijackSwitch.initParam" v-on:u-switch-tap="onSetHijackTap(arguments[0])"></u-switch>
             </div>
-            <u-button :init-param="componentsConfig.addButton.initParam" v-on:u-button-tap="onAddButtonTap"></u-button>
+            <u-button :init-param="componentsConfig.addButton.initParam" :disabled="!recordSelectList.length" v-on:u-button-tap="onAddButtonTap"></u-button>
         </div>
         <transition name="fade">
             <div class="guide-dialog" v-show="guideShowFlag">