From 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:34:37 +0800
Subject: [PATCH] 合并乐橙代码
---
HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
index 8d7f8e3..5781fc1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs
@@ -75,7 +75,7 @@
pmhigherView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
pmhigherView.btnText.TextID = StringId.PM25;
viewLayout.AddChidren(pmhigherView.FLayoutView());
-
+
#endregion
@@ -110,7 +110,7 @@
PmAction(this);
};
-
+
#endregion
}
@@ -119,7 +119,7 @@
/// </summary>
/// <param name="textInt">鏂囨湰</param>
/// <param name="stateValue">缂栬緫涔嬪墠鐨勭姸鎬佸��,榛樿涓�20</param>
- public void InputBoxAction(int textInt, string stateValue = "20")
+ public void InputBoxAction(int textInt,string stateValue="20")
{
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
{
@@ -217,7 +217,7 @@
/// <param name="input"></param>
/// <param name="keyValue"></param>
/// <param name="comparator">姣旇緝鍏崇郴</param>
- private void AddCondition(Input input, string keyValue, string comparator)
+ private void AddCondition(Input input, string keyValue,string comparator)
{
///璁板綍绱㈠紩鍊�
int index = -1;
@@ -261,7 +261,7 @@
/// <param name="keyValue"></param>
/// <param name="comparator">姣旇緝鍏崇郴</param>
/// <returns></returns>
- private bool ExistKey(List<Dictionary<string, string>> dicList, string keyValue, string comparator)
+ private bool ExistKey(List<Dictionary<string, string>> dicList, string keyValue, string comparator)
{
for (int i = 0; i < dicList.Count; i++)
{
@@ -277,11 +277,7 @@
return false;
}
- /// <summary>
- /// 鏁板�艰繑鍥炴枃鏈�
- /// </summary>
- /// <param name="strValue">鍊�</param>
- /// <returns></returns>
+
public string GetString(string strValue)
{
string text = "";
--
Gitblit v1.8.0