2018/01/11 15:29

#11首页三条记录样式修改【已完成】
#12邀请绑定通知提示【已完成】
#13远程开门有效时间改为2分钟【已完成】
#14门铃时间更改【已完成】
#15通知页面返回上一页刷新页面【已完成】
#16门锁管理解绑成功提示框样式更改【已完成】

dev/src/lang/en.json

@@ -115,7 +115,8 @@
         "doorLockRinging": "门铃响了",
         "defaultNewMsg": "您尚未绑定门锁",
         "noNewMsg": "门锁休息中",
-        "bindDoorlock": "绑定门锁"
+        "bindDoorlock": "绑定门锁",
+        "use": "使用"
     },
     "opendoorRecord":{
         "noRecordTip": "暂无记录",
@@ -153,12 +154,11 @@
         "logoutDialogTip": "确定要退出系统吗？",
         "defaultNickname": "门锁",
         "isClearRecord": "清除所有信息",
-        "unbindSuccess": "解绑成功",
         "doorbellMsgPush": "门铃消息推送",
         "alarmMsgPush": "报警消息推送",
         "opendoorMsgPush": "开门消息推送",
         "unbindDialogTip": "确认解除绑定",
-        "unbindSuccess": "解绑成功",
+        "unbindSuccess": "<span></span>解绑成功",
         "unbindFailue": "解绑失败"
     },
     "editName":{
@@ -184,11 +184,11 @@
         "bindFailure": "绑定失败",
         "reBindDevice": "请重新绑定"
     },
-    "wifiAddHelp": {
+    "wifiAddHelp": {  
         "helpTitle": "配置WIFI说明：",
-        "helpCont1": "1.确认设备端进入配网模式（详情操作请见产品说明书）",
-        "helpCont2": "2.点击页面下方“开始配置Wi-Fi”按钮，进入WiFi配网页面",
-        "helpCont3": "3.输入Wi-Fi密码，点击“连接”，等待锁端响应，至配网成功。",
+        "helpCont1": "确认设备端进入配网模式（详情操作请见产品说明书）",
+        "helpCont2": "点击页面下方“开始配置Wi-Fi”按钮，进入WiFi配网页面",
+        "helpCont3": "输入Wi-Fi密码，点击“连接”，等待锁端响应，至配网成功。",
         "helpCont4": "（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"
     },
     "wifiAdd": {
@@ -277,9 +277,9 @@
     "inviteBind":{
         "qrcodeExpireTip": "二维码已过期，请重新生成",
         "title": "绑定方法：",
-        "cont1": "1.受邀用户登录“U智锁”APP",
-        "cont2": "2.选择“扫描绑定设备”", 
-        "cont3": "3.扫描上方二维码完成绑定",
+        "cont1": "受邀用户登录“U智锁”APP",
+        "cont2": "选择“扫描绑定设备”", 
+        "cont3": "扫描上方二维码完成绑定",
         "tip": "注： 二维码有效时间为10分钟，过期请重新生成"
     },
     "unlockInfo":{
@@ -376,5 +376,11 @@
 	    "step3content":"操作步骤：启动本APP后打开多任务页面（清理后台应用的页面），将本APP加入白名单。",
 	    "endSetting":"保存设置并开启应用",
 	    "toIndex":"进入首页"
+	},
+	"newFeature":{
+		"newVersion":"您有新的版本更新",
+		"tip": "版本更新",
+		"update":"更新",
+		"miss": "暂不更新"
 	}
 }
\ No newline at end of file

dev/src/lang/zh.json

@@ -154,12 +154,11 @@
         "logoutDialogTip": "确定要退出系统吗？",
         "defaultNickname": "门锁",
         "isClearRecord": "清除所有信息",
-        "unbindSuccess": "解绑成功",
         "doorbellMsgPush": "门铃消息推送",
         "alarmMsgPush": "报警消息推送",
         "opendoorMsgPush": "开门消息推送",
         "unbindDialogTip": "确认解除绑定",
-        "unbindSuccess": "解绑成功",
+        "unbindSuccess": "<span></span>解绑成功",
         "unbindFailue": "解绑失败"
     },
     "editName":{
@@ -185,7 +184,7 @@
         "bindFailure": "绑定失败",
         "reBindDevice": "请重新绑定"
     },
