From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 287 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 188 insertions(+), 99 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 246f9f4..0e921fe 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -294,99 +294,72 @@
//return;
if (b)
{
- //etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
- //etAccount.Text = "13226233133";//璞嗚眴
//etAccount.Text = "18316120654";//tujie
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
//etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "455740454@qq.com";
- //etAccount.Text = "18688565449";
- //etAccount.Text = "18570064522";
- //etAccount.Text = "18718417827";
- //etAccount.Text = "18188019284";
- //etAccount.Text = "13143792049";
//etAccount.Text = "13288623489";//缃楁檽涓�
- //etAccount.Text = "18244942707";
- //etAccount.Text = "13143792049";
- etAccount.Text = "18688414428";//澶╂渤3妤�
- //etAccount.Text = "18244942707";
- //etAccount.Text = "12345678904";
- //etAccount.Text = "13418062953";
- etAccount.Text = "13138683659";
- //etAccount.Text = "15217626103";
- //etAccount.Text = "18100573477";
- //etAccount.Text = "18321091245";
- //etAccount.Text = "13751916353";
- etAccount.Text = "13549566666";
- etAccount.Text = "18316672920";
- etAccount.Text = "support7@hdlautomation.com";
- etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
- etAccount.Text = "15855403939";
- etAccount.Text = "15006564444";
- etAccount.Text = "13580507523";
+ //etAccount.Text = "18688414428";//澶╂渤3妤�
+ //etAccount.Text = "pjh@hdlchina.com.cn";
+ //etAccount.Text = "12345678904";//2.0 娴嬭瘯 钀ょ煶
+ //etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
+ //etAccount.Text = "marketing@australindo.co.id";
+ //etAccount.Text = "13922115008";//鍒樻��
+ //etAccount.Text = "support7@hdlautomation.com";
+ etAccount.Text = "13336018868";
+ etAccount.Text = "13435693712";
+
+
}
else
{
//etAccount.Text = "464027401@qq.com";//
- //etAccount.Text = "15217626103";//
- etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
+ //etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
//etAccount.Text = "2949126848@qq.com";//闄堢惓
- etAccount.Text = "15014291819 ";
//etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
- //etAccount.Text = "13602944661";//kx
- //etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
//etAccount.Text = "15971583093";//楂樿儨
//etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
- //etAccount.Text = "18598273624";
- //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";
- //etAccount.Text = "13375012441";
- //etAccount.Text = "info@smartlife-ks.com";
//etAccount.Text = "551775569@qq.com";//wcf
etAccount.Text = "15626203746";
- //etAccount.Text = "zhangquansongjava@163.com";
- //etAccount.Text = "s.savinov@hdlautomation.ru";
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "18188019284")
+ if(etAccount.Text == "13336018868")
{
- etPassword.Text = "CEZUJHSZ";
+ etPassword.Text = "zzy20020928";
}
- else if(etAccount.Text == "13143792049")
+ else if(etAccount.Text == "13435693712")
{
- etPassword.Text = "BVVBQATD";
+ etPassword.Text = "a123456";
}else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
- }else if(etAccount.Text == "18688414428")
+ }else if(etAccount.Text == "15014291819")
{
- etPassword.Text = "HDL1985000";
- }else if (etAccount.Text == "15855403939")
+ etPassword.Text = "hdl123456";
+ }else if (etAccount.Text == "15262988048")
{
- etPassword.Text = "yyr123456";
+ etPassword.Text = "15262988048";
}
- else if (etAccount.Text == "18100573477")
+ else if (etAccount.Text == "649362315@qq.com")
{
- etPassword.Text = "huang12345";
- }else if(etAccount.Text == "15006564444")
+ etPassword.Text = "aa123456";
+ }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 +446,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")
@@ -545,6 +521,7 @@
PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
SecureTextEntry = true,
TextAlignment = TextAlignment.CenterLeft,
+
};
passwordView.AddChidren(etPassword);
@@ -923,7 +900,56 @@
#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 = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
+ spk = SPK.AirSwitchP3,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = FunctionAttributeKey.PowerA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.PowerB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.PowerC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.VoltageA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.VoltageB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.VoltageC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.CurrentA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.CurrentB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.CurrentC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.MaxCurrent,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.MaxTemp,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.ElectricityA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.ElectricityB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ 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,
+ };
+ airSwitchP3.SaveFunctionFile();
if (FunctionList.List.groupControls.Count == 0)
{
@@ -931,6 +957,7 @@
{
name = "缇ゆ帶娴嬭瘯",
collect = true,
+ sid = "234567876545678765",
uids = new List<string>()
{
"1405771024583090178",
@@ -944,11 +971,11 @@
sids = new List<GroupControlFunction>()
{
new GroupControlFunction(){
- sid = "light1",
+ sid = lightRgb1.sid,
spk = SPK.LightRGB,
},
new GroupControlFunction(){
- sid = "light2",
+ sid = "light2",
spk = SPK.LightRGB,
},
}
@@ -1024,7 +1051,7 @@
{
name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
spk = SPK.AcstParent,
- collect = true,
+ //collect = true,
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
@@ -1051,17 +1078,17 @@
new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"},
new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"},
new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
}
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
+ name = "瀛愭帶-1",
spk = SPK.AcstSub,
sid = "0000001",
attributes = new List<FunctionAttributes>()
@@ -1074,7 +1101,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
+ name = "瀛愭帶-2",
spk = SPK.AcstSub,
sid = "0000002",
attributes = new List<FunctionAttributes>()
@@ -1087,7 +1114,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
+ name = "瀛愭帶-3",
spk = SPK.AcstSub,
sid = "0000003",
attributes = new List<FunctionAttributes>()
@@ -1100,7 +1127,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
+ name = "瀛愭帶-4",
spk = SPK.AcstSub,
sid = "0000004",
attributes = new List<FunctionAttributes>()
@@ -1113,7 +1140,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
+ name = "瀛愭帶-5",
spk = SPK.AcstSub,
sid = "0000005",
attributes = new List<FunctionAttributes>()
@@ -1149,7 +1176,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 = "" },
@@ -1226,15 +1253,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()
//{
@@ -1259,19 +1340,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()
//{
@@ -1313,16 +1394,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>() {
@@ -1681,7 +1762,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" },
}
@@ -1920,6 +2002,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