Skip to content

D
DoorLock
Commit 341e1778 by wjd
Options

Merge branch 'zjx' into 'test/96' 

Zjx

See merge request iot-project-js/doorlock!17
parents 5e336aa2 d9b7aa95
Showing with 225 additions and 55 deletions
History.md
1.1.5 / 2017-12-12
==================
* 1.上传css样式
1.1.4 / 2017-11-07
==================
......
dev/src/public/config.js
......@@ -24,7 +24,7 @@ export default {
"hijackMode": {
20: "hijackingAlarm",
},
"model": "UGEN_SECURITY_SMARTDOOR_YJ2017",
"model": "USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK",
"GET_MSG_INTERVAL": 5000,
"wifi_add_timeout": 150000,
//门铃晃动间隔时间
......
dev/src/view/c_android-notify.vue
......@@ -78,21 +78,28 @@
endSetting:Vue.t('androidNotify.endSetting'),
toAppIndex:Vue.t('androidNotify.toIndex'),
notifyState:false, // 当前是否开启了通知
gotoIndex:this.toIndex,// 处理点击到index按钮事件
isKnow:iot.native.isNotifycationOpen(),//是否需要显示 我已阅读
isToIndex:false,// 是否需要显示去首页按钮
//notifyState:false, // 当前是否开启了通知
//gotoIndex:this.toIndex,// 处理点击到index按钮事件
//isKnow:iot.native.isNotifycationOpen(),//是否需要显示 我已阅读
//isToIndex:false,// 是否需要显示去首页按钮
isStep1Finish:iot.native.isNotifycationOpen(),//是否需要显示步骤1的勾
isStep2Finish:false,//是否需要显示步骤2的勾
isStep3Finish:false,//是否需要显示步骤3的勾
isToSetting:!iot.native.isNotifycationOpen(),//是否需要显示去设置按钮
setp1Active:'active',
setp1Active:null,
setp2Active:null,// 默认为灰色 不显示active
setp3Active:null,
notifyState:false, // 当前是否开启了通知
gotoIndex:this.toIndex,// 处理点击到index按钮事件
isKnow:iot.native.isNotifycationOpen(),//是否需要显示 我已阅读
isToIndex:false,// 是否需要显示去首页按钮
}
},
mounted: function () {
console.log("notifyState："+iot.native.isNotifycationOpen())
this.setp1Active=this.isStep1Finish?"active changeBorder":null;
this.setp2Active=this.isStep1Finish?"active changeBorder":null;
console.log("notifyState："+iot.native.isNotifycationOpen());
onTest(this);
// 监听程序恢复前台
document.addEventListener("resume", ()=>{
onAppReume(this);
......@@ -116,6 +123,10 @@
}
};
function onTest(self){
console.log(self.isStep1Finish);
console.log(self.setp2Active);
}
function openNotify(self) {
console.log("去开启");
iot.native.toNotifycationSetting("notify");
......@@ -125,7 +136,7 @@
function IKonw(self){
console.log("点击了我已阅读");
self.isStep2Finish = true; // 点击阅读后显示步骤2的勾
self.setp2Active = "active changeBorder";// 点击阅读后显示步骤2的字体亮度调高
// self.setp2Active = "active changeBorder";// 点击阅读后显示步骤2的字体亮度调高
self.setp3Active = "active";// 同时步骤3的字体亮度也调高
self.isStep3Finish = true; // 步骤3的勾勾选
self.isToIndex = true;//显示去首页按钮
......@@ -140,7 +151,15 @@
function onAppReume(self){
let notifyState = iot.native.isNotifycationOpen();
console.log("notifyState:"+notifyState);
if (notifyState) {self.setp2Active = "active changeBorder";}
if (notifyState) {
self.setp2Active = "active changeBorder";
}else{// 恢复默认
self.setp2Active = null;
self.setp3Active = null;
self.isStep2Finish = false;
self.isStep3Finish = false;
self.isToIndex = false;
}
self.isStep1Finish = iot.native.isNotifycationOpen();// 再次判断当前通知是否开启
self.isToSetting = !iot.native.isNotifycationOpen(); // 再次判断是否需要显示去设置按钮
self.isKnow = iot.native.isNotifycationOpen(),// 再次判断是否需要显示 我已阅读
......
dev/src/view/doorlockManage/v_index.js
......@@ -8,6 +8,7 @@
*/
import config from '../../public/config.js';
import defaultConfig from '../../public/defaultConfig.js';
import {iot, uPublic, uComponents} from '../../public/public.js';
import {projectMethods} from '../../public/components.js';
......
dev/src/view/doorlockUsers/v_inviteBind.js
......@@ -137,8 +137,8 @@ function createQrcode(self, qrKey){
console.log(error);
} else {
console.log('success');
qr.style.width = "5.333rem";
qr.style.height = "5.333rem";
qr.style.width = "4.267rem";
qr.style.height = "4.267rem";
console.log(qr.style);
setTimeout(() => {
self.setQrCodeDisabled(true);
......
dev/src/view/myInfo/v_help.js 0 → 100644
/**
* v_help.js
* Version: 0.1
* User: wy
* Date: 2017-12-27
* Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved.
* 帮助页面
*/
import config from '../../public/config.js';
import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 组件
uPublic.componentsInit(['u-button','u-dialog','u-loading']);
const app = new Vue({
data:{
//配置组件
componentsConfig: initComponentsConfig()
},
mounted(){
},
methods:{
//tap 完成
onFinishButtonTap(){
finishButtonTap();
}
}
}).$mount('#app');
}
//配置组件参数
function initComponentsConfig() {
return {
finishButton: {
initParam: {
class: 'custom-button',
text: Vue.t('btn.finish')
}
},
dialog: {
initParam: {
class: 'custom-dialog'
}
},
loading: {
initParam: {
class: 'custom-loading'
}
}
}
}
//tap 完成
function finishButtonTap(){
}
\ No newline at end of file
web/lib/less/device/notify.less
......@@ -42,12 +42,13 @@
position: absolute;
left: 0;
display: inline-block;
width: 22px;
height: 22px;
// width: 22px;
// height: 22px;
border: 1px solid;/*no*/
border-radius: 50%;
text-align: center;
.iconfont(12px,22px);
.iconfont(12px);
padding: 4px;
background-color: #242635;
outline: 3px solid #242635;/*no*/
}
......
web/lib/less/doorlockUsers/doorlockUser.less
......@@ -148,8 +148,8 @@
font-size: @INVITEBIND-TEXT-FONTSIZE;
position: relative;
&.qrcode{
width: 200px;
height: 200px;
width: 160px;
height: 160px;
margin: 0 auto;
position: relative;
}
......@@ -166,18 +166,19 @@
//1、2、3
> span{
display: inline-block;
width: 22px;/*no*/
height: 22px;/*no*/
// width: 22px;/*no*/
// height: 22px;/*no*/
border: 1px solid;/*no*/
border-radius: 50%;
text-align: center;
.iconfont(12px,1);
line-height: 22px;/*no*/
// line-height: 22px;/*no*/
background-color: #242635;
outline: 3px solid #242635;/*no*/
color: #00ffff;
margin-right: 14px;
position: relative;
padding: 4px;
}
//二维码已过期，请重新生成
p{
......@@ -198,7 +199,7 @@
&:before{
content: '';
position: absolute;
top: 0;
top: 2px;
bottom: 0;
left: 11px;
width: 1px;/*no*/
......
web/lib/less/doorlockUsers/unlockInfo.less
......@@ -142,7 +142,11 @@
.u-select();
.custom-select{
height: 170px;
position: absolute;
top: 266px;
bottom: 211px;
left: 0;
height: auto;
.u-select-scroll{
.u-select-row{
display: block;
......@@ -180,10 +184,16 @@
}
}
.position{
position: absolute;
bottom: 122px;
left: 0;
width: 100%;
}
.tip{
text-align: center;
color: #A0A0A7;
margin-top: 3px;
}
.u-switch();
......@@ -248,7 +258,7 @@
.mask(1051,@CUSTOM-BACKDROP-BG);
.guideStep1{
position: absolute;
top: 44px;
top: 46px;
left: 0;
width: 100%;
.modeSelect:after{
......@@ -353,7 +363,7 @@
}
.guideStep5{
position: absolute;
top: 248px;
bottom: 116px;
left: 0;
width: 100%;
.guideStep5Tip{
......
web/lib/less/public/core.less
......@@ -200,17 +200,24 @@ p{
&when(@guideStepBool){
.guide-dialog{
.guideStep5{
top: 228px;
.guideStep5Cont p{
padding: 12px 0;
}
bottom: 96px;
// .guideStep5Cont p{
// padding: 12px 0;
// }
}
}
}
&when(@switchBool){
.custom-select{
bottom: 178px;
}
.position{
bottom: 102px;
}
.custom-setHijack-switch{
margin-top: 0;
margin-top: 14px;
}
}
......
web/lib/less/public/public.less
......@@ -283,7 +283,7 @@
}
}
@media (max-height: 400px/*no*/){
@media (max-height: 450px/*no*/){
#app{
height: 647px;
position: relative;
......
web/view/addDevice/addDevice.css
......@@ -806,7 +806,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......
web/view/bindUser/bindUser.css
......@@ -643,7 +643,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......
web/view/device/device.css
......@@ -537,7 +537,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......
web/view/device/notify.css
......@@ -499,15 +499,14 @@ p {
position: absolute;
left: 0;
display: inline-block;
width: 0.587rem;
height: 0.587rem;
border: 1px solid;
border-radius: 50%;
text-align: center;
font-family: iconfont;
font-size: 0.32rem;
-webkit-font-smoothing: antialiased;
line-height: 0.587rem;
line-height: 1;
padding: 0.107rem;
background-color: #242635;
outline: 3px solid #242635;
}
......
web/view/doorlockManage/doorlockManage.css
......@@ -759,7 +759,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......
web/view/doorlockUsers/addUnlockInfo.html
......@@ -37,10 +37,12 @@
<p class="title">{{ $t('addUnlockInfo.opendoorRecord') }}</p>
<u-select ref="uselect" :value="recordSelectIndex" :init-param="componentsConfig.recordSelect.initParam"
v-on:u-select-change="onRecordSelectChange(arguments[0])"></u-select>
<div class="position">
<p class="tip">{{ $t('addUnlockInfo.tip') }}</p>
<u-switch :value="valueSetHijack" v-show="recordSelectList.length && selectedMode == 2"
:init-param="componentsConfig.setHijackSwitch.initParam" v-on:u-switch-tap="onSetHijackTap(arguments[0])"></u-switch>
</div>
</div>
<u-button :init-param="componentsConfig.addButton.initParam" :disabled="!recordSelectList.length" v-on:u-button-tap="onAddButtonTap"></u-button>
</div>
<transition name="fade">
......
web/view/doorlockUsers/doorlockUser.css
......@@ -531,7 +531,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......@@ -811,8 +811,8 @@ p {
}
.inviteBind li.qrcode {
width: 5.333rem;
height: 5.333rem;
width: 4.267rem;
height: 4.267rem;
margin: 0 auto;
position: relative;
}
......@@ -831,8 +831,6 @@ p {
.inviteBind li > span {
display: inline-block;
width: 22px;
height: 22px;
border: 1px solid;
border-radius: 50%;
text-align: center;
......@@ -840,12 +838,12 @@ p {
font-size: 0.32rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
line-height: 22px;
background-color: #242635;
outline: 3px solid #242635;
color: #00ffff;
margin-right: 0.373rem;
position: relative;
padding: 0.107rem;
}
.inviteBind li p {
......@@ -874,7 +872,7 @@ p {
.inviteBind li:not(.qrcode):not(.title):not(.tip):not(.noBorder):before {
content: '';
position: absolute;
top: 0;
top: 0.053rem;
bottom: 0;
left: 0.293rem;
width: 1px;
......
web/view/doorlockUsers/unlockInfo.css
......@@ -824,7 +824,11 @@ p {
}
.custom-select {
height: 4.533rem;
position: absolute;
top: 7.093rem;
bottom: 5.627rem;
left: 0;
height: auto;
}
.custom-select .u-select-scroll .u-select-row {
......@@ -882,10 +886,16 @@ p {
padding-top: 1.52rem;
}
.position {
position: absolute;
bottom: 3.253rem;
left: 0;
width: 100%;
}
.tip {
text-align: center;
color: #A0A0A7;
margin-top: 0.08rem;
}
.u-switch {
......@@ -1063,7 +1073,7 @@ p {
.guide-dialog .guideStep1 {
position: absolute;
top: 1.173rem;
top: 1.227rem;
left: 0;
width: 100%;
}
......@@ -1186,7 +1196,7 @@ p {
.guide-dialog .guideStep5 {
position: absolute;
top: 6.613rem;
bottom: 3.093rem;
left: 0;
width: 100%;
}
......@@ -1283,14 +1293,18 @@ p {
}
.guide-dialog .guideStep5 {
top: 6.08rem;
bottom: 2.56rem;
}
.custom-select {
bottom: 4.747rem;
}
.guide-dialog .guideStep5 .guideStep5Cont p {
padding: 0.32rem 0;
.position {
bottom: 2.72rem;
}
.custom-setHijack-switch {
margin-top: 0;
margin-top: 0.373rem;
}
}
\ No newline at end of file
web/view/doorlockUsers/userList.css
......@@ -695,7 +695,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......
web/view/login/login.css
......@@ -564,7 +564,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......
web/view/myInfo/help.html 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
<meta name="format-detection" content="telephone=no"/>
<title></title>
<link rel="stylesheet" type="text/css" href="../../lib/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="./help.css">
<style type="text/css">
[v-cloak]{
display: none;
}
</style>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
</head>
<body ontouchstart="">
<div id="app" v-cloak>
<div class="content">
<p class="title"><span>&#xe606;</span>{{ $t('help.title') }}</p>
<ul class="helpCont">
<li class="white">{{ $t('help.contTip') }}</li>
<li class="white contTitle">{{ $t('help.contTitle') }}</li>
<li>
<p class="contSubtitle white">{{ $t('help.contSubtitle1') }}</p>
<p>{{ $t('help.contText1-1') }}</p>
<p><span class="white">{{ $t('help.step') }}</span>{{ $t('help.contText1-2') }}</p>
</li>
<li>
<p class="contSubtitle white">{{ $t('help.contSubtitle2') }}</p>
<p>{{ $t('help.contText2-1') }}</p>
<p><span class="white">{{ $t('help.step') }}</span>{{ $t('help.contText2-2') }}</p>
</li>
<li>
<p class="contSubtitle white">3.添加应用白名单</p>
<p>{{ $t('help.contText3-1') }}</p>
<p><span class="white">{{ $t('help.step') }}</span>{{ $t('help.contText3-2') }}</p>
</li>
</ul>
<u-button :init-param="componentsConfig.finishButton.initParam" v-on:u-button-tap="onFinishButtonTap"></u-button>
</div>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div>
<script type="text/javascript" src="./help.js" defer async></script>
</body>
</html>
\ No newline at end of file
web/view/myInfo/myInfo.css
......@@ -622,7 +622,7 @@ p {
background: #bbb;
}
@media (max-height: 400px /*no*/) {
@media (max-height: 450px /*no*/) {
#app {
height: 17.253rem;
position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment