From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 136 ++++++++++++++++++++++++++++-----------------
1 files changed, 85 insertions(+), 51 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index ef62f22..e0f7283 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -106,7 +106,7 @@
TextColor = CSS.CSS_Color.MainBackgroundColor,
TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.residenceData.residenceName,
+ Text = DB_ResidenceData.residenceData.residecenInfo.Name,
IsBold = true
};
topView.AddChidren(btnResidenceName);
@@ -124,7 +124,7 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/InfoIcon/TempIcon.png",
+ UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
};
environmentalView.AddChidren(btnTempIcon);
@@ -135,7 +135,7 @@
Gravity = Gravity.CenterVertical,
TextColor = CSS.CSS_Color.MainBackgroundColor,
TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--掳",
+ Text = MainPage.cityInfo.temperature,
TextAlignment = TextAlignment.CenterLeft,
};
environmentalView.AddChidren(btnTempValues);
@@ -146,7 +146,7 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/InfoIcon/HumidityIcon.png",
+ UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
};
environmentalView.AddChidren(btnHumidityIcon);
@@ -157,7 +157,7 @@
Gravity = Gravity.CenterVertical,
TextColor = CSS.CSS_Color.MainBackgroundColor,
TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--%",
+ Text = MainPage.cityInfo.humidity,
TextAlignment = TextAlignment.CenterLeft,
};
environmentalView.AddChidren(btnHumidityValues);
@@ -168,7 +168,7 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/InfoIcon/Pm25Icon.png",
+ UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
};
environmentalView.AddChidren(btnPm25Icon);
@@ -179,7 +179,7 @@
Gravity = Gravity.CenterVertical,
TextColor = CSS.CSS_Color.MainBackgroundColor,
TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "--",
+ Text = MainPage.cityInfo.pm25,
TextAlignment = TextAlignment.CenterLeft,
};
environmentalView.AddChidren(btnPm25Values);
@@ -288,10 +288,13 @@
changeView.AddChidren(btnChangeScene);
#endregion
+ //bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(10), BackgroundColor = 0xAAF2F3F7 });
+
+
#region ContextView
contentView = new PageLayout()
{
- Y = changeView.Bottom + Application.GetRealHeight(10),
+ Y = changeView.Bottom ,
Height = Application.GetRealHeight(310 + 30), //20涓鸿秴鍑洪儴鍒�
};
bodyView.AddChidren(contentView);
@@ -307,6 +310,7 @@
contentView.PageIndex = 0;
#endregion
+ bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(7), BackgroundColor = 0xAAF2F3F7 });
LoadEvent_ChangeShowedFunctionType();
}
@@ -420,7 +424,7 @@
};
rowView.AddChidren(functionView);
- LoadSceneFunctionDiv(functionView, function);
+ LoadSceneFunctionDiv( functionView, function);
index++;
}
}
@@ -433,7 +437,7 @@
}
/// <summary>
- /// 鍔犺浇鎺у埗鍗＄墖
+ /// 鍔犺浇鍔熻兘鎺у埗鍗＄墖
/// </summary>
void LoadDeviceFunctionDiv(FrameLayout view, Function function)
{
@@ -506,6 +510,7 @@
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
view.AddChidren(btnCollection);
+ LoadEvent_FunctionCollection(btnCollection, function, true);
if (function.functionCategory == FunctionCategory.Curtain)
{
@@ -560,21 +565,49 @@
UpdataFunctionStates(function as Light);
#endregion
break;
- case FunctionCategory.AC:
- #region 绌鸿皟 AC
- btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
- #endregion
+ case FunctionCategory.Thermostat:
+ switch (function.functionType)
+ {
+ case FunctionType.AC:
+ #region 绌鸿皟 AC
+ btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png";
+ #endregion
+ break;
+ case FunctionType.FloorHeating:
+ #region 鍦扮儹
+ btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
+ #endregion
+ break;
+ }
break;
- case FunctionCategory.FloorHeating:
- #region 鍦扮儹
- btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png";
- btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png";
- #endregion
+ case FunctionCategory.SwitchDevice:
+ switch (function.functionType)
+ {
+ case FunctionType.Socket:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png";
+ break;
+ }
+ break;
+ case FunctionCategory.Electrical:
+ switch(function.functionType)
+ {
+ case FunctionType.Fan:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png";
+ break;
+ }
break;
}
LoadEvent_SwitchFunction(function, btnSwitch);
}
+ var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, new Button(), new Button(), new Button());
+ view.MouseUpEventHandler = skipControlPageEvent;
+ btnName.MouseUpEventHandler = skipControlPageEvent;
+ btnIcon.MouseUpEventHandler = skipControlPageEvent;
+ btnState.MouseUpEventHandler = skipControlPageEvent;
UpdataFunctionStates(function);
}
catch (Exception ex)
@@ -585,42 +618,12 @@
/// <summary>
- /// 鍔犺浇鎺у埗鍗＄墖
+ /// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
void LoadSceneFunctionDiv(FrameLayout view, Function function)
{
try
{
- Button btnCoverd = new Button()
- {
- UnSelectedImagePath = "Collection/SceneCovered.png",
- SelectedImagePath = "Collection/SceneCoveredOn.png",
- };
- view.AddChidren(btnCoverd);
- LoadEvent_ControlScene(btnCoverd, function);
-
- Button btnDelayIcon;
- btnDelayIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(12),
- Height = Application.GetRealWidth(24),
- Width = Application.GetRealWidth(24),
- UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
- };
- view.AddChidren(btnDelayIcon);
-
- Button btnCollection;
- btnCollection = new Button()
- {
- X = Application.GetRealWidth(116),
- Y = Application.GetRealWidth(8),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
- SelectedImagePath = "Collection/CollectionWhiteIcon.png",
- UnSelectedImagePath = "Collection/CollectionIcon.png",
- };
- view.AddChidren(btnCollection);
Button btnName;
btnName = new Button()
{
@@ -650,6 +653,37 @@
};
view.AddChidren(btnZone);
+ Button btnCoverd = new Button()
+ {
+ UnSelectedImagePath = "Collection/SceneCovered.png",
+ };
+ view.AddChidren(btnCoverd);
+
+ Button btnDelayIcon;
+ btnDelayIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(12),
+ Height = Application.GetRealWidth(24),
+ Width = Application.GetRealWidth(24),
+ UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
+ };
+ view.AddChidren(btnDelayIcon);
+
+ Button btnCollection;
+ btnCollection = new Button()
+ {
+ X = Application.GetRealWidth(116),
+ Y = Application.GetRealWidth(8),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ SelectedImagePath = "Collection/CollectionWhiteIcon.png",
+ UnSelectedImagePath = "Collection/CollectionIcon.png",
+ };
+ view.AddChidren(btnCollection);
+ LoadEvent_FunctionCollection(btnCollection, function, false);
+
+ LoadEvent_ControlScene(btnCoverd, function);
}
catch (Exception ex)
--
Gitblit v1.8.0