-    "wifiAddHelp": {
+    "wifiAddHelp": {  
         "helpTitle": "配置WIFI说明：",
         "helpCont1": "确认设备端进入配网模式（详情操作请见产品说明书）",
         "helpCont2": "点击页面下方“开始配置Wi-Fi”按钮，进入WiFi配网页面",

dev/src/public/config.js

@@ -26,7 +26,7 @@ export default {
 	},
 	"model": "UGEN_SECURITY_SMARTDOOR_YJ2017",
 	"GET_MSG_INTERVAL": 5000,
-	"wifi_add_timeout": 3000,
+	"wifi_add_timeout": 150000,
 	//门铃晃动间隔时间
 	"await_time": 3000,
 	//门铃晃动次数

dev/src/view/addDevice/v_scanCodeAdd.js

@@ -36,8 +36,8 @@ function init() {
             	openScanCode(self);
             }
             window.addEventListener('returnPage',() => {
-				this.noticeTipShowFlag = !iot.native.isNotifycationOpen();
-				addSuccess(this);
+				self.noticeTipShowFlag = !iot.native.isNotifycationOpen();
+				scanCodeSuccess(self);
 			});
         },
         methods:{
@@ -194,7 +194,7 @@ function deviceBind(self, lockId, relId){
 function scanCodeSuccess(self){
 	self.noticeTipShowFlag = !iot.native.isNotifycationOpen();
 	if(self.noticeTipShowFlag){
-		uComponents.showProcess(self, 1,  Vue.t('wifiAdd.deviceActivateSuccess'), [{
+		uComponents.showProcess(self, 1,  Vue.t('addDevice.bindSuccess'), [{
 			"class": 'custom-process-button', 'text': Vue.t('btn.openNotify'), 'callback': () => {
 				//开启推送通知
 				if(plus.os.name == 'Android'){
@@ -224,7 +224,8 @@ function scanCodeSuccess(self){
 			}
 		}]);
 	}else{
-		uComponents.showProcess(self, 1,  Vue.t('wifiAdd.deviceActivateSuccess'), [{
+		console.log("通知开启了");
+		uComponents.showProcess(self, 1,  Vue.t('addDevice.bindSuccess'), [{
 			"class": 'custom-process-button', 'text': Vue.t('btn.startNow'), 'callback': () => {
 				//立即体验
 				uComponents.hideProcess(self);
@@ -241,7 +242,7 @@ function scanCodeSuccess(self){
 }
 
 function scanCodeFailue(self){
-	uComponents.showProcess(self, 2,  Vue.t('wifiAdd.deviceActivateFailure'), [{
+	uComponents.showProcess(self, 2,  Vue.t('addDevice.bindFailure'), [{
 		"class": 'custom-process-button', 'text': Vue.t('addDevice.reBindDevice'), 'callback': () => {
 			//激活失败
 			uComponents.hideProcess(self);

dev/src/view/addDevice/v_wifiAdd.js

@@ -23,15 +23,15 @@ function init() {
             textErrorTip: null, 
             //配置组件
             componentsConfig: initComponentsConfig(),
-            status: 0,
             noticeTipShowFlag: false,
             timeout: null
         },
         mounted(){       
         	resolve(this);
+        	let self = this;
         	window.addEventListener('returnPage',() => {
-				this.noticeTipShowFlag = !iot.native.isNotifycationOpen();
-				addSuccess(this);
+				self.noticeTipShowFlag = !iot.native.isNotifycationOpen();
+				addSuccess(self);
 			});
         },
         methods:{
@@ -53,12 +53,6 @@ function init() {
         	setTextErrorTip(tip){
         		this.textErrorTip = tip;
         	},
-        	getStatus(){
-        		return this.status;
-        	},
-        	setStatus(status){
-        		this.status = status;
-        	},
             onPasswordChange(text){
                 passwordChange(this,text);            
             },            
@@ -159,7 +153,6 @@ function connectButtonTap(self){
 	}else if(self.getTextPassword() == null || self.getTextPassword().trim() == ''){
 		self.setTextErrorTip(Vue.t('wifiAdd.passwordInputTip'));
 	}else{
-//		uComponents.showCommLoading(self);
 		uComponents.showProcess(self, 0, Vue.t('addDevice.loading'));
 		iot.business.sds.findWifi({
 		    data: {
@@ -185,7 +178,6 @@ function connectButtonTap(self){
 		    		if (window.iotDebug) {
 	                    iotDebug.upload(iot,'配网中');
 	                }
-//		    		uComponents.changeCommLoadingStatusAndText(self, 0, Vue.t('wifiAdd.wifiBinding'));
 					uComponents.showProcess(self, 0,  Vue.t('wifiAdd.wifiBinding'));
 		    	}else if(response.data == 'provisioned success'){
 		    		if(window.iotDebug){
@@ -195,7 +187,6 @@ function connectButtonTap(self){
 	                    iotDebug.upload(iot,'配网成功');
 	                }
 		    		//wifi连接成功，停止连接wifi
-//		    		uComponents.changeCommLoadingStatusAndText(self, 0, Vue.t('wifiAdd.wifiBindSuccess'));
 					uComponents.showProcess(self, 0,  Vue.t('wifiAdd.wifiBindSuccess'));
 		    	}
 		    },
@@ -227,7 +218,6 @@ function connectButtonTap(self){
 		    		if (window.iotDebug) {
 	                    iotDebug.upload(iot,'激活中');
 	                }
-//		    		uComponents.changeCommLoadingStatusAndText(self, 0, Vue.t('wifiAdd.deviceActivating'));
 					uComponents.showProcess(self, 0,  Vue.t('wifiAdd.deviceActivating'));
 		    	}else if(response.data == "joined success"){
 		    		if(window.iotDebug){
@@ -246,10 +236,7 @@ function connectButtonTap(self){
 		    		if (window.iotDebug) {
 	                    iotDebug.upload(iot,'激活失败');
 	                }
-//		    		uComponents.changeCommLoadingStatusAndText(self, 2, Vue.t('wifiAdd.deviceActivateFailure'));
 					addFailue(self);
-		    		self.setStatus(2);
-//		    		uComponents.changeCommButtonText(self, Vue.t('addDevice.reBindDevice'));
 		    		//停止查找设备
 		    		iot.business.sds.stopFindDevices({
 					    success: (response) => {},
@@ -270,20 +257,13 @@ function connectButtonTap(self){
 		});
 	}
 	self.timeout = setTimeout(function (){
-		if(self.getStatus() == 0){
-			console.log("timeout");
-			//连接失败
-//  		uComponents.changeCommLoadingStatusAndText(self, 2, Vue.t('wifiAdd.bindTimeout'));
-    		self.setStatus(2);
-//  		uComponents.changeCommButtonText(self, Vue.t('addDevice.reBindDevice'));
-			addFailue(self);
-    		//停止查找设备
-    		iot.business.sds.stopFindDevices({
-			    success: (response) => {},
-			    error: (error) => {}
-			});
-			window.clearTimeout(self.timeout);
-		}
+		console.log("timeout");
+		window.clearTimeout(self.timeout);
+		addFailue(self);
+		iot.business.sds.stopFindDevices({
+		    success: (response) => {},
+		    error: (error) => {}
+		});
 	},config.wifi_add_timeout);
 }
 
@@ -312,10 +292,7 @@ function unbind(self, deviceId, productId){
 	    	if (window.iotDebug) {
                 iotDebug.upload(iot,'解绑失败');
             }
-//	    	uComponents.changeCommLoadingStatusAndText(self, 2, Vue.t('wifiAdd.deviceActivateFailure'));
-//	    	uComponents.changeCommButtonText(self, Vue.t('addDevice.reBindDevice'));
 			addFailue(self);
-			self.setStatus(2);
 	    },
 	    complete: () => {
 	    }
@@ -335,9 +312,6 @@ function bind(self, deviceId, productId){
 	    	console.log(response);
 	    	let data = response.data;
 	    	if(data.success){
-//				uComponents.changeCommLoadingStatusAndText(self, 1, Vue.t('wifiAdd.deviceActivateSuccess'));
-//				uComponents.changeCommButtonText(self, Vue.t('btn.confirm'));
-				self.setStatus(1);
 				addSuccess(self);
 			}
 	    	if(window.iotDebug){
@@ -355,10 +329,7 @@ function bind(self, deviceId, productId){
 	    	if (window.iotDebug) {
                 iotDebug.upload(iot,'绑定失败');
             }
-//	    	uComponents.changeCommLoadingStatusAndText(self, 2, Vue.t('wifiAdd.deviceActivateFailure'));
-//	    	uComponents.changeCommButtonText(self, Vue.t('addDevice.reBindDevice'));、
 			addFailue(self);
-			self.setStatus(2);
 	    },
 	    complete: () => {}
 	});
@@ -420,24 +391,4 @@ function addSuccess(self){
 			}
 		}]);
 	}
-}
-
+}
\ No newline at end of file
-//tap loading button
-//function commLoadingButtonTap(self) {
-//	if(self.getStatus() == 1){
-//		 //绑定成功
-//	    uComponents.hideCommLoading(self);
-//	    iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{
-//	    	needClose: true
-//	    });
-//	    iot.navigator.openWindow({
-//	        url: '../device/index.html',
-//	        id: 'device'
-//	    });
-//	}else if(self.getStatus() == 2){
-//		//绑定失败
-//    	uComponents.hideCommLoading(self);
-//    	self.setStatus(0);
-//    	uComponents.changeCommLoadingStatusAndText(self, 0, Vue.t('addDevice.loading'));
-//	}
-//}
\ No newline at end of file

dev/src/view/doorlockManage/v_index.js

@@ -43,6 +43,14 @@ function init() {
             unbindShowDialog: false
             },
         mounted(){   
+//      	uComponents.openAlert(this, Vue.t('doorlockManage.unbindSuccess'), {
+//		        text: Vue.t('dialog.confirm'), callback: function () {
+//		        	iot.navigator.openWindow({
+//				        url: '../device/index.html',
+//				        id: 'device'
+//				    });
+//		       	}
+//		    });
         	this.extras = iot.navigator.getExtras();
         	console.log(this.extras);
         	this.role = this.extras.lockInfo.role;
@@ -55,6 +63,7 @@ function init() {
 				getDoorlockInfo(self);
 			});
 			
+			
         },
         methods:{
         	getStateShowFlag(){
@@ -289,9 +298,17 @@ function unbind(self){
 		    	console.log(error);
 				uPublic.openRequestErrorAlert(self);  
 		    });
-	    	self.setStateShowFlag(true);
-			self.setShowMsg(Vue.t('doorlockManage.unbindSuccess'));
-			self.setUnbindSucceess(true);
+//	    	self.setStateShowFlag(true);
+//			self.setShowMsg(Vue.t('doorlockManage.unbindSuccess'));
+//			self.setUnbindSucceess(true);
+			uComponents.openAlert(self, Vue.t('doorlockManage.unbindSuccess'), {
+		        text: Vue.t('dialog.confirm'), callback: function () {
+		        	iot.navigator.openWindow({
+				        url: '../device/index.html',
+				        id: 'device'
+				    });
+		       	}
+		    });
 			iot.navigator.fire(plus.webview.currentWebview().opener(),'returnPage',{});
 	    },
 	    error: (error) => {
@@ -372,11 +389,12 @@ function cancelTap(self){
 
 //tap 绑定成功弹框提示-->回到首页
 function unbindStateDialogTap(self){
-	self.setStateShowFlag(false);
-	if(self.getUnbindSucceess){
-		iot.navigator.openWindow({
-	        url: '../device/index.html',
-	        id: 'device'
-	    });
-	}
+//	self.setStateShowFlag(false);
+//	if(self.getUnbindSucceess){
+//		iot.navigator.openWindow({
+//	        url: '../device/index.html',
+//	        id: 'device'
+//	    });
+//	}
+	
 }

web/lib/less/doorlockManage/doorlockManage.less

@@ -288,3 +288,12 @@
 
 .unbindState-dialog();
 
+.custom-dialog{
+    .u-dialog-box{
+        .u-dialog-content{
+            span{
+                .bgImgSize(51px,51px,"green_unbindSuccess_icon.png",center,cover);
+            }
+        }
+    }
+}

web/view/doorlockManage/doorlockManage.css

@@ -379,6 +379,14 @@ p {
   display: none;
 }
 
+.u-dialog-box .u-dialog-content span {
+  width: 1.36rem;
+  height: 1.36rem;
+  background: url("../../resources/image/green_unbindSuccess_icon.png") no-repeat center;
+  -webkit-background-size: cover;
+  background-size: cover;
+}
+
 .header {
   position: fixed;
   top: 0;
@@ -1060,4 +1068,12 @@ p {
   width: 1.733rem;
   height: 1.733rem;
   margin-bottom: 0.373rem;
+}
+
+.custom-dialog .u-dialog-box .u-dialog-content span {
+  width: 1.36rem;
+  height: 1.36rem;
+  background: url("../../resources/image/green_unbindSuccess_icon.png") no-repeat center;
+  -webkit-background-size: cover;
+  background-size: cover;
 }
\ No newline at end of file