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/AccountRegistration.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
index cc13506..63d65c5 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
@@ -146,8 +146,8 @@
Button btnShowPassword = new Button () {
X = etPasswrod.Right - Application.GetRealWidth (80),
Y = etPasswrod.Y + Application.GetRealHeight (12),
- Width = Application.GetRealWidth (73),
- Height = Application.GetRealHeight (60),
+ Width = Application.GetMinRealAverage (73),
+ Height = Application.GetMinRealAverage (60),
SelectedImagePath = "CrabtreeAdd/ShowPW.png",
UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
BorderColor = SkinStyle.Current.Transparent,
@@ -189,8 +189,8 @@
Button btnShowPassword2 = new Button () {
X = etPasswrod.Right - Application.GetRealWidth (80),
Y = etConfirmPassword.Y + Application.GetRealHeight (12),
- Width = Application.GetRealWidth (73),
- Height = Application.GetRealHeight (60),
+ Width = Application.GetMinRealAverage (73),
+ Height = Application.GetMinRealAverage (60),
SelectedImagePath = "CrabtreeAdd/ShowPW.png",
UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
BorderColor = SkinStyle.Current.Transparent,
@@ -340,7 +340,7 @@
//2020-01-06 浠ｈˉ鍏�
if (stateCodeStr == "AccountExists") {
mes = "This account has been registered.";
- } else if (stateCodeStr == ErrorCode.AccountYesRegisterNoIsverify) {
+ } else if (stateCodeStr == "AccountYesRegisterNoIsverify") {
mes = ErrorCode.AccountYesRegisterNoIsverify;
} else if (stateCodeStr == ErrorCode.NetworkError) {
mes = ErrorCode.NetworkError;
--
Gitblit v1.8.0