From d5088d3bb198c0f53d4716022f010a02ac393977 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 25 八月 2022 15:06:01 +0800
Subject: [PATCH] 2022年08月25日15:04:41
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 152 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 24f5dc4..ec9fca3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -32,6 +32,24 @@
/// 杈撳叆鏉′欢鍒楄〃绱㈠紩鍊�
/// </summary>
private int mIndex;
+ /// <summary>
+ /// 鍙瀵硅涓撶敤
+ /// </summary>
+ private string identifier;
+
+ private static ConditionDeviceFunList m_Current = null;
+
+ public static ConditionDeviceFunList Current
+ {
+ get
+ {
+ if (m_Current == null)
+ {
+ m_Current = new ConditionDeviceFunList();
+ }
+ return m_Current;
+ }
+ }
public void Show(Entity.Function device, int index, bool edit)
{
@@ -264,8 +282,8 @@
//姣背娉紶鎰熷櫒(鑷爺鍖楅偖)
case SPK.SenesorMegahealth:
{
-
- LogicView.FunTypeView view1= new LogicView.FunTypeView();
+
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
view1.btnText.TextID = StringId.diedaobaojing;
view1.btnState.Name = Language.StringByID(StringId.diedaobaojing);
fLayout.AddChidren(view1.FLayoutView());
@@ -273,7 +291,7 @@
{
DeviceView(device, view1.btnState, StringId.shi, StringId.offLogic, 1);
};
-
+
LogicView.FunTypeView view2 = new LogicView.FunTypeView();
view2.frameLayout.Y = view1.frameLayout.Bottom;
view2.btnText.TextID = StringId.yourenbaojing;
@@ -372,7 +390,7 @@
{
fLayout.AddChidren(tvocView.FLayoutView());
}
-
+
#endregion
#region 鐐瑰嚮浜嬩欢
///娓╁害鐐瑰嚮浜嬩欢
@@ -380,7 +398,7 @@
{
new PublicInterface { }.ViewZuHe(this, StringId.wendugaoyu, StringId.wendudiyu, (intText, view) =>
{
- InputBoxAction(device,intText, index, edit);
+ InputBoxAction(device, intText, index, edit);
});
};
///婀垮害鐐瑰嚮浜嬩欢
@@ -388,30 +406,30 @@
{
new PublicInterface { }.ViewZuHe(this, StringId.shidugaoyu, StringId.shidudiyu, (intText, view) =>
{
- InputBoxAction(device,intText, index, edit);
+ InputBoxAction(device, intText, index, edit);
});
};
///pm2.5鐐瑰嚮浜嬩欢
pm25View.btnClick.MouseUpEventHandler += (sender, e) =>
{
- PmCo2TvocAction(this,device, "pm25",StringId.pm25, index,edit);
+ PmCo2TvocAction(this, device, "pm25", StringId.pm25, index, edit);
};
///co2鐐瑰嚮浜嬩欢
co2View.btnClick.MouseUpEventHandler += (sender, e) =>
{
- PmCo2TvocAction(this,device, "co2", StringId.co2, index, edit);
+ PmCo2TvocAction(this, device, "co2", StringId.co2, index, edit);
};
///tvoc鐐瑰嚮浜嬩欢
tvocView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- PmCo2TvocAction(this,device, "tvoc", StringId.tvoc, index, edit);
+ PmCo2TvocAction(this, device, "tvoc", StringId.tvoc, index, edit);
};
#endregion
}
break;
- //娓╁害浼犳劅鍣�
+ //娓╁害浼犳劅鍣�
case SPK.SensorTemperature:
{
///娓╁害
@@ -482,7 +500,7 @@
//tvoc
case SPK.SensorTVOC:
{
-
+
///tvoc
LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
tvocView.btnText.TextID = StringId.tvoc;
@@ -520,11 +538,65 @@
fLayout.AddChidren(view.FLayoutView());
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
- DeviceView(device, view.btnState, StringId.shi, StringId.offLogic,1);
+ DeviceView(device, view.btnState, StringId.shi, StringId.offLogic, 1);
};
if (edit)
{
GetEditState(device, index, view.btnState, null, null, null);
+ }
+ }
+ break;
+ //鍙瀵硅
+ case SPK.doorgate:
+ {
+
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+ view1.btnText.TextID = StringId.shipintonghuahujiao;
+ view1.btnText.Name = Language.StringByID(StringId.shipintonghuahujiao);
+ fLayout.AddChidren(view1.FLayoutView());
+ view1.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ identifier = "door_call_cloud_event";
+ DeviceView(device, view1.btnState, StringId.shi, StringId.offLogic, 1);
+ };
+
+ LogicView.FunTypeView view2 = new LogicView.FunTypeView();
+ view2.frameLayout.Y = view1.frameLayout.Bottom;
+ view2.btnText.TextID = StringId.renliankaimen;
+ fLayout.AddChidren(view2.FLayoutView());
+ view2.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ identifier = "door_pedestrian_records";
+ this.FaceAction(this, device, view2.btnState);
+ };
+
+ int intValue = 0;
+ if (edit)
+ {
+ Input inputs = Logic.currlogic.input[index];
+ if (inputs.identifier == "door_call_cloud_event")
+ {
+ intValue = 1;
+ }
+ else
+ {
+ intValue = 2;
+ }
+ }
+ if (intValue == 1)
+ {
+ //璺屽�掓姤璀�
+ view2.frameLayout.Visible = false;
+
+ }
+ else if (intValue == 2)
+ {
+ //鏈変汉鎶ヨ
+ view2.frameLayout.Y = Application.GetRealHeight(0);
+ }
+ if (edit)
+ {
+ GetEditState(device, index, view1.btnState, view2.btnState, null, null);
}
}
break;
@@ -557,6 +629,18 @@
inputDevice.condition_type = "3";
inputDevice.sid = device.sid;
inputDevice.condition = dicSateteList;
+ if (device.spk == SPK.doorgate)
+ {
+ //鍙瀵硅
+ inputDevice.condition_type = "9";
+ inputDevice.identifier = this.identifier;
+ if (this.identifier == "door_call_cloud_event")
+ {
+ inputDevice.condition = new List<Dictionary<string, string>>();
+ }
+ }
+
+
if (edit)
{
//绉婚櫎鏃ф暟鎹�
@@ -580,7 +664,7 @@
this.RemoveFromParent();
return;
}
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
if (MainView.IsGatewayType)
{ //A缃戝叧
var addLogic = new AddLogic();
@@ -783,9 +867,14 @@
if (button != null)
{
+
if (button.Name == Language.StringByID(StringId.yourenbaojing)
|| (button.Name == Language.StringByID(StringId.diedaobaojing)))
{
+ //鍙湁姣背娉紶鎰熷櫒(鑷爺)
+ Save(device, mIndex, mEdit);
+ }
+ else if (button.Name == Language.StringByID(StringId.shipintonghuahujiao)) {
//鍙湁姣背娉紶鎰熷櫒(鑷爺)
Save(device, mIndex, mEdit);
}
@@ -906,6 +995,51 @@
});
}
/// <summary>
+ ///
+ /// </summary>
+ /// <param name="frame">褰撳墠鐣岄潰</param>
+ /// <param name="device">褰撳墠璁惧</param>
+ /// <param name="btnState">鏃х姸鎬�</param>
+ public void FaceAction(FrameLayout frame, Entity.Function device,Button btnState) {
+ selectedState = device.spk + "_";
+ Loading loading = new Loading();
+ frame.AddChidren(loading);
+ loading.Start();
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ try
+ {
+ var faceIDList = Send.Current.GetListHomeFace(device.deviceId,true);
+ List<string> faceNameList = new List<string>();
+ for (int i = 0; i < faceIDList.Count; i++)
+ {
+ var face = faceIDList[i];
+ faceNameList.Add(face.userName);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ PublicInterface publicInterface = new PublicInterface();
+ publicInterface.FrameOrVv(this, faceNameList, new List<string> { btnState.Text }, device.name, (index) =>
+ {
+ var face = faceIDList[index];
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ btnState.Text = face.userName;
+ //鏁版嵁灏佽
+ AddDictionary("open_type", "1", "string");
+ AddDictionary("user_id", face.userId, "string");
+
+ }, false);
+
+ });
+ }
+ catch { }
+
+ });
+
+ }
+
+ /// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
/// <param name="device">缂栬緫璁惧</param>
@@ -925,7 +1059,7 @@
//鏈夋暟鎹噸鏂拌祴鍊�
dicSateteList = dicList;
}
- InpOrOutLogicMethod.EditState(device, dicList, button1, button2, button3, button4);
+ InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
}
/// <summary>
/// 娣诲姞閫変腑鏁版嵁
@@ -938,10 +1072,10 @@
{
//鏁版嵁灏佽
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.CurrLogicMethod.dictionary(dic, "key", KeyValue);
- LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", comparator);
- LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", data_type);
- LogicMethod.CurrLogicMethod.dictionary(dic, "value", selectedValue);
+ LogicMethod.Current.dictionary(dic, "key", KeyValue);
+ LogicMethod.Current.dictionary(dic, "comparator", comparator);
+ LogicMethod.Current.dictionary(dic, "data_type", data_type);
+ LogicMethod.Current.dictionary(dic, "value", selectedValue);
AddDictionaryList(dic);
}
/// <summary>
--
Gitblit v1.8.0