From 39e83c7df7608b29a3f359bcc6d9ca9b7ff095f5 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 17 五月 2022 13:54:39 +0800
Subject: [PATCH] 增加预编译条件
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 152 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 101 insertions(+), 51 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 3c652a7..d93097d 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -161,23 +161,9 @@
};
topView.AddChidren(btnTop);
- btnLinkStateTip = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(46),
- Width = Application.GetRealWidth(6),
- Height = Application.GetRealWidth(6),
- BackgroundColor = CSS_Color.LinkTipFail,
- Radius = (uint)Application.GetRealWidth(3),
- };
- topView.AddChidren(btnLinkStateTip);
- //鏇存柊閾炬帴鐘舵�乮con棰滆壊
- CheckLinkStatus();//2020-12-22
-
-
btnResidenceName = new Button()
{
- X = Application.GetRealWidth(26),
+ X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(32),
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(33),
@@ -188,12 +174,51 @@
IsBold = true
};
topView.AddChidren(btnResidenceName);
+ btnLinkStateTip = new Button()
+ {
+ //X = Application.GetRealWidth(16),
+ Y = btnResidenceName.Bottom,
+ Height = Application.GetRealWidth(14),
+ BackgroundColor = CSS_Color.LinkTipFail,
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ };
+ topView.AddChidren(btnLinkStateTip);
+ //btnLinkStateTip.Width = btnLinkStateTip.GetTextWidth();
+ //鏇存柊閾炬帴鐘舵�乮con棰滆壊
+
+ int ddd = 0;
#if DEBUG
- int msdId = 111;
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
- Control.Ins.AuthGateway();
+
+ //if (UserInfo.Current.VerOpenDoorPw || string.IsNullOrEmpty(UserInfo.Current.doorPasswordString))
+ //{
+ // var page = new DoorLockUnlockPage(new Function());
+ // MainPage.BasePageView.AddChidren(page);
+ // page.LoadView();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //}
+ //else
+ //{
+ // Control.Ins.OneKeyUnlocking(new Function(), UserInfo.Current.doorPasswordString);
+ //}
+
+ ddd++;
+ Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
+ if(ddd%2 == 0)
+ {
+ function_online.online = true;
+ }
+ else
+ {
+ function_online.online = false;
+ }
+ HomePage.LoadEvent_RefreshDevcieOnline(function_online);
+
+
};
#endif
@@ -203,6 +228,8 @@
Height = Application.GetRealHeight(32),
};
topView.AddChidren(environmentalView);
+ CheckLinkStatus();//2020-12-22
+
#region 鐜鏁版嵁
var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
@@ -553,40 +580,40 @@
#if DEBUG
- FunctionList.List.Functions.Add(new Function
- {
- name = "闂ㄩ攣",
- spk = SPK.DoorLock,
- sid = "12345",
- attributes = new List<FunctionAttributes> {
- new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
- new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
- new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
- new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
- new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
- new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
- new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
- new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
- new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
- }
- });
- FunctionList.List.Functions.Add(new Function
- {
- name = "闂ㄩ攣1",
- spk = SPK.DoorLock,
- sid = "123",
- attributes = new List<FunctionAttributes> {
- new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
- new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
- new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
- new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
- new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
- new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
- new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
- new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
- new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
- }
- });
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "闂ㄩ攣",
+ // spk = SPK.DoorLock,
+ // sid = "12345",
+ // attributes = new List<FunctionAttributes> {
+ // new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
+ // new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
+ // new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
+ // new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
+ // new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
+ // new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
+ // new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
+ // new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
+ // new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
+ // }
+ //});
+ //FunctionList.List.Functions.Add(new Function
+ //{
+ // name = "闂ㄩ攣1",
+ // spk = SPK.DoorLock,
+ // sid = "123",
+ // attributes = new List<FunctionAttributes> {
+ // new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
+ // new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
+ // new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
+ // new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
+ // new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
+ // new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
+ // new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
+ // new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
+ // new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
+ // }
+ //});
//FunctionList.List.Functions.Add(new Function()
//{
@@ -855,6 +882,7 @@
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
if (SPK.MusicSpkList().Contains( function.spk))
{
+ continue;
//var music = function as Music.A31MusicModel;
//var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
//if (music == null)
@@ -923,6 +951,12 @@
functionViews.Add(functionView);
LoadDeviceFunctionDiv(functionView, function);
index++;
+
+
+ if (!function.online)
+ {
+ btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ }
}
if (index == 0)
@@ -1186,6 +1220,7 @@
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
+ btnCollection.Visible = false;
Button btnPower;
btnPower = new Button()
{
@@ -1304,6 +1339,21 @@
{
UpdataFunctionStates(function);
}
+
+ var btnOffline = new Button()
+ {
+ X = btnIcon.Right,
+ Y = Application.GetRealWidth(16),
+ Height = Application.GetMinRealAverage(32),
+ TextID = StringId.DeviceOffline,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = "OnlineTag",
+ Visible = !function.online
+ };
+ view.AddChidren(btnOffline);
+
}
catch (Exception ex)
{
--
Gitblit v1.8.0