| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Assets/Language.ini
@@ -1229,6 +1229,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -2629,6 +2632,10 @@ 7174=照明度高于 7175=照明度低于 7176=光照 7177=执行模式 7178=改变才执行 7179=收到就执行 @@ -4017,6 +4024,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -5398,6 +5408,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -6785,6 +6798,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -8110,6 +8126,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Відеозамок дверей 8502=Кількість електроенергії HDL-ON_iOS/Resources/Language.ini
@@ -1229,6 +1229,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -2629,6 +2632,9 @@ 7174=照明度高于 7175=照明度低于 7176=光照 7177=执行模式 7178=改变才执行 7179=收到就执行 @@ -4017,6 +4023,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -5398,6 +5407,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -6785,6 +6797,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Video door lock 8502=Electric quantity @@ -8110,6 +8125,9 @@ 7174=Exceed 7175=Under 7176=HV 7177=Execution mode 7178=Change execution 7179=Execute on receipt 8501=Відеозамок дверей 8502=Кількість електроенергії HDL_ON/Common/R.cs
@@ -3547,6 +3547,18 @@ /// 光照 /// </summary> public const int guangzhao = 7176; /// <summary> /// 执行模式 /// </summary> public const int zhixingmoshi = 7177; /// <summary> /// 改变才执行 /// </summary> public const int gaibiancaizhixing = 7178; /// <summary> /// 收到就执行 /// </summary> public const int shoudaojiuzhixing = 7179;
@@ -3,7 +3,6 @@ using System.Collections.Generic; using HDL_ON.Entity; using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock; using Newtonsoft.Json; namespace HDL_ON.UI.UI2.Intelligence.Automation @@ -42,6 +41,10 @@ /// 人体传感器持续时间专用 /// </summary> private string hold_time=string.Empty; /// <summary> /// 检测类型 配合condition_type=3时使用,没有该字段、该值或0: 状态检测(每次收到状态就成立),1:动作检测(需要切换状态才成立) /// </summary> private string detect_type = "0"; @@ -227,6 +230,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) { @@ -242,6 +270,18 @@ 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 { } @@ -843,6 +883,7 @@ { //人体存在传感器 inputDevice.hold_time = this.hold_time; inputDevice.detect_type = this.detect_type; }
@@ -504,6 +504,17 @@ { int time = int.Parse(inputCondition.hold_time); inputView.btnState.Text += "持续" + LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", ""); } if (!string.IsNullOrEmpty(inputCondition.detect_type)) { if (inputCondition.detect_type == "1") { inputView.btnState.Text += "," + Language.StringByID(StringId.gaibiancaizhixing); } else { inputView.btnState.Text += "," + Language.StringByID(StringId.shoudaojiuzhixing); } }
@@ -107,6 +107,10 @@ /// </summary> public string identifier = ""; /// <summary> /// 检测类型 配合condition_type=3时使用,没有该字段、该值或0: 状态检测(每次收到状态就成立),1:动作检测(需要切换状态才成立); /// </summary> public string detect_type = "0"; /// <summary> /// 人体移动传感器（带持续时间） /// </summary> public string hold_time = ""; HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs
@@ -197,7 +197,7 @@ }; ///显示之前状态 if (stateVuale != "") if (!string.IsNullOrEmpty(stateVuale)) { if (stateVuale == btnOn.Text) { HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -118,6 +118,10 @@ { inputTypeJOb.Add("hold_time", dictionary.hold_time); } if (!string.IsNullOrEmpty(dictionary.detect_type)) { inputTypeJOb.Add("detect_type", dictionary.detect_type); } inputTypeJOb.Add("condition_type", dictionary.condition_type); if (dictionary.condition_type=="9") { inputTypeJOb.Add("identifier", dictionary.identifier); @@ -249,6 +253,10 @@ { inputTypeJOb.Add("hold_time", dictionary.hold_time); } if (!string.IsNullOrEmpty(dictionary.detect_type)) { inputTypeJOb.Add("detect_type", dictionary.detect_type); } inputTypeJOb.Add("condition_type", dictionary.condition_type); if (dictionary.condition_type == "9") {
