From 0857891207a8fa2fd68cb9f7c9cf544806b46741 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 26 五月 2021 09:38:13 +0800
Subject: [PATCH] 2021-5-26-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 1 +
.vs/HDL_APP_Project/xs/UserPrefs.xml | 16 +++++++++-------
HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs | 2 --
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 8 ++------
4 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 120f042..60283cf 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,9 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs">
+ <Files>
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="51" Column="27" />
+ </Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -10,16 +13,15 @@
<Node name="DAL" expanded="True">
<Node name="Mqtt" expanded="True" />
</Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="PirDevice" expanded="True">
- <Node name="PirMethod.cs" selected="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="Automation" expanded="True">
+ <Node name="Logic.cs" selected="True" />
</Node>
</Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Music" expanded="True" />
- </Node>
+ <Node name="FuntionControlView" expanded="True" />
</Node>
</Node>
</Node>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 7fbc2ab..16eece9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -58,6 +58,7 @@
{
viewLayout.AddChidren(shiwaiView.FLayoutView());
}
+
#endregion
#region 鎵�鏈夌偣鍑讳簨浠�
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 65bb8a2..301ee67 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -510,7 +510,7 @@
}
}
/// <summary>
- /// 鍒ゆ柇缃戝叧绫诲瀷
+ /// 鍒ゆ柇缃戝叧绫诲瀷(0:bus缃戝叧锛�1:A鍗忚缃戝叧)
/// </summary>
/// <returns></returns>
public static bool IsGatewayType
@@ -521,11 +521,7 @@
{
return true;
}
- else
- {
- return false;
-
- }
+ return false;
}
}
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
index e11c983..c1fc7aa 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
@@ -45,7 +45,6 @@
weatherView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
weatherView.btnText.TextID = StringId.tianqibianhua;
viewLayout.AddChidren(weatherView.FLayoutView());
-
//绌烘皵璐ㄩ噺
LogicView.SelectTypeView kongqiViewk = new LogicView.SelectTypeView();
kongqiViewk.frameLayout.Y = weatherView.frameLayout.Bottom;
@@ -56,7 +55,6 @@
kongqiViewk.btnText.TextID = StringId.kongqizhiliang;
viewLayout.AddChidren(kongqiViewk.FLayoutView());
#endregion
-
#region 鎵�鏈夌偣鍑讳簨浠�
//瀹ゅ娓┿�佹箍搴︺�丳M2.5鍙樺寲
airqualityView.btnClick.MouseUpEventHandler += (sen, e) => {
--
Gitblit v1.8.0