2023年03月28日11:52:02

wjc

2023-03-28 a9d1161b1df96e7ddad566335989a1444e433ef5

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

@@ -89,7 +89,6 @@
                //空调
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.HvacCac://毛细空调
                //地热
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
@@ -107,22 +106,6 @@
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.onLogic, StringId.offLogic);
                        };
                        if (edit)
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }
                    }
                    break;
                //紧急呼叫
                case SPK.SensorHelp:
                    {
                        LogicView.FunTypeView view = new LogicView.FunTypeView();
                        view.btnText.TextID = StringId.qiujiuandzhengchang;
                        fLayout.AddChidren(view.FLayoutView());
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang);
                        };
                        if (edit)
                        {
@@ -281,6 +264,7 @@
                    break;
                //毫米波传感器(自研北邮)
                case SPK.SenesorMegahealth:
                    case SPK.SensorMmvPose:
                    {

                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
@@ -358,7 +342,7 @@
                    }
                    break;
                //环境检测传感器
                case SPK.SensorEnvironment:
                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                case SPK.SensorEnvironment2:
                case SPK.SensorEnvironment3:
                    {
@@ -482,6 +466,21 @@
                        };
                    }
                    break;
                //pm10
                case SPK.SensorPm10:
                    {
                        ///pm210
                        LogicView.FunTypeView pm10View = new LogicView.FunTypeView(); 
                        pm10View.btnText.TextID = StringId.pm10;
                        fLayout.AddChidren(pm10View.FLayoutView());

                        ///pm10点击事件
                        pm10View.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            PmCo2TvocAction(this, device, "pm10", StringId.pm10, index, edit);
                        };
                    }
                    break;
                //pm2.5
                case SPK.SensorPm25:
                    {
@@ -556,8 +555,8 @@
                        fLayout.AddChidren(view1.FLayoutView());
                        view1.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            identifier = "door_call_cloud_event";
                            DeviceView(device, view1.btnState, StringId.shi, StringId.offLogic, 1);
                            this.identifier = "door_call_cloud_event";
                            this.DeviceView(device, view1.btnState, StringId.shi, StringId.offLogic, 1);
                        };

                        LogicView.FunTypeView view2 = new LogicView.FunTypeView();
@@ -566,7 +565,7 @@
                        fLayout.AddChidren(view2.FLayoutView());
                        view2.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            identifier = "door_pedestrian_records";
                            this.identifier = "door_pedestrian_records";
                            this.FaceAction(this, device, view2.btnState);
                        };

@@ -596,10 +595,48 @@
                        }
                        if (edit)
                        {
                            GetEditState(device, index, view1.btnState, view2.btnState, null, null);
                            this.GetEditState(device, index, view1.btnState, view2.btnState, null, null);
                        }
                    }
                    break;
                //大华摄像头
                case SPK.IpCam_Imou:
                    {
                        LogicView.FunTypeView view = new LogicView.FunTypeView(); 
                        view.btnText.TextID = StringId.quyuruqingaojing;
                        view.btnText.Name = Language.StringByID(StringId.shipintonghuahujiao);
                        fLayout.AddChidren(view.FLayoutView());
                        view.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            this.identifier = "ipcam_region_alram_event";
                            this.DeviceView(device, view.btnState, StringId.shi, StringId.offLogic, 1);
                        };

                        if (edit)
                        {
                            this.GetEditState(device, index, view.btnState, null, null, null);
                        }
                    }
                    break;
                //萤石视频门锁
                case SPK.VideoDoorLock:
                    {
                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        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)
                        {
                            this.GetEditState(device, index, view1.btnState,null, null, null);
                        }
                    }
                    break;

            }
            #region  保存
            ///保存View
@@ -609,7 +646,7 @@
            this.AddChidren(saveView.FLayoutView());
            saveView.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                Save(device,index, edit);
                this.SaveInput(device,index, edit);
            };

            #endregion
