Merge branch 'jianxiang' into 'test/96'

Jianxiang

See merge request iot-project-js/doorlock!45

dev/src/public/config.js

@@ -22,7 +22,7 @@ export default {
 		3: "powerAlarm"
 	},
 	"hijackMode": {
-		20: "hijackingAlarm",
+		2: "hijackingAlarm",
 	},
 	"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
 	"GET_MSG_INTERVAL": 5000,

dev/src/view/addDevice/v_scanCodeAdd.js

@@ -76,7 +76,7 @@ function resolve(self){
                 	iot.native.toAppSetting();
                 }
                 backTap(self);
-            },{"title": "","buttons": [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]});
+            },"", [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]);
         });
     }else{
     	let isFistOpenCamera = iot.storage.getMap('isFistOpenCamera');
@@ -88,11 +88,11 @@ function resolve(self){
             }, function (err) {
                 console.log('error', err);
                 plus.nativeUI.confirm(Vue.t("addDevice.openCameraTip"), (e)=>{
-	                if(e.index == 1){
+	                if(e.index == 0){
 	                	iot.native.toAppSetting();
 	                }
 	                backTap(self);
-	            },{"title": "","buttons": [Vue.t("btn.cancel"),Vue.t("addDevice.openCamera")]});
+	            },"", [Vue.t("addDevice.openCamera"),Vue.t("btn.cancel")]);
             });
     	}else{
     		openScanCode(self);

dev/src/view/device/v_index.js

@@ -803,6 +803,7 @@ function initDeviceInfo(self){
     self.hijackAlarmFlag = false;
     self.setRemoteOpendoorDisabledFlag(true);
     self.setValueRemoteOpendoor(0);
+    setMsgStatus(self, false, "default_img", false, false, '', '');
 }
 
 async function loopGetLockInfo(self, delay, timeout){

dev/src/view/doorlockUsers/v_doorlockUser.js

@@ -252,10 +252,10 @@ async function showGuide(self){
 		}
 	}else{
 		try{
-			time =await sleep(1000);
+			time =await sleep(500);
 			self.setGuideStep1ShowFlag(true); 
 	
-			time = await sleep(1000);
+			time = await sleep(500);
 	        self.setGuideStep2ShowFlag(true);
 		}
 		catch (err){
@@ -266,10 +266,10 @@ async function showGuide(self){
 
 async function nextGuide(self){
 	try{		
-		let time = await sleep(1000);
+		let time = await sleep(500);
         self.setGuideStep3ShowFlag(true),   
 		
-		time = await sleep(1000);
+		time = await sleep(500);
 		self.setGuideStep4ShowFlag(true);
 	}
 	catch (err){

web/lib/less/addDevice/addDevice.less

@@ -12,9 +12,14 @@
     font-size: @ADDDEVICE-TEXT-FONTSIZE;
     height: 150px;
     line-height: 150px;
-    padding-left: 58px;
+    padding-left: 50px;
     .tap_row(@ADDDEVICE-ROW-ACTIVE-BG);  
     font-size: 16px;
+    img{
+        margin-right: 25px;
+        width: 100px;
+        height: 100px;
+    }
 }
 
 .addDevice p{
@@ -25,17 +30,6 @@
     text-align: center;
 }
 
-.scanAdd img{
-    width: 70px;
-    height: 70px;
-    margin-right: 40px;
-}    
-.wifiAdd img{
-    width: 105px;
-    height: 50px;
-    margin-right: 5px;
-}
-
 //产品型号
 .u-list();
 

web/view/addDevice/addDevice.css

@@ -454,7 +454,7 @@ p {
   font-size: 0.48rem;
   height: 4rem;
   line-height: 4rem;
-  padding-left: 1.547rem;
+  padding-left: 1.333rem;
   font-size: 0.427rem;
 }
 
@@ -462,6 +462,12 @@ p {
   background-color: #153D4C;
 }
 
+.addDevice li img {
+  margin-right: 0.667rem;
+  width: 2.667rem;
+  height: 2.667rem;
+}
+
 .addDevice p {
   width: 100%;
   font-size: 0.32rem;
@@ -470,18 +476,6 @@ p {
   text-align: center;
 }
 
-.scanAdd img {
-  width: 1.867rem;
-  height: 1.867rem;
-  margin-right: 1.067rem;
-}
-
-.wifiAdd img {
-  width: 2.8rem;
-  height: 1.333rem;
-  margin-right: 0.133rem;
-}
-
 .u-list {
   width: 100%;
   height: 100%;