1215

1.远程开门超时提示更改
2.android手机按钮覆盖问题

dev/src/lang/en.json

@@ -37,7 +37,7 @@
         "login": "登录",
         "register": "注册",
         "forgetPassword": "忘记密码",
-        "device": "智能指纹锁",
+        "device": "U智锁",
         "opendoorRecord": "开门记录",
         "alarmInfo": "报警信息",
         "remoteOpendoor": "远程开门",
@@ -134,6 +134,7 @@
         "passwordInputTip": "请输入远程开门密码",
         "openDoorSuccess": "远程开门成功",
         "openDoorFailure": "远程开门失败",
+        "remoteTimeout": "远程开门超时",
         "remoteOpendoorAgain": "请尝试重试",
         "error": {
 			"noPasswordTip": "远程密码不能为空"
@@ -330,7 +331,8 @@
     	"oldPasswordInputTipAgain": "请再次输入旧密码"
     },
     "request":{
-    	"error": "请求发送失败"
+    	"error": "请求发送失败",
+    	"initError": "初始化失败，请关闭APP重试"
     },
     "deviceList":{
         "model": "型号：",

dev/src/lang/zh.json

@@ -134,6 +134,7 @@
         "passwordInputTip": "请输入远程开门密码",
         "openDoorSuccess": "远程开门成功",
         "openDoorFailure": "远程开门失败",
+        "remoteTimeout": "远程开门超时",
         "remoteOpendoorAgain": "请尝试重试",
         "error": {
 			"noPasswordTip": "远程密码不能为空"

dev/src/view/addDevice/v_scanCodeAdd.js

@@ -143,8 +143,8 @@ function deviceBind(self, lockId, relId){
 	    	let data = response.data;
 			if(data.success){
 				uComponents.openAlert(self, Vue.t('addDevice.bindSuccess'), {
-					iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{});
 			        text: Vue.t('dialog.confirm'), callback: function () {
+			        	iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{});
 			        	iot.navigator.openWindow({
 					        url: '../device/index.html',
 					        id: 'device'

dev/src/view/device/v_index.js

@@ -45,7 +45,7 @@ function init() {
             //门锁管理
             doorlockManageDisabledFlag: false,
             //门锁最新消息是否滚动
-            activeFlag: false,
+            activeFlag: true,
             //配置组件
             componentsConfig: initComponentsConfig(),
             //
@@ -485,7 +485,6 @@ function getDevices(self){
 				self.deviceId = null;
 				self.uuid = null;
 				uComponents.changeMarqueeText(self, [Vue.t('device.defaultNewMsg')]);
-//				console.log("不滚");
 				self.activeFlag = false;
 				self.opendoorRecordFlag = false;
 	            self.securityAlarmFlag = false;
@@ -1286,13 +1285,11 @@ function confirmButtonTap(self){
 		    }
 		});	
 	}
-	console.log('aaaa');
 	let time = setTimeout(function (){
 		console.log(self.getStatus());
 		if(self.getStatus() == 0){
-			console.log("timeout");
 			//连接失败
-    		uComponents.changeCommLoadingStatusAndText(self, 2, Vue.t('remoteOpendoor.openDoorFailure'));
+    		uComponents.changeCommLoadingStatusAndText(self, 2, Vue.t('remoteOpendoor.remoteTimeout'));
     		uComponents.changeCommButtonText(self, Vue.t('remoteOpendoor.remoteOpendoorAgain'));
     		self.setStatus(2);
     		window.clearTimeout(time);

dev/src/view/login/v_index.js

@@ -20,7 +20,7 @@ function init() {
             //配置组件
             componentsConfig: initComponentsConfig(),
             clientId: null,
-            showLoginButtonFlag: true
+            showLoginButtonFlag: false
         },
         mounted(){
         	if(window.iotDebug){
@@ -120,7 +120,6 @@ function loginButtonTap(self){
 				   	}
 			    	var data = uPublic.checkResponseData(response.data);
 			    	if(data){
-			    		self.setShowLoginButtonFlag(false);
 			    		if(data.hasOwnProperty('UserID')){
 			    			console.log("sds登陆成功了");
 			    			cloudsLogin(self, data.UserID);
@@ -130,6 +129,7 @@ function loginButtonTap(self){
 			    	}
 			    },
 			    error: (error) => {
+			    	self.setShowLoginButtonFlag(true);
 			    	console.log(error);
 		    		if(window.iotDebug){
 		                iotDebug.push('end: sds登陆失败'+JSON.stringify(error));

web/view/addDevice/addDevice.css

@@ -1183,7 +1183,7 @@ p {
   background-color: transparent;
 }
 
-.content {
+.scanContent {
   position: fixed;
   top: 1.173rem;
   bottom: 0;

web/view/addDevice/scanCodeAdd.html

@@ -25,7 +25,7 @@
             <v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
             <p>{{ $t('title.scanCodeAdd') }}</p>
         </div>
-        <div class="content" id="bcid" >   
+        <div class="scanContent" id="bcid" >   
         </div>  
         <u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
         <u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>