From 90fadf3023d54d780154eaa2a839e2106317297f Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 05 七月 2021 13:38:59 +0800
Subject: [PATCH] 代码合并整理
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 242 +-----------------------------------------------
1 files changed, 5 insertions(+), 237 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 4683464..18ec0c8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -16,10 +16,6 @@
/// <param name="textSize">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
public void SingleSelectionShow(FrameLayout frame, List<string> list, string titleText, string stateText, Action<string> action, int textSize = LogicView.TextSize.text14)
{
- if (list == null)
- {
- return;
- }
FrameLayout frameLayout = new FrameLayout
{
BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
@@ -79,7 +75,7 @@
};
}
-
+
/// <summary>
/// 澶氶�夋嫨
/// </summary>
@@ -263,8 +259,7 @@
/// <param name="list">鏄剧ず鏁版嵁婧�</param>
/// <param name="titleText">鏍囬</param>
/// <param name="action">杩斿洖鍊肩储寮曞��</param>
- public void FrameOrVv(FrameLayout frame, List<string> list, int titleText, Action<int> action)
- {
+ public void FrameOrVv(FrameLayout frame, List<string>list, int titleText,Action<int> action) {
int line = 0;
if (list.Count == 0 || list.Count > 5)
@@ -401,7 +396,7 @@
/// <param name="stateList">涔嬪墠鐘舵�佹暟鎹簮</param>
/// <param name="titleText">鏍囬</param>
/// <param name="action">杩斿洖鍊肩储寮曞��</param>
- public void FrameOrVvList(FrameLayout frame, List<string> list, List<string> stateList, int titleText, Action<List<string>> action)
+ public void FrameOrVvList(FrameLayout frame, List<string> list,List<string>stateList, int titleText, Action<List<string>> action)
{
int line = 0;
@@ -500,8 +495,7 @@
{
verticalRefresh.AddChidren(checkView.FLayoutView());
}
- if (stateList.Contains(strName))
- {
+ if (stateList.Contains(strName)) {
checkView.btnClick.IsSelected = true;
checkView.btnCheckIcon.IsSelected = true;
selecetdList.Add(strName);
@@ -545,63 +539,6 @@
}
- /// <summary>
- /// 娓╂箍搴︾粍鍚堢晫闈�
- /// </summary>
- /// <param name="frameLayout">鐖舵帶浠�</param>
- /// <param name="text1">鏍囬鏂囨湰1</param>
- /// <param name="text2">鏍囬鏂囨湰2</param>
- /// <param name="action">鍥炶皟鍑芥暟</param>
- public void ViewZuHe(FrameLayout frameLayout, int text1, int text2, Action<int, FrameLayout> action)
- {
-
- FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewMiddle };
- frameLayout.AddChidren(frame);
- LogicView.TopView topView = new LogicView.TopView();
- topView.topNameBtn.TextID = StringId.wendu;
- frame.AddChidren(topView.FLayoutView());
- topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
- {
- frame.RemoveFromParent();
- };
- FrameLayout viewLayout = new FrameLayout
- {
- Y = Application.GetRealHeight(64),
- Width = Application.GetRealWidth(LogicView.TextSize.view375),
- Height = Application.GetRealHeight(LogicView.TextSize.view667 - 64),
- BackgroundColor = CSS.CSS_Color.viewMiddle,
- };
- frame.AddChidren(viewLayout);
-
- //娓�,婀垮害楂樹簬
- LogicView.SelectTypeView temperaturehigherView = new LogicView.SelectTypeView();
- temperaturehigherView.btnIcon.Visible = false;
- temperaturehigherView.btnText.X = Application.GetRealWidth(16);
- temperaturehigherView.btnLine.X = Application.GetRealWidth(16);
- temperaturehigherView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
- temperaturehigherView.btnText.TextID = text1;
- viewLayout.AddChidren(temperaturehigherView.FLayoutView());
- //娓�,婀垮害浣庝簬
- LogicView.SelectTypeView temperatureunderView = new LogicView.SelectTypeView();
- temperatureunderView.frameLayout.Y = temperaturehigherView.frameLayout.Bottom;
- temperatureunderView.btnIcon.Visible = false;
- temperatureunderView.btnText.X = Application.GetRealWidth(16);
- temperatureunderView.btnLine.X = Application.GetRealWidth(16);
- temperatureunderView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
- temperatureunderView.btnText.TextID = text2;
- viewLayout.AddChidren(temperatureunderView.FLayoutView());
-
- //娓�,婀垮害楂樹簬
- temperaturehigherView.btnClick.MouseUpEventHandler += (sen, e) =>
- {
- action(text1, frame);
- };
- //娓�,婀垮害浣庝簬
- temperatureunderView.btnClick.MouseUpEventHandler += (sen, e) =>
- {
- action(text2, frame);
- };
- }
/// <summary>
/// 鑾峰彇鐣岄潰鍒楄〃
@@ -676,7 +613,7 @@
};
}
break;
- case "pm25":
+ case "pm2.5":
{
list = new List<string> {
Language.StringByID(StringId.pmyou),
@@ -684,24 +621,6 @@
Language.StringByID(StringId.pmqingdu),
Language.StringByID(StringId.pmzhongdu),
Language.StringByID(StringId.pmzhongduwuran),
- };
- }
- break;
- case "co2":
- {
- list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.piangao),
- Language.StringByID(StringId.chaobiao),
- };
- }
- break;
- case "tvoc":
- {
- list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.chaobiao),
- Language.StringByID(StringId.yanzhong),
};
}
break;
@@ -878,157 +797,6 @@
}
return stateList;
- }
- /// <summary>
- /// 鏁板�艰繑鍥炴枃鏈�
- /// </summary>
- /// <param name="type">绫诲瀷</param>
- /// <param name="strValue">鍊�</param>
- /// <returns></returns>
- public string GetString(string type, string strValue)
- {
- string text = "";
- int intValue = 0;
- if (strValue != "")
- {
- intValue = int.Parse(strValue);
- }
-
- switch (type)
- {
- case "pm25":
- {
-
- if (intValue > 0 && intValue < 35)
- {
- text = Language.StringByID(StringId.pmyou);
- }
- else if (intValue > 35 && intValue < 75)
- {
- text = Language.StringByID(StringId.pmliang);
- }
- else if (intValue > 75 && intValue < 115)
- {
- text = Language.StringByID(StringId.pmqingdu);
- }
- else if (intValue > 115 && intValue < 150)
- {
- text = Language.StringByID(StringId.pmzhongdu);
- }
- else if (intValue > 150)
- {
- text = Language.StringByID(StringId.pmzhongduwuran);
- }
- }
- break;
- case "co2":
- {
-
- if (intValue > 0 && intValue < 800)
- {
- text = Language.StringByID(StringId.zhengchang);
- }
- else if (intValue > 800 && intValue < 1100)
- {
- text = Language.StringByID(StringId.piangao);
- }
- else if (intValue > 1100)
- {
- text = Language.StringByID(StringId.chaobiao);
- }
- }
- break;
- case "tvoc":
- {
-
- if (intValue >=1 && intValue <= 3)
- {
- text = Language.StringByID(StringId.zhengchang);
- }
- else if (intValue >=4 && intValue<=6)
- {
- text = Language.StringByID(StringId.chaobiao);
- }
- else if (intValue >= 7 && intValue <= 9)
- {
- text = Language.StringByID(StringId.yanzhong);
- }
- }
- break;
- }
- return text;
- }
-
- /// <summary>
- /// 鏈枃杩斿洖鏁板�艰繑鍥�
- /// </summary>
- /// <param name="type">绫诲瀷</param>
- /// <param name="text">鏂囨湰</param>
- /// <returns></returns>
- public string GetValue(string type, string text)
- {
- string value = "";
- switch (type)
- {
- case "pm25":
- {
- if (text == Language.StringByID(StringId.pmyou))
- {
- value = "10";
- }
- else if (text == Language.StringByID(StringId.pmliang))
- {
- value = "50";
- }
- else if (text == Language.StringByID(StringId.pmqingdu))
- {
- value = "90";
- }
- else if (text == Language.StringByID(StringId.pmzhongdu))
- {
- value = "130";
- }
- else if (text == Language.StringByID(StringId.pmzhongduwuran))
- {
- value = "170";
- }
- }
- break;
- case "co2":
- {
- if (text == Language.StringByID(StringId.zhengchang))
- {
- value = "400";
- }
- else if (text == Language.StringByID(StringId.piangao))
- {
- value = "850";
- }
- else if (text == Language.StringByID(StringId.chaobiao))
- {
- value = "1200";
- }
- }
- break;
- case "tvoc":
- {
- if (text == Language.StringByID(StringId.zhengchang))
- {
- value = "2";
- }
- else if (text == Language.StringByID(StringId.chaobiao))
- {
- value = "5";
- }
- else if (text == Language.StringByID(StringId.yanzhong))
- {
- value = "8";
- }
- }
- break;
-
- }
- return value;
}
--
Gitblit v1.8.0