@@ -620,7 +657,7 @@
        /// </summary>
        /// <param name="index">索引值</param>
        /// <param name="edit"></param>
        private void Save(Entity.Function device,int index, bool edit)
        private void SaveInput(Entity.Function device,int index, bool edit) 
        {
            
            if (selectedState != "unknown")
@@ -628,7 +665,7 @@
                Input inputDevice = new Input();
                inputDevice.condition_type = "3";
                inputDevice.sid = device.sid;
                inputDevice.condition = dicSateteList;
                inputDevice.condition.AddRange(dicSateteList);
                if (device.spk == SPK.doorgate)
                {
                    //可视对讲
@@ -639,8 +676,25 @@
                        inputDevice.condition = new List<Dictionary<string, string>>();
                    }
                }
               
               
                else if (device.spk == SPK.IpCam_Imou)
                {
                    //大华摄像头
                    inputDevice.condition_type = "9";
                    inputDevice.identifier = this.identifier;
                    if (this.identifier == "ipcam_region_alram_event")
                    {
                        //condition默认[]
                        inputDevice.condition = new List<Dictionary<string, string>>();
                    }
                }
                else if (device.spk == SPK.VideoDoorLock)
                {
                    ////萤石视频门锁
                    inputDevice.condition_type = "9";
                    inputDevice.identifier = this.identifier;
                }


                if (edit)
                {
                    //移除旧数据
@@ -706,7 +760,6 @@
                    case SPK.SensorGas:
                    case SPK.SensorWater:
                    case SPK.SensorSmoke:
                    case SPK.SensorHelp:
                        {
                            keyVlaue = "status";
                            if (!Is_SpkAttribute(keyVlaue)) {
@@ -872,11 +925,11 @@
                    || (button.Name == Language.StringByID(StringId.diedaobaojing)))
                    {
                        //只有毫米波传感器(自研)
                        Save(device, mIndex, mEdit);
                        SaveInput(device, mIndex, mEdit);
                    }
                    else if (button.Name == Language.StringByID(StringId.shipintonghuahujiao)) {
                        //只有毫米波传感器(自研)
                        Save(device, mIndex, mEdit);
                        SaveInput(device, mIndex, mEdit);
                    }
                }
            
@@ -899,7 +952,7 @@
                if (inputs.condition.Count != 0)
                {
                    //有数据重新赋值
                    dicSateteList = inputs.condition;
                    dicSateteList.AddRange(inputs.condition);
                }
            }
            new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -938,7 +991,7 @@
                }
                selectedState = device.spk + "_" + value;
                AddDictionary(keyValue, value, data_type, comparator);
                Save(device,index, edit);
                SaveInput(device,index, edit);
            });
        }
        /// PM2.5,Co2,Tvoc设置值
@@ -961,12 +1014,17 @@
                if (inputs.condition.Count != 0)
                {
                    //有数据重新赋值
                    dicSateteList = inputs.condition;
                    dicSateteList.AddRange(inputs.condition);
                }
            }
            PublicInterface view = new PublicInterface();
            //var listStr = view.GetViewList(key);
            
            var listStr = view.GetSensorLevelList(device);//2022年05月25日10:01:33 产品经理君煌要求改成动态
            //if (listStr.Count == 0)
            //{
            //    //听说是为了兼用很老很老的项目
            //    listStr = view.GetViewList(key);
            //}
            view.SingleSelectionShow(frame, listStr, Language.StringByID(title), view.GetSensorLevelText(device, stateValue,true)
               , (text) =>
               {
@@ -982,6 +1040,7 @@
                       case SPK.SensorPm25:
                       case SPK.SensorTVOC:
                       case SPK.SensorHcho:
                       case SPK.SensorPm10:
                           {
                               if (!Is_SpkAttribute(key))
                               {
@@ -991,7 +1050,7 @@
                           break;
                   }
                   AddDictionary(key, values, "integer", "in");
                   Save(device, index, edit);
                   SaveInput(device, index, edit);
               });
        }
        /// <summary>
@@ -1026,7 +1085,7 @@
                            //界面显示选中值
                            btnState.Text = face.userName;
                            //数据封装
                            AddDictionary("open_type", "1", "string");
                            AddDictionary("open_type", "1", "integer");
                            AddDictionary("user_id", face.userId, "string");

                        }, false);
@@ -1057,7 +1116,7 @@
            if (dicList.Count != 0)
            {
                //有数据重新赋值
                dicSateteList = dicList;
                dicSateteList.AddRange(dicList);
            }
            InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
        }