From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 227 ++++++++++++++++++++------------------------------------
1 files changed, 80 insertions(+), 147 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 9227e35..460c087 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -2,7 +2,6 @@
using Shared;
using System.Collections.Generic;
using HDL_ON.Entity;
-using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
namespace HDL_ON.UI.UI2.Intelligence.Automation
@@ -41,8 +40,12 @@
/// 浜轰綋浼犳劅鍣ㄦ寔缁椂闂翠笓鐢�
/// </summary>
private string hold_time=string.Empty;
+ /// <summary>
+ /// 妫�娴嬬被鍨� 閰嶅悎condition_type=3鏃朵娇鐢�,娌℃湁璇ュ瓧娈点�佽鍊兼垨0: 鐘舵�佹娴�(姣忔鏀跺埌鐘舵�佸氨鎴愮珛),1:鍔ㄤ綔妫�娴�(闇�瑕佸垏鎹㈢姸鎬佹墠鎴愮珛)
+ /// </summary>
+ private string detect_type = "0";
-
+
private static ConditionDeviceFunList m_Current = null;
@@ -96,11 +99,11 @@
case SPK.CurtainTrietex:
//绌鸿皟
case SPK.AcStandard:
- case SPK.HvacAC:
+ case SPK.HvacAC:case SPK.HvacAcPanel:
case SPK.AcIr:
//鍦扮儹
case SPK.FloorHeatStandard:
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
//鏂伴
case SPK.AirFreshStandard:
case SPK.HvacAirFresh:
@@ -198,7 +201,7 @@
//浜轰綋瀛樺湪浼犳劅鍣�
case SPK.SensorPirHold:
{
-
+
LogicView.FunTypeView view1 = new LogicView.FunTypeView();
view1.btnText.TextID = StringId.rentijiance;
@@ -226,6 +229,31 @@
};
+ LogicView.FunTypeView view3 = new LogicView.FunTypeView();
+ view3.frameLayout.Y = view2.frameLayout.Bottom;
+ view3.btnText.TextID = StringId.zhixingmoshi;
+ view3.btnState.TextID = StringId.shoudaojiuzhixing;
+ fLayout.AddChidren(view3.FLayoutView());
+ view3.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
+ this.AddChidren(frame);
+ LogicView.SwitchView switchView = new LogicView.SwitchView();
+ switchView.FLayoutView(frame, StringId.gaibiancaizhixing, StringId.shoudaojiuzhixing, view3.btnState.Text, 2, (intValue) =>
+ {
+ if (StringId.gaibiancaizhixing == intValue)
+ {
+ this.detect_type = "1";
+ }
+ else
+ {
+ this.detect_type = "0";
+ }
+ view3.btnState.TextID = intValue;
+ selectedState = device.spk + "_" + this.detect_type;
+ });
+ };
+
if (edit)
{
@@ -238,9 +266,21 @@
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.Text = LogicMethod.Current.getTimeStr(inputs.hold_time);
view2.btnState.Name = h + ":" + m + ":" + s;
this.hold_time = inputs.hold_time;
+ }
+ if (!string.IsNullOrEmpty(inputs.detect_type))
+ {
+ this.detect_type = inputs.detect_type;
+ if (inputs.detect_type == "1")
+ {
+ view3.btnState.TextID = StringId.gaibiancaizhixing;
+ }
+ else
+ {
+ view3.btnState.TextID = StringId.shoudaojiuzhixing;
+ }
}
}
catch { }
@@ -268,11 +308,11 @@
case SPK.SensorHelp:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
- view.btnText.TextID = StringId.qiujiuandzhengchang;
+ view.btnText.TextID = StringId.qiujiu;
fLayout.AddChidren(view.FLayoutView());
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
- DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang );
+ DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang,1);
};
if (edit)
{
@@ -716,24 +756,7 @@
}
}
break;
- //钀ょ煶瑙嗛闂ㄩ攣
- case SPK.VideoDoorLock:
- {
- LogicView.FunTypeView view1 = new LogicView.FunTypeView();
- view1.btnText.TextID=StringId.kaimenrenyuan;
- view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
- fLayout.AddChidren(view1.FLayoutView());
- view1.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- this.identifier = "open_door";//寮�閿佷簨浠�
- this.VideoDoorLockAction(this, device, view1.btnState);
- };
- if (edit)
- {
- this.GetEditState(device, index, view1.btnState,null, null, null);
- }
- }
- break;
+ //鐚溂
case SPK.Peephole:
LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
viewPeephole.btnText.TextID = StringId.ActivityDetection;
@@ -750,23 +773,6 @@
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 淇濆瓨
///淇濆瓨View
@@ -824,24 +830,11 @@
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;
+ inputDevice.detect_type = this.detect_type;
}
@@ -894,7 +887,7 @@
/// <param name="button">閫変腑鐘舵�佹樉绀烘枃鏈珺tn鎺т欢</param>
/// <param name="btnText1">灞炴�х姸鎬佸�兼枃鏈�1</param>
/// <param name="btnText2">灞炴�х姸鎬佸�兼枃鏈�2</param>
- /// <param name="viewCount">view鏁伴噺</param>
+ /// <param name="viewCount">view鏁伴噺,榛樿2涓獀iew</param>
private void DeviceView(Entity.Function device, Button button, int btnText1, int btnText2,int viewCount=2)
{
FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
@@ -997,11 +990,19 @@
case StringId.onLogic:
{
value = "on";
+ if (device.spk== SPK.SensorDryContact) {
+ value = "open";
+ }
+
}
break;
case StringId.offLogic:
{
value = "off";
+ if (device.spk == SPK.SensorDryContact)
+ {
+ value = "close";
+ }
}
break;
case StringId.youren:
@@ -1112,10 +1113,12 @@
}
}
int max = 100;
+ int min = 1;
if (device.spk == SPK.SensorLight)
{
//鐓ф槑浼犳劅鍣�
- max =int.MaxValue;
+ min = 0;
+ max =1200;
}
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -1162,12 +1165,12 @@
key = "illuminance";
comparator = "<";
}
- break;
+ break ;
}
selectedState = device.spk + "_" + value;
AddDictionary(key, value, data_type, comparator);
SaveInput(device,index, edit);
- },1,max);
+ },min,max);
}
/// PM2.5,Co2,Tvoc璁剧疆鍊�
/// </summary>
@@ -1241,13 +1244,13 @@
frame.AddChidren(loading);
loading.Start();
- CommonMethod.Current.SunThread(() =>
+ new System.Threading.Thread(() =>
{
try
{
var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);
- CommonMethod.Current.MainThread(() =>
+ Application.RunOnMainThread(() =>
{
loading.Hide();
string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
@@ -1257,27 +1260,30 @@
if (indexeList.Count > 0)
{
dicSateteList.Clear();
- string s = string.Empty;
+ string userNameStr = string.Empty;
+ string seleUsrIdStr = string.Empty;
string tag = string.Empty;
- //鏁版嵁灏佽
+ string[] arrayUserIds = new string[indexeList.Count];
+ //寮�闂ㄧ被鍨�
AddDictionary("open_type", "1", "integer");
for (int i = 0; i < indexeList.Count; i++)
{
-
if (i > faceIdList.Count)
{
continue;
}
var indexe = indexeList[i];
var face = faceIdList[indexe];
- AddDictionary("user_id", face.userId, "string");
- s += face.userName;
- s += ",";
tag += face.userId;
tag += "_";
+ userNameStr += face.userName;
+ userNameStr += ",";
+ arrayUserIds[i] = face.userId;
}
+ seleUsrIdStr = Newtonsoft.Json.JsonConvert.SerializeObject(arrayUserIds);
+ AddDictionary("user_id", seleUsrIdStr, "string", "[]");
//鐣岄潰鏄剧ず閫変腑鍊�
- btnState.Text = s;
+ btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(userNameStr);
btnState.Tag = tag;
}
@@ -1293,78 +1299,11 @@
});
}
- });
+ })
+ { IsBackground = true}.Start();
}
- /// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣涓撶敤
- /// </summary>
- /// <param name="frame">褰撳墠鐣岄潰</param>
- /// <param name="device">褰撳墠璁惧</param>
- /// <param name="btnState">鏃х姸鎬�</param>
- public void VideoDoorLockAction(FrameLayout frame, Entity.Function device, Button btnState)
- {
- selectedState = device.spk + "_";
- Loading loading = new Loading();
- frame.AddChidren(loading);
- loading.Start();
- CommonMethod.Current.SunThread(() =>
- {
- try
- {
- var faceIdList = Send.Current.GetVideoDoorLockUserListInfo(device);
- CommonMethod.Current.MainThread(() =>
- {
-
- loading.Hide();
- string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
- PublicInterface publicInterface = new PublicInterface();
- publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
- {
- if (indexeList.Count > 0)
- {
- dicSateteList.Clear();
- string seleTxet = string.Empty;
- string tag = string.Empty;
- string[] array = new string[indexeList.Count];
-
- for (int i = 0; i < indexeList.Count; i++)
- {
- if (i > faceIdList.Count)
- {
- continue;
- }
- var indexe = indexeList[i];
- var face = faceIdList[indexe];
- tag += face.userId;
- tag += "_";
- array[i] = face.userName;
- }
- seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
- //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
- AddDictionary("open_user",seleTxet, "string", "[]");
- //鐣岄潰鏄剧ず閫変腑鍊�
- btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(seleTxet);
- btnState.Tag = tag;
- }
-
- });
-
- });
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- });
- }
-
- });
-
- }
/// <summary>
/// 鏃堕棿鏂规硶
@@ -1391,7 +1330,7 @@
this.hold_time = (h + m + s).ToString();
if (button != null)
{
- button.Text = this.hold_time + "s";
+ button.Text = LogicMethod.Current.getTimeStr(this.hold_time);
button.Name = timeValue;
}
selectedState = device.spk + "_" + timeValue;
@@ -1439,12 +1378,6 @@
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;
}
@@ -1570,7 +1503,7 @@
{
return false;
}
- if (this.function.spk == SPK.VideoDoorLock ||
+ if (
this.function.spk == SPK.doorgate
)
{
--
Gitblit v1.8.0