From 1eb43291d6f565fd8106ee401240d1c7a41da776 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 27 九月 2021 09:31:46 +0800
Subject: [PATCH] 组合调光
---
HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 6 +++++-
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 23 ++++++++++++-----------
.vs/HDL_APP_Project/xs/UserPrefs.xml | 24 ++++++++++++++++++++----
3 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 5f099eb..f9ba83b 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,13 +1,17 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.220222E9-B9CA-4834-9318-2BC22465F050" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/1-HomePage/HomePage.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs">
<Files>
<File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="20" Column="57" />
<File FileName="HDL_ON/UI/MainPage.cs" Line="28" Column="55" />
<File FileName="HDL-ON_iOS/Info.plist" />
<File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="759" Column="32" />
<File FileName="HDL_ON/Common/HDLCommon.cs" Line="395" Column="23" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="749" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="758" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="643" Column="1" />
+ <File FileName="HDL_ON/UI/UI0-Public/TopViewDiv.cs" Line="166" Column="46" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="45" Column="53" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs" Line="32" Column="16" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -18,9 +22,21 @@
<Node name="Server" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="UI0-Public" expanded="True">
+ <Node name="Widget" expanded="True" />
+ </Node>
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True">
- <Node name="HomePage.cs" selected="True" />
+ <Node name="1-HomePage" expanded="True" />
+ <Node name="2-Classification" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Energy" expanded="True" />
+ <Node name="EnvironmentalScience" expanded="True" />
+ <Node name="Light" expanded="True">
+ <Node name="LightScene" expanded="True">
+ <Node name="AddLightScene.cs" selected="True" />
+ </Node>
+ </Node>
</Node>
</Node>
</Node>
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 88c7b71..74fe7e8 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -38,17 +38,18 @@
public void LoadPage(int titleId)
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- //if (titleId == StringId.Lights)
- //{
- // Action action = () => {
- // var skipView = new AddLightScene(new List<Function>(),new Scene() { sceneType = SceneType.LightScene});
- // MainPage.BasePageView.AddChidren(skipView);
- // skipView.LoadPage();
- // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- // };
- // new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
- //}
- //else
+ if (titleId == StringId.Lights)
+ {
+ Action action = () =>
+ {
+ var skipView = new AddLightScene(new List<Function>(), new Scene() { sceneType = SceneType.LightScene });
+ MainPage.BasePageView.AddChidren(skipView);
+ skipView.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
+ }
+ else
{
new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
index 3822475..a14cbfe 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
@@ -478,7 +478,7 @@
{
X = Application.GetRealWidth(172),
Width = Application.GetRealWidth(172),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(46),
BackgroundColor = CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextAlignment = TextAlignment.Center,
@@ -487,6 +487,10 @@
};
bottomView.AddChidren(btnComplete);
+ //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
+ int mRectCornerID = HDLUtils.RectCornerBottomRight;
+ btnComplete.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(12), mRectCornerID);
+
bottomView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
--
Gitblit v1.8.0