2.3版本

wxr

2023-10-20 6de7f8a29b04737d80ad8cb17804fcc50d267bd9

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -5,6 +5,7 @@
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json;


namespace HDL_ON.UI.UI2.Intelligence.Automation
{
    public class ConditionDeviceFunList : FrameLayout
@@ -60,6 +61,7 @@

        public void Show(Entity.Function device, int index, bool edit)
        {

            this.function = device;
            this.mEdit = edit;
            this.mIndex = index;
@@ -256,6 +258,22 @@
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.kaiqi, StringId.bihe);
                        };
                        if (edit)
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }
                    }
                    break;
                //紧急呼叫传感器
                case SPK.SensorHelp:
                    {
                        LogicView.FunTypeView view = new LogicView.FunTypeView();
                        view.btnText.TextID = StringId.mubiaozhuangtai;
                        fLayout.AddChidren(view.FLayoutView());
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang ,1);
                        };
                        if (edit)
                        {
@@ -894,6 +912,7 @@
                    case SPK.SensorGas:
                    case SPK.SensorWater:
                    case SPK.SensorSmoke:
                    case SPK.SensorHelp:
                        {
                            keyVlaue = "status";
                            if (!Is_SpkAttribute(keyVlaue)) {
@@ -964,12 +983,14 @@
                {
                    case StringId.xieluo:
                    case StringId.luoshui:
                    case StringId.qiujiu:
                        {
                            value = "alarm";
                        }
                        break;
                    case StringId.wuxieluo:
                    case StringId.wuluoshui:
                    case StringId.zhengchang:
                        {
                            value = "normal";
                        }
@@ -977,11 +998,20 @@
                    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:
@@ -1095,7 +1125,7 @@
            if (device.spk == SPK.SensorLight)
            {
                //照明传感器
                max =int.MaxValue;
                max =1200;
            }

            new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -1321,9 +1351,7 @@
                                    tag += "_";
                                    array[i] = face.userName;
                                }
                                string jsonString = JsonConvert.SerializeObject(array).ToString();


                                seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
                                //数据封装<高胜说萤石那边是推送用户名>
                                AddDictionary("open_user",seleTxet, "string", "[]"); 
                                //界面显示选中值