| HDL-ON_Android/Resources/Resource.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.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/LogicMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDL-ON_Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@ { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] public partial class Resource {
@@ -3486,7 +3486,8 @@ /// RGB色盘 /// </summary> public const int rgbsepan = 7172; /// <summary> HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; const string APP_KEY = "HDL-HOME-APP-TEST"; const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -699,7 +699,7 @@ case SPK.Peephole: LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView(); viewPeephole.btnText.TextID = StringId.ActivityDetection; viewPeephole.btnText.Name = Language.StringByID(StringId.shipinmensuo); //viewPeephole.btnText.Name = Language.StringByID(StringId.shipinmensuo); fLayout.AddChidren(viewPeephole.FLayoutView()); viewPeephole.btnClick.MouseUpEventHandler += (sender, e) => { @@ -715,7 +715,7 @@ case SPK.Ev_Ipcam: LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView(); viewEzIpcam.btnText.TextID = StringId.ActivityDetection; viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo); //viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo); fLayout.AddChidren(viewEzIpcam.FLayoutView()); viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) => { @@ -784,12 +784,14 @@ //猫眼-人体感应告警 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) { @@ -1357,7 +1359,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> /// 添加选中数据 @@ -1492,7 +1519,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]; HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -460,7 +460,7 @@ break; case SPK.IpCam_Imou: { if (inputCondition.identifier == "door_caipcam_region_alram_eventll_cloud_event") if (inputCondition.identifier == "ipcam_region_alram_event") { inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing); } @@ -468,9 +468,15 @@ } break; case SPK.Ev_Ipcam: if (inputCondition.identifier == "motiondetect_event") { inputView.btnState.Text = Language.StringByID(StringId.shi); } break; case SPK.Peephole: if (inputCondition.identifier == "pir_event") { inputView.btnState.Text = Language.StringByID(StringId.On); inputView.btnState.Text = Language.StringByID(StringId.shi); } break; case SPK.SensorPirHold: @@ -2182,7 +2188,7 @@ } } break; case SPK.SensorGas: case SPK.SensorSmoke: { @@ -2409,6 +2415,8 @@ button1.Tag = tag; } break; case SPK.MusicStandard: case SPK.AvMusic: { HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -1223,7 +1223,7 @@ // new Entity.Function { sid = "1234567899", name = "门磁传感器", spk = Entity.SPK.SensorDoorWindow }, // new Entity.Function { sid = "12345678991234", name = "HDL机械手", spk = Entity.SPK.MechanicalArm }, // new Entity.Function { sid = "123456789912345", name = "海曼机械手", spk = Entity.SPK.MechanicalArm }, new Entity.Function { sid = "123456789912345668", name = "AC", spk = Entity.SPK.AcIr }, new Entity.Function { sid = "12345678991234566844", name = "大华摄像头", spk = Entity.SPK.IpCam_Imou }, new Entity.Function { sid = "12345678991234567", name = "RGB", spk = Entity.SPK.LightRGB }, new Entity.Function { sid = "123456789912345678", name = "RGBW", spk = Entity.SPK.LightRGBW }, };
