From 6692d867a0876b014be3cbd64bc3a237a026dc2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 十月 2022 09:57:15 +0800
Subject: [PATCH] 修改安卓隐私确认弹窗，隐私协议英文的问题
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index b8b6222..ec4c085 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -89,7 +89,6 @@
//绌鸿皟
case SPK.AcStandard:
case SPK.HvacAC:
- case SPK.HvacCac://姣涚粏绌鸿皟
//鍦扮儹
case SPK.FloorHeatStandard:
case SPK.HvacFloorHeat:
@@ -107,22 +106,6 @@
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
DeviceView(device, view.btnState, StringId.onLogic, StringId.offLogic);
- };
- if (edit)
- {
- GetEditState(device, index, view.btnState, null, null, null);
- }
- }
- break;
- //绱ф�ュ懠鍙�
- case SPK.SensorHelp:
- {
- LogicView.FunTypeView view = new LogicView.FunTypeView();
- view.btnText.TextID = StringId.qiujiuandzhengchang;
- fLayout.AddChidren(view.FLayoutView());
- view.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang);
};
if (edit)
{
@@ -706,7 +689,6 @@
case SPK.SensorGas:
case SPK.SensorWater:
case SPK.SensorSmoke:
- case SPK.SensorHelp:
{
keyVlaue = "status";
if (!Is_SpkAttribute(keyVlaue)) {
@@ -965,8 +947,13 @@
}
}
PublicInterface view = new PublicInterface();
- //var listStr = view.GetViewList(key);
+
var listStr = view.GetSensorLevelList(device);//2022骞�05鏈�25鏃�10:01:33 浜у搧缁忕悊鍚涚厡瑕佹眰鏀规垚鍔ㄦ��
+ //if (listStr.Count == 0)
+ //{
+ // //鍚鏄负浜嗗吋鐢ㄥ緢鑰佸緢鑰佺殑椤圭洰
+ // listStr = view.GetViewList(key);
+ //}
view.SingleSelectionShow(frame, listStr, Language.StringByID(title), view.GetSensorLevelText(device, stateValue,true)
, (text) =>
{
@@ -1026,7 +1013,7 @@
//鐣岄潰鏄剧ず閫変腑鍊�
btnState.Text = face.userName;
//鏁版嵁灏佽
- AddDictionary("open_type", "1", "string");
+ AddDictionary("open_type", "1", "integer");
AddDictionary("user_id", face.userId, "string");
}, false);
--
Gitblit v1.8.0