Merge branch 'jianxiang' into 'test/96'

Jianxiang

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

dev/src/public/config.js

@@ -23,6 +23,7 @@ export default {
 	},
 	"hijackMode": {
 		2: "hijackingAlarm",
+		20: "hijackingAlarm"
 	},
 	"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
 	"GET_MSG_INTERVAL": 5000,

dev/src/view/addDevice/v_scanCodeAdd.js

@@ -148,8 +148,8 @@ function openScanCode(self){
 						    console.log(response);
 					    	let data = uPublic.checkResponseData(response.data);
 		    				if(data){
-						    	//云端绑定
-						    	deviceBind(self, lockId, relId);
+						    	//获取设备详情
+						    	getInfo(self, lockId, relId, data.uuid);
 							}else{}
 					    },
 					    error: (error) => {
@@ -183,11 +183,38 @@ function openScanCode(self){
 	});
 }
 
-function deviceBind(self, lockId, relId){
+//获取设备详情
+function getInfo(self, lockId, relId, uuid){
+	if(uuid){
+		iot.business.device.getInfo({
+		    data: {
+		        sds: true,
+		        uuid: uuid
+		    },
+		    success: (response) => {
+		    	console.log(response);
+		    	let data = uPublic.checkResponseData(response.data);
+		    	if(data){
+		    		//云端绑定
+					deviceBind(self, lockId, relId, data.auid);
+//			    	deviceBind(self, lockId, relId);
+		    	}
+		    },
+		    error: (error) => {
+		    	console.log(error);
+		    },
+		    complete: () => {}
+		});
+	}
+}
+
+// 云端绑定
+function deviceBind(self, lockId, relId, auid){
 	iot.business.api.sendCustom('lock/bindUser',{
 	    data: {
 	        device_id: lockId,
 	        rel_id: relId,
+	        auid: auid,
 //		    mac: parameters.mac,
 	        nickname: ''
 	    },

dev/src/view/addDevice/v_wifiAdd.js

@@ -338,7 +338,7 @@ function sendDeviceStatus(self, deviceId, productId, uuid){
 	    },
 	    success: (response) => {
 	    	//激活成功
-			bind(self, deviceId, productId);
+	    	getInfo(self, deviceId, productId,uuid);
 	    	console.log(response);
 	    },
 	    error: (error) => {
@@ -382,12 +382,38 @@ function unbind(self, deviceId, productId){
 	});
 }
 
+//获取设备详情
+function getInfo(self, deviceId, productId,uuid){
+	if(uuid){
+		iot.business.device.getInfo({
+		    data: {
+		        sds: true,
+		        uuid: uuid
+		    },
+		    success: (response) => {
+		    	console.log(response);
+		    	let data = uPublic.checkResponseData(response.data);
+		    	if(data){
+		    		//云端绑定
+		    		bind(self, deviceId, productId, data.auid);
+//		    		bind(self, deviceId, productId);
+		    	}
+		    },
+		    error: (error) => {
+		    	console.log(error);
+		    },
+		    complete: () => {}
+		});
+	}
+}
+
 //云端绑定
-function bind(self, deviceId, productId){
+function bind(self, deviceId, productId, auid){
 	iot.business.api.sendCustom('lock/bind',{
 	    data: {
 	        product_id: productId,
 	        device_id: deviceId,
+	        auid: auid,
 //			mac: sn,
 	        nickname: ''
 	    },

dev/src/view/device/v_index.js

@@ -1270,11 +1270,13 @@ function doorlockManageTap(self){
 
 //tap 门铃(停止响铃)
 function stopDoorbellRing(self){
-	self.setDoorbellRingingFlag(false);
-	self.setNormalApertureShow(false);
-	self.setRingTime(0);
-	window.clearInterval(self.time);
-	window.clearTimeout(self.timeout);
+	if(self.getMsgClass() == 'doorbell_img'){
+		self.setDoorbellRingingFlag(false);
+		self.setNormalApertureShow(false);
+		self.setRingTime(0);
+		window.clearInterval(self.time);
+		window.clearTimeout(self.timeout);
+	}
 }
 
 //tap 保存二维码到相册

dev/src/view/doorlockUsers/v_addUnlockInfo.js

@@ -292,6 +292,7 @@ function sleep(time){
 
 mui.back = function(){
     iot.navigator.fire(plus.webview.currentWebview().opener(),'returnPage',{});
+    console.log("returnPage");
 	iot.navigator.back();
 }
 

dev/src/view/doorlockUsers/v_addUser.js

@@ -86,9 +86,15 @@ function initComponentsConfig() {
     }
 }
 
+mui.back = function() {
+	iot.navigator.fire(plus.webview.currentWebview().opener(), 'returnPage', {});
+	console.log("returnPage");
+	iot.navigator.back();
+}
+
 //tap <
-function backTap(){
-    iot.navigator.back();
+function backTap() {
+	iot.navigator.aback();
 }
 
 function nameChange(self,text){