From 8f9f20698e1256a58ee6894a9bc168a9dfb37861 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 14 九月 2023 13:32:14 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.0
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 85f7dd1..5662f9d 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -311,7 +311,6 @@
//etAccount.Text = "18244942707";
//etAccount.Text = "13143792049";
etAccount.Text = "18688414428";//澶╂渤3妤�
- //etAccount.Text = "18244942707";
//etAccount.Text = "13418062953";
etAccount.Text = "13138683659";
//etAccount.Text = "15217626103";
@@ -323,9 +322,10 @@
etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
etAccount.Text = "15855403939";
etAccount.Text = "15006564444";
- etAccount.Text = "13580507523";
+ etAccount.Text = "pjh@hdlchina.com.cn";
//etAccount.Text = "12345678904";//2.0 娴嬭瘯 钀ょ煶
etAccount.Text = "18316672920";
+ etAccount.Text = "18244942707";
}
else
{
@@ -357,9 +357,9 @@
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "18188019284")
+ if(etAccount.Text == "pjh@hdlchina.com.cn")
{
- etPassword.Text = "CEZUJHSZ";
+ etPassword.Text = "hdl123";
}
else if(etAccount.Text == "13143792049")
{
@@ -386,7 +386,7 @@
};
#endif
-#region 鐧诲綍鏂瑰紡閫夋嫨
+ #region 鐧诲綍鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
{
X = Application.GetRealWidth(28),
@@ -1714,7 +1714,8 @@
new FunctionAttributes() { key = "on_off", value = new List<string>() { "on", "off" }, curValue = "on", state = "on" },
new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
- new FunctionAttributes() { key = "set_temp",step = "1", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = "set_temp",unit = "F", step = "1", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempType,unit = "F", step = "1", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
}
--
Gitblit v1.8.0