From 54c202bd4867092fca2bc6f96bec0cfd1056a46a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 06 十一月 2023 11:24:20 +0800
Subject: [PATCH] 2023年11月06日11:23:46
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 181 +++++++++++++++++++++++++++++++++-----------
1 files changed, 134 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 3fb66f0..d4ba44d 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,16 @@
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";
+ etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
+ etAccount.Text = "13533335801";
+ etAccount.Text = "13682244600";
+ etAccount.Text = "marketing@australindo.co.id";
+ etAccount.Text = "dcai.assist@gmail.com";
+
}
else
{
@@ -343,7 +349,6 @@
//etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
//etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
- //etAccount.Text = "18402017839";//wjc
//etAccount.Text = "13430286286";//cwc
//etAccount.Text = "13709260805";
//etAccount.Text = "support5@hdlchina.com.cn";
@@ -357,13 +362,13 @@
}
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")
+ else if(etAccount.Text == "18600200915")
{
- etPassword.Text = "BVVBQATD";
+ etPassword.Text = "ZJtiaoshi";
}else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
@@ -377,16 +382,16 @@
else if (etAccount.Text == "18100573477")
{
etPassword.Text = "huang12345";
- }else if(etAccount.Text == "15006564444")
+ }else if(etAccount.Text == "dcai.assist@gmail.com")
{
- etPassword.Text = "zht626800";
+ etPassword.Text = "GraniteTileS57";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
};
#endif
-#region 鐧诲綍鏂瑰紡閫夋嫨
+ #region 鐧诲綍鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
{
X = Application.GetRealWidth(28),
@@ -473,6 +478,9 @@
PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
TextAlignment = TextAlignment.CenterLeft,
};
+#if __IOS__
+ etAccount.MyTextContentType = UIKit.UITextContentType.Name;
+#endif
accountView.AddChidren(etAccount);
if (userInfo != null && userInfo.ID != "1234567890")
@@ -923,11 +931,28 @@
#if DEBUG
+ var hesTv = new Function()
+ {
+ sid = "hisense000000000001",
+ deviceId = "hisense000000000001",
+ name = "娴蜂俊鐢佃",
+ spk = SPK.ElectricalTvHisense,
+
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "off" }, curValue="on",state = "on" },
+ new FunctionAttributes() { key = "wol",value =new List<string>(){ "on" }, curValue="on",state = "on" },
+ }
+ };
+ hesTv.SaveFunctionFile();
+
+
var airSwitchP3 = new Function()
{
sid = "airSwitchP3000000000001",
deviceId = "airSwitchP3000000000001",
- name = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
+ name = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
spk = SPK.AirSwitchP3,
roomIds = new List<string>() { "1405771024583090178" },
attributes = new List<FunctionAttributes>()
@@ -953,7 +978,7 @@
new FunctionAttributes() { key = FunctionAttributeKey.ElectricityC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
new FunctionAttributes() { key = FunctionAttributeKey.TotalElectricity,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
},
- collect=true,
+ //collect = true,
};
airSwitchP3.SaveFunctionFile();
@@ -1057,7 +1082,7 @@
{
name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
spk = SPK.AcstParent,
- collect = true,
+ //collect = true,
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
@@ -1182,7 +1207,7 @@
new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
- new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ new FunctionAttributes(){ key = "target_status",curValue = "1",state = "1" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
//new FunctionAttributes(){ key = "",curValue = "",state = "" },
//new FunctionAttributes(){ key = "",curValue = "",state = "" },
@@ -1259,15 +1284,69 @@
// }
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorDryContact,
- // name = "骞叉帴鐐�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorDryContact,
+ name = "骞叉帴鐐�",
+ //collect = true,
+ sid = "sss000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "contact_status",curValue= "open",state = "open" },
+ },
+ });
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorLight,
+ name = "鍏夌収浼犳劅鍣�",
+ //collect = true,
+ sid = "SensorLightsss000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "illuminance",curValue= "100",state = "100" },
+ },
+ });
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.OtherCommon,
+ name = "閫氱敤寮�鍏�",
+ //collect = true,
+ sid = "sssCommon000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "off" },
+ },
+ });
+
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPir,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�1",
+ collect = true,
+ sid = "sss000001111",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "false",state = "false" },
+ },
+ });
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPirHold,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�2",
+ collect = true,
+ sid = "sss0000011112",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "true",state = "true" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1292,19 +1371,19 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorHelp,
- // name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
- // new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
- // new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorHelp,
+ name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1346,16 +1425,16 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorGas,
- // name = "鐕冩皵浼犳劅鍣�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
- // new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorGas,
+ name = "鐕冩皵浼犳劅鍣�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+ new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
+ },
+ });
//FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
// attributes = new List<FunctionAttributes>() {
@@ -1714,7 +1793,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" },
}
@@ -1953,6 +2033,13 @@
/// <returns></returns>
private bool CheckPrivacyPolicy()
{
+#if DEBUG
+ return true;
+#endif
+ if(HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ {
+ return true;
+ }
if (isAgreePrivacyPolicy == false)
{
//璇峰悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
--
Gitblit v1.8.0