From 223875b14fa1f87be66620c9903e5183f9b19c43 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 17:01:08 +0800
Subject: [PATCH] 2021-08-27 1.更新Android库，修改裁剪图片方案，支持大图裁剪
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 106 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 32 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..e108493 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -263,7 +263,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, List<string> stateList, int titleText, Action<int> action)
{
int line = 0;
@@ -366,6 +366,11 @@
{
verticalRefresh.AddChidren(checkView.FLayoutView());
}
+
+ if (stateList.Contains(strName))
+ {
+ checkView.btnCheckIcon.IsSelected = true;
+ }
checkView.btnText.Text = strName;
checkView.btnClick.Tag = i;//鏍囪
//鐐瑰嚮浜嬩欢
@@ -391,8 +396,7 @@
frameLayout.RemoveFromParent();
};
- }
-
+ }
/// <summary>
/// 瓒呭嚭5涓厓绱犺鐢ㄦ粦鍔ㄦ帶浠�
/// </summary>
@@ -400,7 +404,7 @@
/// <param name="list">鏄剧ず鏁版嵁婧�</param>
/// <param name="stateList">涔嬪墠鐘舵�佹暟鎹簮</param>
/// <param name="titleText">鏍囬</param>
- /// <param name="action">杩斿洖鍊肩储寮曞��</param>
+ /// <param name="action">杩斿洖鍊煎垪琛�</param>
public void FrameOrVvList(FrameLayout frame, List<string> list, List<string> stateList, int titleText, Action<List<string>> action)
{
@@ -644,6 +648,16 @@
};
}
break;
+ case "airFresh":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.zidong),
+ Language.StringByID(StringId.shoudong),
+ Language.StringByID(StringId.dingshi),
+ Language.StringByID(StringId.zhineng),
+ };
+ }
+ break;
case "week":
{
list = new List<string> {
@@ -690,22 +704,29 @@
case "co2":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.piangao),
- Language.StringByID(StringId.chaobiao),
+ Language.StringByID(StringId.zhengchang)+ ":0~1000PPM",
+ Language.StringByID(StringId.piangao) + ":1001~2000PPM",
+ Language.StringByID(StringId.chaobiao) + ":>2000PPM",
};
}
break;
case "tvoc":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang),
- Language.StringByID(StringId.chaobiao),
- Language.StringByID(StringId.yanzhong),
+ Language.StringByID(StringId.zhengchang)+ ":0~399mg/m3",
+ Language.StringByID(StringId.chaobiao)+ ":400~699mg/m3",
+ Language.StringByID(StringId.yanzhong)+":>700mg/m3",
};
}
break;
-
+ case "security":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.bufang ),
+ Language.StringByID(StringId.chefang),
+ };
+ }
+ break;
}
return list;
}
@@ -781,6 +802,27 @@
else if (text == Language.StringByID(StringId.timeMode))
{
str = "timer";
+ }
+ }
+ break;
+ case "airFresh":
+ {
+
+ if (text == Language.StringByID(StringId.autoLogic))
+ {
+ str = "auto";
+ }
+ else if (text == Language.StringByID(StringId.shoudong))
+ {
+ str = "manual";
+ }
+ else if (text == Language.StringByID(StringId.dingshi))
+ {
+ str = "timer";
+ }
+ else if (text == Language.StringByID(StringId.zhineng))
+ {
+ str = "smart";
}
}
break;
@@ -899,19 +941,19 @@
case "pm25":
{
- if (intValue > 0 && intValue < 35)
+ if (intValue >= 0 && intValue <= 35)
{
text = Language.StringByID(StringId.pmyou);
}
- else if (intValue > 35 && intValue < 75)
+ else if (intValue >35 && intValue <= 75)
{
text = Language.StringByID(StringId.pmliang);
}
- else if (intValue > 75 && intValue < 115)
+ else if (intValue > 75 && intValue <= 115)
{
text = Language.StringByID(StringId.pmqingdu);
}
- else if (intValue > 115 && intValue < 150)
+ else if (intValue >115 && intValue <= 150)
{
text = Language.StringByID(StringId.pmzhongdu);
}
@@ -924,17 +966,17 @@
case "co2":
{
- if (intValue > 0 && intValue < 800)
+ if (intValue >= 0 && intValue <= 1000)
{
- text = Language.StringByID(StringId.zhengchang);
+ text = Language.StringByID(StringId.zhengchang)+ ":0~1000PPM";
}
- else if (intValue > 800 && intValue < 1100)
+ else if (intValue > 1000 && intValue <= 2000)
{
- text = Language.StringByID(StringId.piangao);
+ text = Language.StringByID(StringId.piangao) + ":1001~2000PPM";
}
- else if (intValue > 1100)
+ else if (intValue > 2000)
{
- text = Language.StringByID(StringId.chaobiao);
+ text = Language.StringByID(StringId.chaobiao) + ":>2000PPM";
}
}
break;
@@ -943,15 +985,15 @@
if (intValue >=1 && intValue <= 3)
{
- text = Language.StringByID(StringId.zhengchang);
+ text = Language.StringByID(StringId.zhengchang) + ":0~399mg/m3";
}
else if (intValue >=4 && intValue<=6)
{
- text = Language.StringByID(StringId.chaobiao);
+ text = Language.StringByID(StringId.chaobiao) + ":400~699mg/m3";
}
else if (intValue >= 7 && intValue <= 9)
{
- text = Language.StringByID(StringId.yanzhong);
+ text = Language.StringByID(StringId.yanzhong) + ":>700mg/m3";
}
}
break;
@@ -996,31 +1038,31 @@
break;
case "co2":
{
- if (text == Language.StringByID(StringId.zhengchang))
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~1000PPM")
{
value = "400";
}
- else if (text == Language.StringByID(StringId.piangao))
+ else if (text == Language.StringByID(StringId.piangao) + ":1001~2000PPM")
{
- value = "850";
+ value = "1850";
}
- else if (text == Language.StringByID(StringId.chaobiao))
+ else if (text == Language.StringByID(StringId.chaobiao) + ":>2000PPM")
{
- value = "1200";
+ value = "2200";
}
}
break;
case "tvoc":
{
- if (text == Language.StringByID(StringId.zhengchang))
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~399mg/m3")
{
value = "2";
}
- else if (text == Language.StringByID(StringId.chaobiao))
+ else if (text == Language.StringByID(StringId.chaobiao) + ":400~699mg/m3")
{
value = "5";
}
- else if (text == Language.StringByID(StringId.yanzhong))
+ else if (text == Language.StringByID(StringId.yanzhong) + ":>700mg/m3")
{
value = "8";
}
--
Gitblit v1.8.0