Merge branch 'zjx' into 'master'

1215

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

dev/src/view/addDevice/v_wifiAdd.js

@@ -26,7 +26,6 @@ function init() {
         },
         mounted(){       
         	resolve(this);
-        	
         },
         methods:{
         	getTextWiFiName(){

dev/src/view/device/v_index.js

@@ -97,7 +97,8 @@ function init() {
             flag: true,
             time: null,
             timeout: null,
-            handle: null
+            handle: null,
+            remoteTime: null
         },
         mounted(){
         	notificationListener(this);
@@ -489,6 +490,8 @@ function getDevices(self){
 				self.opendoorRecordFlag = false;
 	            self.securityAlarmFlag = false;
 	            self.hijackAlarmFlag = false;
+	            self.setRemoteOpendoorDisabledFlag(true);
+	            self.setValueRemoteOpendoor(0);
 			}
 	    },
 	    error: (error) => {
@@ -868,6 +871,7 @@ function sdsDataPorcessing(self, data){
 				break;
 				case '5':
 					//远程开门失败
+					
 					setRemoteOpenDoorLoading(self, 2, Vue.t('remoteOpendoor.openDoorFailure'), Vue.t('remoteOpendoor.remoteOpendoorAgain'));
 				break;
 			}
@@ -925,6 +929,7 @@ function setRemoteOpenDoorLoading(self, status, text, buttonText){
 			self.setValueRemoteOpendoor(false);
 			self.setRemoteOpendoorDisabledFlag(true);
 		case 2:
+			window.clearTimeout(self.remoteTime);
 		case 0:
 			self.setStatus(status);
 			uComponents.changeCommLoadingStatusAndText(self, status, text);
@@ -1285,14 +1290,14 @@ function confirmButtonTap(self){
 		    }
 		});	
 	}
-	let time = setTimeout(function (){
+	self.remoteTime = setTimeout(function (){
 		console.log(self.getStatus());
 		if(self.getStatus() == 0){
 			//连接失败
     		uComponents.changeCommLoadingStatusAndText(self, 2, Vue.t('remoteOpendoor.remoteTimeout'));
     		uComponents.changeCommButtonText(self, Vue.t('remoteOpendoor.remoteOpendoorAgain'));
     		self.setStatus(2);
-    		window.clearTimeout(time);
+    		window.clearTimeout(self.remoteTime);
 		}
 	},config.remote_opendoor_timeout);
 }

dev/src/view/login/v_index.js

@@ -43,6 +43,7 @@ function init() {
         	},function(err){
         		console.log(err);
         	})
+        	console.log('innnnnnn');
         },
         methods:{
         	getShowLoginButtonFlag(){
@@ -104,6 +105,7 @@ function loginButtonTap(self){
 //		alert(error);
 //		console.log(err);
 //	})
+console.log("loginButton");
 	iot.business.sds.checkSDSInit({
 		data: {},
 		success: (response) => {
@@ -145,6 +147,7 @@ function loginButtonTap(self){
 		},
 		error: (error) => {
 			//初始化失败,重新初始化
+			console.log('eroor');
 			console.log(error);
 			if(window.iotDebug){
                 iotDebug.push('end: 初始化失败'+JSON.stringify(error));

web/lib/js/UIOT.js

@@ -5263,6 +5263,7 @@ var SDS = function () {
                                 var handle = null;
                                 handle = setInterval(function () {
                                     _this.bridge.obj.getSDSStatus(function (ret) {
+                                    	console.log(ret);
                                         switch (ret) {
                                             case 0:
                                                 //尚未初始化

web/lib/less/addDevice/addDevice.less

@@ -187,9 +187,8 @@
 
 .custom-comm-loading();
 
-.content{
-    width: 100%;
-    position: absolute;
+.scanContent {
+  position: fixed;
   top: 1.173rem;
   bottom: 0;
   left: 0;

web/lib/less/doorlockManage/doorlockManage.less

@@ -220,4 +220,66 @@
     }   
 }
 
+.custom-isClearSwitch-switch {
+  width: 5.333rem;
+  height: auto;
+  text-align: center;
+  color: #00ffff;
+  margin: 0.72rem auto 0;
+  padding: 0.267rem 0;
+}
+
+.custom-isClearSwitch-switch .u-switch-handle {
+  position: relative;
+  top: auto;
+  left: auto;
+  -webkit-transform: none;
+  transform: none;
+  width: 0.453rem;
+  height: 0.453rem;
+  border: 0;
+  border-radius: 0;
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: 0.16rem;
+}
+
+.custom-isClearSwitch-switch .u-switch-handle:before {
+  font-family: iconfont;
+  font-size: 0.453rem;
+  -webkit-font-smoothing: antialiased;
+  line-height: 1;
+  top: 0;
+  width: auto;
+  height: auto;
+  border-radius: 0;
+  background-color: transparent;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+
+.custom-isClearSwitch-switch .u-switch-text {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.custom-isClearSwitch-switch.u-switch-on .u-switch-handle {
+  background-color: transparent;
+}
+
+.custom-isClearSwitch-switch.u-switch-on .u-switch-handle:before {
+    content: '\e6aa';
+  left: 0;
+}
+
+.custom-isClearSwitch-switch.u-switch-off .u-switch-handle {
+  background-color: transparent;
+}
+
+.custom-isClearSwitch-switch.u-switch-off .u-switch-handle:before {
+  content: '\e6a9';
+  left: 0;
+}
+
 .unbindState-dialog();
+

web/view/device/index.html

@@ -22,7 +22,7 @@
 
     <div id="app" v-cloak>
         <div class="header">
-            <v-touch tag="span" class="header-left icon" v-on:tap="onMyInfoTap">&#xe66f;</v-touch>
+            <v-touch tag="span" class="header-left icon" v-on:tap="onMyInfoTap">&#xe69b;</v-touch>
             <p>{{ $t('title.device') }}</p>
         </div>
         <div class="content">