群控备份

wxr

2023-04-07 a3313818a548d51777ae4e6cc006e9d1e2c1036e

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

@@ -89,6 +89,7 @@
                //空调
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.AcIr:
                //地热
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
@@ -342,7 +343,7 @@
                    }
                    break;
                //环境检测传感器
                case SPK.SensorEnvironment:
                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                case SPK.SensorEnvironment2:
                case SPK.SensorEnvironment3:
                    {
@@ -622,11 +623,12 @@
                case SPK.VideoDoorLock:
                    {
                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        view1.btnText.Text = "用户人员";// StringId.shipintonghuahujiao;
                        view1.btnText.TextID=StringId.yonghurenyuan;
                        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)
@@ -685,6 +687,12 @@
                        //condition默认[]
                        inputDevice.condition = new List<Dictionary<string, string>>();
                    }
                }
                else if (device.spk == SPK.VideoDoorLock)
                {
                    ////萤石视频门锁
                    inputDevice.condition_type = "9";
                    inputDevice.identifier = this.identifier;
                }


@@ -1115,19 +1123,19 @@
                try
                {
                    var userList =FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device);
                    List<string> userIdList = new List<string>();
                    List<string> userNameList = new List<string>();
                    for (int i = 0; i < userList.Count; i++)
                    {
                        var user = userList[i];
                        userIdList.Add(user.extUserId);
                        userNameList.Add(user.extUserName);
                    }
                    Application.RunOnMainThread(() =>
                    {
                        loading.Hide();
                        PublicInterface publicInterface = new PublicInterface();//用户界面
                        publicInterface.FrameOrVv(this, userIdList, new List<string> { btnState.Text }, device.name, (index) =>
                        publicInterface.FrameOrVv(this, userNameList, new List<string> { btnState.Text }, device.name, (index) =>
                        {
                            var userId = userIdList[index];
                            var userId = userNameList[index];
                            //界面显示选中值
                            btnState.Text = userId;
                            //数据封装