From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 260 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 242 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 8f4b4bc..78ef5ab 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -36,6 +36,12 @@
/// 鍙瀵硅涓撶敤
/// </summary>
private string identifier;
+ /// <summary>
+ /// 浜轰綋浼犳劅鍣ㄦ寔缁椂闂翠笓鐢�
+ /// </summary>
+ private string hold_time=string.Empty;
+
+
private static ConditionDeviceFunList m_Current = null;
@@ -184,6 +190,59 @@
if (edit)
{
GetEditState(device, index, view.btnState, null, null, null);
+ }
+ }
+ break;
+ //浜轰綋瀛樺湪浼犳劅鍣�
+ case SPK.SensorPirHold:
+ {
+
+
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+ view1.btnText.TextID = StringId.rentijiance;
+ view1.btnText.Name = Language.StringByID(StringId.rentijiance);
+ fLayout.AddChidren(view1.FLayoutView());
+ view1.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ DeviceView(device, view1.btnState, StringId.youren, StringId.wuren);
+
+ };
+
+ LogicView.FunTypeView view2 = new LogicView.FunTypeView();
+ view2.frameLayout.Y = view1.frameLayout.Bottom;
+ view2.btnText.TextID = StringId.chixushijian;
+ fLayout.AddChidren(view2.FLayoutView());
+ view2.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ //涓荤晫闈㈡帶浠�
+ FrameLayout fLayout2 = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(fLayout2);
+ TimeView(fLayout2, device, view2.btnState);
+
+ };
+
+
+ if (edit)
+ {
+ try
+ {
+ Input inputs = Logic.currlogic.input[index];
+ if (!string.IsNullOrEmpty(inputs.hold_time) && int.Parse(inputs.hold_time) > 0)
+ {
+ int time = int.Parse(inputs.hold_time);
+ int h = time / (60 * 60);
+ int m = time % (60 * 60) / 60;
+ int s = (time % (60 * 60) % 60);
+ view2.btnState.Text = inputs.hold_time + "s";
+ view2.btnState.Name = h + ":" + m + ":" + s;
+ this.hold_time = inputs.hold_time;
+ }
+ }
+ catch { }
+ GetEditState(device, index, view1.btnState, view2.btnState, null, null);
}
}
break;
@@ -514,6 +573,26 @@
};
}
break;
+ //鐓у害浼犳劅鍣�
+ case SPK.SensorLight:
+ {
+
+ ///鐓у害浼犳劅鍣�
+ LogicView.FunTypeView illuminanceView = new LogicView.FunTypeView();
+ illuminanceView.btnText.TextID = StringId.zhaomingdu;
+ fLayout.AddChidren(illuminanceView.FLayoutView());
+
+ ///鐐瑰嚮浜嬩欢
+ illuminanceView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ new PublicInterface { }.ViewZuHe(this, StringId.zhaomingdugaoyu, StringId.zhaomingdudiyu, (intText, view) =>
+ {
+ InputBoxAction(device, intText, index, edit);
+ });
+
+ };
+ }
+ break;
//鐢查啗
case SPK.SensorHcho:
{
@@ -637,6 +716,38 @@
}
}
break;
+ case SPK.Peephole:
+ LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
+ viewPeephole.btnText.TextID = StringId.ActivityDetection;
+ //viewPeephole.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ fLayout.AddChidren(viewPeephole.FLayoutView());
+ viewPeephole.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ this.identifier = "pir_event";//浜轰綋鎰熷簲鍛婅
+ this.DeviceView(device, viewPeephole.btnState, StringId.shi, StringId.offLogic, 1);
+
+ };
+ if (edit)
+ {
+ this.GetEditState(device, index, viewPeephole.btnState, null, null, null);
+ }
+ break;
+ case SPK.Ev_Ipcam:
+ LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView();
+ viewEzIpcam.btnText.TextID = StringId.ActivityDetection;
+ //viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ fLayout.AddChidren(viewEzIpcam.FLayoutView());
+ viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ this.identifier = "motiondetect_event";//浜轰綋鎰熷簲鍛婅
+ this.DeviceView(device, viewEzIpcam.btnState, StringId.shi, StringId.offLogic, 1);
+
+ };
+ if (edit)
+ {
+ this.GetEditState(device, index, viewEzIpcam.btnState, null, null, null);
+ }
+ break;
}
#region 淇濆瓨
@@ -688,11 +799,31 @@
inputDevice.condition = new List<Dictionary<string, string>>();
}
}
+ else if(device.spk == SPK.Peephole)
+ {
+ //鐚溂-浜轰綋鎰熷簲鍛婅
+ inputDevice.condition_type = "9";
+ inputDevice.identifier = this.identifier;
+ inputDevice.condition = new List<Dictionary<string, string>>();
+ }
+ else if(device.spk == SPK.Ev_Ipcam)
+ {
+ //钀ょ煶鎽勫儚澶�-绉诲姩鐩戞祴鍛婅
+ inputDevice.condition_type = "9";
+ inputDevice.identifier = this.identifier;
+ inputDevice.condition = new List<Dictionary<string, string>>();
+ }
else if (device.spk == SPK.VideoDoorLock)
{
////钀ょ煶瑙嗛闂ㄩ攣
inputDevice.condition_type = "9";
inputDevice.identifier = this.identifier;
+ inputDevice.condition = new List<Dictionary<string, string>>();
+ }
+ else if (device.spk == SPK.SensorPirHold)
+ {
+ //浜轰綋瀛樺湪浼犳劅鍣�
+ inputDevice.hold_time = this.hold_time;
}
@@ -737,6 +868,7 @@
}
}
+
/// <summary>
/// 璁惧閫夋嫨鏉′欢鐣岄潰
/// </summary>
@@ -779,6 +911,7 @@
}
}
break;
+ case SPK.SensorPirHold:
case SPK.SensorDuiShe:
case SPK.SensorShanLan:
case SPK.SensorPir:
@@ -947,6 +1080,7 @@
{
if (edit)
{
+ this.function = device;
Input inputs = Logic.currlogic.input[index];
//娓呴櫎涔嬪墠鏃ф暟鎹�
dicSateteList.Clear();
@@ -956,44 +1090,63 @@
dicSateteList.AddRange(inputs.condition);
}
}
+ int max = 100;
+ if (device.spk == SPK.SensorLight)
+ {
+ //鐓ф槑浼犳劅鍣�
+ max =int.MaxValue;
+ }
+
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
{
- string keyValue = "20";
+ string key = "20";
string data_type = "integer";
string comparator = "=";
switch (textInt)
{
case StringId.wendugaoyu:
{
- keyValue = "temperature";
+ key = "temperature";
comparator = ">";
data_type = "float";
}
break;
case StringId.wendudiyu:
{
- keyValue = "temperature";
+ key = "temperature";
comparator = "<";
data_type = "float";
}
break;
case StringId.shidugaoyu:
{
- keyValue = "humidity";
+ key = "humidity";
comparator = ">";
}
break;
case StringId.shidudiyu:
{
- keyValue = "humidity";
+ key = "humidity";
+ comparator = "<";
+ }
+ break;
+ case StringId.zhaomingdugaoyu:
+ {
+ key = "illuminance";
+ comparator = ">";
+ }
+ break;
+ case StringId.zhaomingdudiyu:
+ {
+ key = "illuminance";
comparator = "<";
}
break;
}
selectedState = device.spk + "_" + value;
- AddDictionary(keyValue, value, data_type, comparator);
+ AddDictionary(key, value, data_type, comparator);
SaveInput(device,index, edit);
- });
+ },1,max);
}
/// PM2.5,Co2,Tvoc璁剧疆鍊�
/// </summary>
@@ -1072,11 +1225,11 @@
try
{
var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);
-
+
CommonMethod.Current.MainThread(() =>
{
loading.Hide();
- string stateValue=btnState.Tag==null?"":btnState.Tag.ToString();
+ string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
PublicInterface publicInterface = new PublicInterface();
publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
{
@@ -1087,12 +1240,14 @@
string tag = string.Empty;
//鏁版嵁灏佽
AddDictionary("open_type", "1", "integer");
- for (int indexe = 0; indexe < indexeList.Count; indexe++)
+ for (int i = 0; i < indexeList.Count; i++)
{
- if (indexe > faceIdList.Count)
+
+ if (i > faceIdList.Count)
{
continue;
}
+ var indexe = indexeList[i];
var face = faceIdList[indexe];
AddDictionary("user_id", face.userId, "string");
s += face.userName;
@@ -1151,14 +1306,14 @@
dicSateteList.Clear();
string s = string.Empty;
string tag = string.Empty;
- for (int indexe = 0; indexe < indexeList.Count; indexe++)
+ for (int i = 0; i < indexeList.Count; i++)
{
- if (indexe > faceIdList.Count)
+ if (i > faceIdList.Count)
{
continue;
}
+ var indexe = indexeList[i];
var face = faceIdList[indexe];
-
//鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
AddDictionary("open_user", face.userName, "string");
s += face.userName;
@@ -1189,6 +1344,43 @@
}
/// <summary>
+ /// 鏃堕棿鏂规硶
+ /// </summary>
+ /// <param name="fLayout">鍦ㄥ摢涓晫闈㈡樉绀�</param>
+ /// <param name="edit">锛坱rue=缂栬緫锛沠alse=鏂板缓锛�</param>
+ /// <param name="index">缂栬緫鏉′欢鐨勭储寮�</param>
+ private void TimeView(FrameLayout fLayout,Function device, Button button)
+ {
+
+ LogicView.TimeView timePointView = new LogicView.TimeView();
+ timePointView.FLayoutView(fLayout);
+ timePointView.Time(fLayout, button.Name, (timeValue) =>
+ {
+ try
+ {
+ if (timeValue.Contains(":"))
+ {
+ string[] ary = timeValue.Split(':');
+
+ int h = int.Parse(ary[0]) * 60 * 60;
+ int m = int.Parse(ary[1]) * 60;
+ int s = int.Parse(ary[2]);
+ this.hold_time = (h + m + s).ToString();
+ if (button != null)
+ {
+ button.Text = this.hold_time + "s";
+ button.Name = timeValue;
+ }
+ selectedState = device.spk + "_" + timeValue;
+ }
+ }
+ catch { }
+
+ });
+
+ }
+
+ /// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
/// <param name="device">缂栬緫璁惧</param>
@@ -1208,7 +1400,32 @@
//鏈夋暟鎹噸鏂拌祴鍊�
dicSateteList.AddRange(dicList);
}
- InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
+ //浜嬩欢涓撶敤
+ switch (device.spk)
+ {
+ case SPK.IpCam_Imou:
+ {
+ if (inputs.identifier == "ipcam_region_alram_event")
+ {
+ button1.Text = Language.StringByID(StringId.shi);
+ }
+
+ }
+ break;
+ case SPK.Peephole:
+ if (inputs.identifier == "pir_event")
+ {
+ button1.Text = Language.StringByID(StringId.shi );
+ }
+ break;
+ case SPK.Ev_Ipcam:
+ if (inputs.identifier == "motiondetect_event")
+ {
+ button1.Text = Language.StringByID(StringId.shi);
+ }
+ break;
+ }
+ InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4, "");
}
/// <summary>
/// 娣诲姞閫変腑鏁版嵁
@@ -1300,7 +1517,7 @@
string value = dic["value"];
if (dictionaryA["key"] == key && dictionaryA["comparator"] == comparatorValue)
{
- if (this.checkSpk())
+ if (this.CheckSpk())
{
//鏈変簺璁惧闇�瑕佸鍔犺繖涓垽鏂�
if (dictionaryA["value"] == value)
@@ -1324,8 +1541,12 @@
/// 妫�鏌ユ槸鍚︽敮鎸�
/// </summary>
/// <returns></returns>
- private bool checkSpk()
+ private bool CheckSpk()
{
+ if (this.function == null)
+ {
+ return false;
+ }
if (this.function.spk == SPK.VideoDoorLock ||
this.function.spk == SPK.doorgate
)
@@ -1343,7 +1564,10 @@
/// <returns></returns>
public bool IsContainsAll(List<Dictionary<string, string>> dictionaryA, List<Dictionary<string, string>> dictionaryB)
{
-
+ if (dictionaryA.Count == 0 || dictionaryB.Count == 0) {
+ //钀ょ煶鐚溂锛屾憚鍍忓ご锛屽ぇ鍗庢憚鍍忓ご鍙湁浜嬩欢锛屾病鏈夎緭鍏ユ潯浠�
+ return true;
+ }
for (int i = 0; i < dictionaryA.Count; i++)
{
var dic = dictionaryA[i];
--
Gitblit v1.8.0