From 8d825766e377363597753ab27a0d381e41732e58 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 26 三月 2021 10:48:04 +0800
Subject: [PATCH] 新风
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 2
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 21 ++++++++++
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 10 +++++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 31 +++++++++++----
4 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index c45b4dc..bab12a2 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,6 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.94B44E9C-E1BC-4BF7-812E-FC71E9B623B2" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control_Udp.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs">
<Files>
<File FileName="HDL-ON_iOS/Info.plist" />
<File FileName="HDL_ON/UI/MainPage.cs" Line="19" Column="44" />
@@ -8,9 +8,12 @@
<File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="303" Column="15" />
<File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="195" Column="50" />
<File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="95" Column="58" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="556" Column="96" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="758" Column="53" />
<File FileName="../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS/Xamarin.iOS.Common.targets" Line="1912" Column="3" />
<File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs" Line="141" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="152" Column="50" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="312" Column="14" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -18,12 +21,24 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True">
- <Node name="Control_Udp.cs" selected="True" />
- </Node>
+ <Node name="DriverLayer" expanded="True" />
<Node name="Server" expanded="True" />
</Node>
- <Node name="Entity" expanded="True" />
+ <Node name="Entity" expanded="True">
+ <Node name="ResponseEntity" expanded="True" />
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI2" expanded="True">
+ <Node name="2-Classification" expanded="True">
+ <Node name="ClassificationPageBLL.cs" selected="True" />
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True">
+ <Node name="View" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
</Node>
<Node name="HDL-ON_Android" expanded="True">
<Node name="Properties" expanded="True" />
@@ -40,7 +55,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index e38f393..26adc48 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -739,6 +739,27 @@
break;
case ShowFunction.FreshAir:
btnName.TextID = StringId.FreshAir;
+ #region Light
+ Button btnFreshAirPower = new Button()
+ {
+ X = Application.GetRealWidth(120),
+ Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ SelectedImagePath = "Public/PowerOpen.png",
+ UnSelectedImagePath = "Public/PowerClose.png",
+ IsSelected = functionOnCount > 0,
+ Tag = item + "_AllControl",
+ };
+ functionView.AddChidren(btnFreshAirPower);
+
+ btnFreshAirPower.MouseUpEventHandler = (sender, e) =>
+ {
+ LoadEvent_SwitchFunction(btnFreshAirPower, item, functionView);
+ };
+ functionPageTitleId = StringId.FreshAir;
+
+ #endregion
break;
case ShowFunction.Music:
btnName.TextID = StringId.Music;
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index dbf88dd..d6371a6 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -370,6 +370,16 @@
System.Threading.Thread.Sleep(100);
}
break;
+ case ShowFunction.FreshAir:
+ foreach (var f in FunctionList.List.GetAirFreshList())
+ {
+ f.trait_on_off.curValue = onoff;
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(f, d);
+ System.Threading.Thread.Sleep(100);
+ }
+ break;
}
}
else
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
index 1567c59..8c536c0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
@@ -50,7 +50,7 @@
/// <summary>
/// 褰撳墠涓暟
/// </summary>
- public Button geBtn = new Button
+ public TextButton geBtn = new TextButton
{
Y = Application.GetRealHeight(40),
X = Application.GetRealWidth(72),
--
Gitblit v1.8.0