From 15c5215e0a16207baace58b81f406acfd84b4de5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 八月 2020 16:00:26 +0800
Subject: [PATCH] V2.508281-beta 2020-08-28 1.搜索设备时，如果红外空调备注为空时，默认”AC“+回路号命名。 2.添加场景时，卷帘和开合帘提交改为百分比进度参数。 3.增加房间页面，长按设备名字，弹出修改备注。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs
index 168c29f..9e869be 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs
@@ -68,10 +68,11 @@
};
BodyView.AddChidren (ResetPasswrodView);
+ var viewX = (Application.GetRealWidth (640) - Application.GetMinRealAverage (500)) / 2;
var curPasswordView = new FrameLayout () {
- Width = Application.GetRealWidth (500),
- Height = Application.GetRealHeight (90),
- X = Application.GetRealWidth (70),
+ Width = Application.GetMinRealAverage (500),
+ Height = Application.GetMinRealAverage (90),
+ X = viewX,
Y = Application.GetRealHeight (200),
BackgroundImagePath = "Register/Register_Password_kuang.png",
};
@@ -80,8 +81,8 @@
var etCurPassword = new EditText () {
Width = Application.GetRealWidth (400),
X = Application.GetRealWidth (100),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseEnterOldPassword),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseEnterOldPassword),
TextAlignment = TextAlignment.CenterLeft,
SecureTextEntry = true,
TextColor = SkinStyle.Current.TextColor1,
@@ -89,9 +90,9 @@
curPasswordView.AddChidren (etCurPassword);
var newPasswordView = new FrameLayout () {
- Width = Application.GetRealWidth (500),
- Height = Application.GetRealHeight (90),
- X = Application.GetRealWidth (70),
+ Width = Application.GetMinRealAverage (500),
+ Height = Application.GetMinRealAverage (90),
+ X = viewX,
Y = curPasswordView.Bottom + Application.GetRealHeight (70),
BackgroundImagePath = "Register/Register_Password_kuang.png",
Radius = (uint)Application.GetRealHeight (0),
@@ -101,8 +102,8 @@
var etNewPassword = new EditText () {
Width = Application.GetRealWidth (400),
X = Application.GetRealWidth (100),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseSetNewPasword),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseSetNewPasword),
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
SecureTextEntry = true
@@ -110,9 +111,9 @@
newPasswordView.AddChidren (etNewPassword);
var confrimFpasswordView = new FrameLayout () {
- Width = Application.GetRealWidth (500),
- Height = Application.GetRealHeight (90),
- X = Application.GetRealWidth (70),
+ Width = Application.GetMinRealAverage (500),
+ Height = Application.GetMinRealAverage (90),
+ X = viewX,
Y = newPasswordView.Bottom + Application.GetRealHeight (70),
BackgroundImagePath = "Register/Register_Password_kuang.png",
};
@@ -122,8 +123,8 @@
Width = Application.GetRealWidth (400),
Height = Application.GetRealHeight (90),
X = Application.GetRealWidth (100),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseConfirmNewPassword),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseConfirmNewPassword),
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
SecureTextEntry = true
--
Gitblit v1.8.0