#34

远程开门超时，或是失败、成功都判断一下当前是否是远程开门，是则恢复初始状态
安全报警显示类型
门铃效果停止

dev/src/view/device/v_index.js

@@ -769,7 +769,7 @@ async function updateHistoryMap(self, historyRecord){
 				//显示劫持报警
 				setMsgStatus(self, true, "hijack_img", false, true, moment(historyRecord.alarm,"YYYY-MM-DD hh:mm:ss").format("HH:mm"), Vue.t('device.hijackAlarm'));
 			}else{
-				//显示安全报警
+				//显示劫持报警
 				setMsgStatus(self, true, "hijack_img", false, true, moment.unix(response.alarm.time).format("HH:mm"), Vue.t('device.hijackAlarm'));
 			}
 		}else if(self.securityAlarmFlag == true){
@@ -957,7 +957,9 @@ async function sdsDataPorcessing(self, data){
 						        	self.setValueRemoteOpendoor(false);
 									self.setRemoteOpendoorDisabledFlag(true);
 									self.setRemoteOpendoorShowFlag(false);
-									setMsgStatus(self, false, "default_img", false, false, '', '');
+									if(self.getMsgClass() == 'remoteOpendoor_img'){
+										setMsgStatus(self, false, "default_img", false, false, '', '');
+									}
 									window.clearTimeout(self.remoteTime);
 									uComponents.hideCommLoading(self);
 						        }
@@ -965,7 +967,9 @@ async function sdsDataPorcessing(self, data){
 						}else{
 							self.setValueRemoteOpendoor(false);
 							self.setRemoteOpendoorDisabledFlag(true);
-							setMsgStatus(self, false, "default_img", false, false, '', '');
+							if(self.getMsgClass() == 'remoteOpendoor_img'){
+								setMsgStatus(self, false, "default_img", false, false, '', '');
+							}
 						}
 					break;
 				}
@@ -1009,6 +1013,8 @@ function setRemoteOpendoor(self, time){
 	if(now.diff(time,'seconds') < config.pushMsg_timeout && now.diff(time,'seconds') >= 0){
 		self.setValueRemoteOpendoor(true);
 		self.setRemoteOpendoorDisabledFlag(false);
+		//停止响铃
+		stopDoorbellRing(self);
 		setMsgStatus(self, false, "remoteOpendoor_img", true, false, time.format("HH:mm"), Vue.t('device.remoteOpendoor'));
 //		//设置当前为普通状态
 //		self.setWarmingShowFlag(false);
@@ -1021,7 +1027,9 @@ function setRemoteOpendoor(self, time){
 		setTimeout(function(){
 			self.setValueRemoteOpendoor(false);
 			self.setRemoteOpendoorDisabledFlag(true);
-			setMsgStatus(self, false, "default_img", false, false, '', '');
+			if(self.getMsgClass() == 'remoteOpendoor_img'){
+				setMsgStatus(self, false, "default_img", false, false, '', '');
+			}
 		},(config.remote_timeout-now.diff(time,'seconds'))*1000);
 	}
 }
@@ -1227,7 +1235,9 @@ function remoteOpendoorTap(self){
 				        text: Vue.t('dialog.confirm'), callback: function () {
 				        	self.setValueRemoteOpendoor(false);
 							self.setRemoteOpendoorDisabledFlag(true);
-							setMsgStatus(self, false, "default_img", false, false, '', '');
+							if(self.getMsgClass() == 'remoteOpendoor_img'){
+								setMsgStatus(self, false, "default_img", false, false, '', '');
+							}
 				        }
 				    });
 	    		}
@@ -1367,7 +1377,9 @@ function confirmButtonTap(self){
 				        	self.setRemoteOpendoorShowFlag(false);
 				        	self.setValueRemoteOpendoor(false);
 							self.setRemoteOpendoorDisabledFlag(true);
-							setMsgStatus(self, false, "default_img", false, false, '', '');
+							if(self.getMsgClass() == 'remoteOpendoor_img'){
+								setMsgStatus(self, false, "default_img", false, false, '', '');
+							}
 				        }
 				    });
 				}

web/lib/less/device/device.less

@@ -267,7 +267,7 @@
 .keyframes(stretchdelay,{
     0%,
     100% {
-        border-right-color: #FFF;
+        border-right-color: transparent;
     }
     40% {
         border-right-color: #00FFFF;

web/view/device/device.css

@@ -1287,7 +1287,7 @@ p {
 
 @-webkit-keyframes stretchdelay {
   0%, 100% {
-    border-right-color: #FFF;
+    border-right-color: transparent;
   }
 
   40% {
@@ -1297,7 +1297,7 @@ p {
 
 @keyframes stretchdelay {
   0%, 100% {
-    border-right-color: #FFF;
+    border-right-color: transparent;
   }
 
   40% {