From d76b0e40e5bb127fd33aa1f7842447a1df0628d5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 22:16:34 +0800
Subject: [PATCH] Update PublicAssmeblyBLL.cs
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 261 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 196 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5ecb0a9..85f7dd1 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -24,10 +24,48 @@
pm = new HttpServerRequest();
#if __ANDROID__
BaseActivity.HideKeyboardEvent = () => {
- Application.RunOnMainThread(() =>
+ if (this.Y != 0)
{
- this.Y = 0;
- });
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ this.Y = 0;
+ }
+ catch { }
+ });
+ }
+ };
+ BaseActivity.ShowKeyboardEvent = () => {
+ try
+ {
+ if (etPassword.Foucs)
+ {
+
+ new Thread(() =>
+ {
+ Thread.Sleep(100);
+ if (this.Y < 0)
+ {
+ return;
+ }
+ for (var i = 0; i < 10; i++)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ this.Y = 0 - Application.GetRealHeight(10 * i);
+ }
+ catch { }
+ });
+ Thread.Sleep(10);
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ }
+ catch { }
};
BaseActivity.SmsAction = (message) => {
Console.WriteLine($"鎺ユ敹鍒扮煭淇★細"+ message);
@@ -69,6 +107,7 @@
BaseActivity.HideKeyboardEvent = () => {
};
+ BaseActivity.ShowKeyboardEvent = () => { };
BaseActivity.SmsAction = (sms) => { };
#endif
base.RemoveFromParent();
@@ -213,6 +252,8 @@
#if __Android__
OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
+ this.BackgroundColor = CSS_Color.MainBackgroundColor;
+
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -253,7 +294,6 @@
//return;
if (b)
{
- //etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
@@ -272,7 +312,6 @@
//etAccount.Text = "13143792049";
etAccount.Text = "18688414428";//澶╂渤3妤�
//etAccount.Text = "18244942707";
- //etAccount.Text = "12345678904";
//etAccount.Text = "13418062953";
etAccount.Text = "13138683659";
//etAccount.Text = "15217626103";
@@ -280,8 +319,13 @@
//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 = "12345678904";//2.0 娴嬭瘯 钀ょ煶
+ etAccount.Text = "18316672920";
}
else
{
@@ -326,16 +370,16 @@
}else if(etAccount.Text == "18688414428")
{
etPassword.Text = "HDL1985000";
- }else if (etAccount.Text == "13138683659")
+ }else if (etAccount.Text == "15855403939")
{
- etPassword.Text = "wsad123321";
+ etPassword.Text = "yyr123456";
}
else if (etAccount.Text == "18100573477")
{
etPassword.Text = "huang12345";
- }else if(etAccount.Text == "13549566666")
+ }else if(etAccount.Text == "15006564444")
{
- etPassword.Text = "12345678";
+ etPassword.Text = "zht626800";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
@@ -728,8 +772,8 @@
#region 鍔熻兘
var lightRgb1 = new Function()
{
- sid = "light1",
- deviceId = "light1",
+ sid = "light10000000000",
+ deviceId = "light10000000000",
name = Language.CurrentLanguage == "Chinese"? "瀹㈠巺姘涘洿鐏�1": "RGB light 1",
spk = SPK.LightRGB,
roomIds = new List<string>() { "1405771024583090178"},
@@ -739,8 +783,12 @@
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- //new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "colorful",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ new FunctionAttributes() { key = FunctionAttributeKey.ColorfulBegin,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
+ new FunctionAttributes() { key = FunctionAttributeKey.ColorfulEnd,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
+ new FunctionAttributes() { key = FunctionAttributeKey.ColorfulTime,value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
lightRgb1.SaveFunctionFile();
@@ -867,6 +915,7 @@
new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day" },
new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5 },
new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" },
},
};
fh.SaveFunctionFile();
@@ -874,6 +923,102 @@
#if DEBUG
+ 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)
+ {
+ FunctionList.List.groupControls.Add(new GroupControl()
+ {
+ name = "缇ゆ帶娴嬭瘯",
+ collect = true,
+ sid = "234567876545678765",
+ uids = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ roomIds = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ sids = new List<GroupControlFunction>()
+ {
+ new GroupControlFunction(){
+ sid = lightRgb1.sid,
+ spk = SPK.LightRGB,
+ },
+ new GroupControlFunction(){
+ sid = "light2",
+ spk = SPK.LightRGB,
+ },
+ }
+ });
+ }
+
+
+ var series1 = new Function()
+ {
+ sid = "light10000000000series1",
+ deviceId = "light10000000000series1",
+ name = Language.CurrentLanguage == "Chinese" ? "搴忓垪1" : "Series1",
+ spk = SPK.CommonSeries,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ },
+ };
+ series1.SaveFunctionFile();
+
+
+ var series2 = new Function()
+ {
+ sid = "light10000000000series2",
+ deviceId = "light10000000000series2",
+ name = Language.CurrentLanguage == "Chinese" ? "搴忓垪2" : "Series2",
+ spk = SPK.CommonSeries,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ },
+ };
+ series2.SaveFunctionFile();
+
+
var mechanicalArm = new Function()
{
sid = "mechanicalArm1",
@@ -1016,34 +1161,34 @@
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯姊﹀够绐楀笜",
- // spk = SPK.CurtainDream,
- // sid = "1234577",
- // attributes = new List<FunctionAttributes> {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
- // new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
- // }
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯姊﹀够绐楀笜",
+ spk = SPK.CurtainDream,
+ sid = "1234577",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
+ }
+ });
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯姣背娉紶鎰熷櫒",
- // spk = SPK.SenesorMegahealth,
- // attributes = new List<FunctionAttributes>
- // {
- // 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 = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // }
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯姣背娉紶鎰熷櫒",
+ spk = SPK.SenesorMegahealth,
+ attributes = new List<FunctionAttributes>
+ {
+ 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 = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ }
+ });
FunctionList.List.Functions.Add(new Function
{
name = "娴嬭瘯娓╂帶鍣�",
@@ -1295,8 +1440,9 @@
#endif
-#endregion
-#region 鍦烘櫙
+ #endregion
+
+ #region 鍦烘櫙
var scene1 = new Scene()
{
sid = "scene1",
@@ -1590,6 +1736,7 @@
new FunctionAttributes() { key = "set_temp",step = "0.5", 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" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" },
}
};
ac2.SaveFunctionFile();
@@ -1652,29 +1799,6 @@
LoadEventList();
account = etAccount.Text.Trim();
-#if DEBUG1211
- //鏈湴妯″紡
- Button btnLocalMode = new Button()
- {
- Y = Application.GetRealHeight(600),
- Height = Application.GetRealHeight(67),
- Text = "Local Mode",
- TextAlignment = TextAlignment.Center,
- BackgroundColor = CSS_Color.MainColor,
- TextColor = CSS_Color.TextualColor,
- };
- bodyView.AddChidren(btnLocalMode);
-
- btnLocalMode.MouseUpEventHandler = (sender, e) =>
- {
- MainPage.LocalMode = true;
- UserInfo.Current = new UserInfo();
- MainPage.GoUserPage();
- };
-
- MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
-
-#endif
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
@@ -1829,6 +1953,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