From 002e48d8baa60c8d38ba95d65cd73118ab8cdb09 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 14 七月 2023 10:54:33 +0800
Subject: [PATCH] 设备状态刷新
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 356 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 220 insertions(+), 136 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 8fd4643..5418dd3 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -24,10 +24,72 @@
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);
+
+ string pattern = @"銆怘DL銆�.*(\d{6}).*";
+
+ Regex regex = new Regex(pattern);
+
+ Match match = regex.Match(message);
+
+ if (match.Success)
+ {
+ string code = match.Groups[1].Value;
+ Console.WriteLine("楠岃瘉鐮佷负锛�" + code);
+ if(loginType==0 && logintMode == 1)
+ {
+ etPassword.Text = code;
+ }
+ smsCode = code;
+ }
+ else
+ {
+ Console.WriteLine("鏈壘鍒伴獙璇佺爜锛�");
+ }
};
#endif
}
@@ -45,6 +107,8 @@
BaseActivity.HideKeyboardEvent = () => {
};
+ BaseActivity.ShowKeyboardEvent = () => { };
+ BaseActivity.SmsAction = (sms) => { };
#endif
base.RemoveFromParent();
@@ -67,6 +131,10 @@
int logintMode = 0;
string account = "";
string password = "";
+ /// <summary>
+ /// 鐭俊楠岃瘉鐮�
+ /// </summary>
+ string smsCode = "";
#endregion
#region 鎺т欢鍒楄〃
@@ -184,6 +252,8 @@
#if __Android__
OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
+ this.BackgroundColor = CSS_Color.MainBackgroundColor;
+
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -224,7 +294,6 @@
//return;
if (b)
{
- //etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
@@ -234,7 +303,6 @@
//etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "455740454@qq.com";
//etAccount.Text = "18688565449";
- etAccount.Text = "support7@hdlautomation.com";
//etAccount.Text = "18570064522";
//etAccount.Text = "18718417827";
//etAccount.Text = "18188019284";
@@ -253,6 +321,9 @@
//etAccount.Text = "13751916353";
etAccount.Text = "13549566666";
etAccount.Text = "18316672920";
+ etAccount.Text = "support7@hdlautomation.com";
+ etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
+ etAccount.Text = "15855403939";
}
else
{
@@ -297,9 +368,9 @@
}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")
{
@@ -710,8 +781,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();
@@ -838,6 +913,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();
@@ -879,110 +955,110 @@
};
FunctionList.List.Functions.Add(lightRgbw1);
- FunctionList.List.Functions.Add(new Function
- {
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
- spk = SPK.AcstParent,
- collect = true,
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
- value = new List<string>
- {
- AcstParent_Attr_ModeValueEnum.cool.ToString(),
- AcstParent_Attr_ModeValueEnum.dry.ToString(),
- AcstParent_Attr_ModeValueEnum.fan.ToString(),
- AcstParent_Attr_ModeValueEnum.heat.ToString(),
- AcstParent_Attr_ModeValueEnum.humidity.ToString(),
- AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(),
- }
- },
- new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(),
- value = new List<string>()
- {
- AcstParent_Attr_SceneValueEnum.at_home.ToString(),
- AcstParent_Attr_SceneValueEnum.leave_home.ToString(),
- AcstParent_Attr_SceneValueEnum.sleep.ToString(),
- }
- },
- new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"},
- 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"},
- }
- });
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
+ // spk = SPK.AcstParent,
+ // collect = true,
+ // attributes = new List<FunctionAttributes>()
+ //{
+ // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ // new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ // value = new List<string>
+ // {
+ // AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ // AcstParent_Attr_ModeValueEnum.dry.ToString(),
+ // AcstParent_Attr_ModeValueEnum.fan.ToString(),
+ // AcstParent_Attr_ModeValueEnum.heat.ToString(),
+ // AcstParent_Attr_ModeValueEnum.humidity.ToString(),
+ // AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(),
+ // }
+ // },
+ // new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ // value = new List<string>()
+ // {
+ // AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ // AcstParent_Attr_SceneValueEnum.leave_home.ToString(),
+ // AcstParent_Attr_SceneValueEnum.sleep.ToString(),
+ // }
+ // },
+ // new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"},
+ // 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"},
+ //}
+ //});
- FunctionList.List.Functions.Add(new Function
- {
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
- spk = SPK.AcstSub,
- sid = "0000001",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- }
- });
- FunctionList.List.Functions.Add(new Function
- {
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
- spk = SPK.AcstSub,
- sid = "0000002",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- }
- });
- FunctionList.List.Functions.Add(new Function
- {
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
- spk = SPK.AcstSub,
- sid = "0000003",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- }
- });
- FunctionList.List.Functions.Add(new Function
- {
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
- spk = SPK.AcstSub,
- sid = "0000004",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- }
- });
- FunctionList.List.Functions.Add(new Function
- {
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
- spk = SPK.AcstSub,
- sid = "0000005",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- }
- });
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
+ // spk = SPK.AcstSub,
+ // sid = "0000001",
+ // attributes = new List<FunctionAttributes>()
+ //{
+ // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ //}
+ //});
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
+ // spk = SPK.AcstSub,
+ // sid = "0000002",
+ // attributes = new List<FunctionAttributes>()
+ //{
+ // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ //}
+ //});
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
+ // spk = SPK.AcstSub,
+ // sid = "0000003",
+ // attributes = new List<FunctionAttributes>()
+ //{
+ // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ //}
+ //});
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
+ // spk = SPK.AcstSub,
+ // sid = "0000004",
+ // attributes = new List<FunctionAttributes>()
+ //{
+ // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ //}
+ //});
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
+ // spk = SPK.AcstSub,
+ // sid = "0000005",
+ // attributes = new List<FunctionAttributes>()
+ //{
+ // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ //}
+ //});
@@ -1266,8 +1342,38 @@
#endif
-#endregion
-#region 鍦烘櫙
+ #endregion
+
+ if (FunctionList.List.groupControls.Count == 0)
+ {
+ FunctionList.List.groupControls.Add(new GroupControl()
+ {
+ name = "缇ゆ帶娴嬭瘯",
+ collect = true,
+ 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 = "light1",
+ spk = SPK.LightRGB,
+ },
+ new GroupControlFunction(){
+ sid = "light2",
+ spk = SPK.LightRGB,
+ },
+ }
+ });
+ }
+ #region 鍦烘櫙
var scene1 = new Scene()
{
sid = "scene1",
@@ -1561,6 +1667,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();
@@ -1623,29 +1730,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);
--
Gitblit v1.8.0