Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

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

@@ -2,8 +2,6 @@
using Shared;
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,8 +40,12 @@
        /// 人体传感器持续时间专用
        /// </summary>
        private string hold_time=string.Empty;
        /// <summary>
        /// 检测类型 配合condition_type=3时使用,没有该字段、该值或0: 状态检测(每次收到状态就成立),1:动作检测(需要切换状态才成立)
        /// </summary>
        private string detect_type = "0";

        


        private static ConditionDeviceFunList m_Current = null;

@@ -97,11 +99,11 @@
                case SPK.CurtainTrietex:
                //空调
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.HvacAC:case SPK.HvacAcPanel:
                case SPK.AcIr:
                //地热
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                //新风
                case SPK.AirFreshStandard:
                case SPK.HvacAirFresh:
@@ -199,7 +201,7 @@
                //人体存在传感器
                case SPK.SensorPirHold:
                    {
                       


                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        view1.btnText.TextID = StringId.rentijiance;
@@ -227,6 +229,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)
                        {
@@ -239,9 +266,21 @@
                                    int h = time / (60 * 60);
                                    int m = time % (60 * 60) / 60;
                                    int s = (time % (60 * 60) % 60);
                                    view2.btnState.Text = LogicMethod.Current.getTimeStr(inputs.hold_time); 
                                    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 { }
@@ -717,24 +756,7 @@
                        }
                    }
                    break;
                //萤石视频门锁
                case SPK.VideoDoorLock:
                    {
                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        view1.btnText.TextID=StringId.kaimenrenyuan;
                        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;
                    //猫眼
                case SPK.Peephole:
                    LogicView.FunTypeView viewPeephole = new LogicView.FunTypeView();
                    viewPeephole.btnText.TextID = StringId.ActivityDetection;
@@ -751,23 +773,6 @@
                        this.GetEditState(device, index, viewPeephole.btnState, null, null, null);
                    }
                    break;
                case SPK.Ev_Ipcam:
                    LogicView.FunTypeView viewEzIpcam = new LogicView.FunTypeView();
                    viewEzIpcam.btnText.TextID = StringId.ActivityDetection;
                    //viewEzIpcam.btnText.Name = Language.StringByID(StringId.shipinmensuo);
                    fLayout.AddChidren(viewEzIpcam.FLayoutView());
                    viewEzIpcam.btnClick.MouseUpEventHandler += (sender, e) =>
                    {
                        this.identifier = "motiondetect_event";//人体感应告警
                        this.DeviceView(device, viewEzIpcam.btnState, StringId.shi, StringId.offLogic, 1);

                    };
                    if (edit)
                    {
                        this.GetEditState(device, index, viewEzIpcam.btnState, null, null, null);
                    }
                    break;

            }
            #region  保存
            ///保存View
@@ -825,24 +830,11 @@
                    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)
                {
                    ////萤石视频门锁
                    inputDevice.condition_type = "9";
                    inputDevice.identifier = this.identifier;
                    //inputDevice.condition = new List<Dictionary<string, string>>();
                }
                else if (device.spk == SPK.SensorPirHold)
                {
                    //人体存在传感器
                    inputDevice.hold_time = this.hold_time;
                    inputDevice.detect_type = this.detect_type;
                }


@@ -1121,9 +1113,11 @@
                }
            }
            int max = 100;
            int min = 1;
            if (device.spk == SPK.SensorLight)
            {
                //照明传感器
                min = 0;
                max =1200;
            }

@@ -1171,12 +1165,12 @@
                            key = "illuminance";
                            comparator = "<";
                        }
                        break;
                        break ;
                }
                selectedState = device.spk + "_" + value;
                AddDictionary(key, value, data_type, comparator);
                SaveInput(device,index, edit);
            },1,max);
            },min,max);
        }
        /// PM2.5,Co2,Tvoc设置值
        /// </summary>
@@ -1250,13 +1244,13 @@
            frame.AddChidren(loading);
            loading.Start();

            CommonMethod.Current.SunThread(() =>
            new System.Threading.Thread(() =>
            {
                try
                {
                    var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);

                    CommonMethod.Current.MainThread(() =>
                    Application.RunOnMainThread(() =>
                    {
                        loading.Hide();
                        string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
@@ -1266,27 +1260,30 @@
                         if (indexeList.Count > 0)
                         {
                             dicSateteList.Clear();
                             string s = string.Empty;
                             string userNameStr = string.Empty;
                             string seleUsrIdStr = string.Empty;  
                             string tag = string.Empty;
                             //数据封装
                             string[] arrayUserIds = new string[indexeList.Count];
                             //开门类型
                             AddDictionary("open_type", "1", "integer");
                             for (int i = 0; i < indexeList.Count; i++)
                             {

                                 if (i > faceIdList.Count)
                                 {
                                     continue;
                                 }
                                 var indexe = indexeList[i];
                                 var face = faceIdList[indexe];
                                 AddDictionary("user_id", face.userId, "string");
                                 s += face.userName;
                                 s += ",";
                                 tag += face.userId;
                                 tag += "_";
                                 userNameStr += face.userName;
                                 userNameStr += ",";
                                 arrayUserIds[i] = face.userId;
                             }
                             seleUsrIdStr = Newtonsoft.Json.JsonConvert.SerializeObject(arrayUserIds);
                             AddDictionary("user_id", seleUsrIdStr, "string", "[]");
                             //界面显示选中值
                             btnState.Text = s;
                             btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(userNameStr);
                             btnState.Tag = tag;
                         }

@@ -1302,78 +1299,11 @@
                    });
                }

            });
            })
            { IsBackground = true}.Start();

        }

        /// <summary>
        /// 萤石视频门锁专用
        /// </summary>
        /// <param name="frame">当前界面</param>
        /// <param name="device">当前设备</param>
        /// <param name="btnState">旧状态</param>
        public void VideoDoorLockAction(FrameLayout frame, Entity.Function device, Button btnState)
        {
            selectedState = device.spk + "_";
            Loading loading = new Loading();
            frame.AddChidren(loading);
            loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    var faceIdList = Send.Current.GetVideoDoorLockUserListInfo(device);
                    CommonMethod.Current.MainThread(() =>
                    {

                        loading.Hide();
                        string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
                        PublicInterface publicInterface = new PublicInterface();
                        publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
                        {
                            if (indexeList.Count > 0)
                            {
                                dicSateteList.Clear();
                                string seleTxet = string.Empty;
                                string tag = string.Empty;
                                string[] array = new string[indexeList.Count];

                                for (int i = 0; i < indexeList.Count; i++)
                                {
                                    if (i > faceIdList.Count)
                                    {
                                        continue;
                                    }
                                    var indexe = indexeList[i];
                                    var face = faceIdList[indexe];
                                    tag += face.userId;
                                    tag += "_";
                                    array[i] = face.userName;
                                }
                                seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
                                //数据封装<高胜说萤石那边是推送用户名>
                                AddDictionary("open_user",seleTxet, "string", "[]"); 
                                //界面显示选中值
                                btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(seleTxet);
                                btnState.Tag = tag;
                            }

                        });

                    });
                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        loading.Hide();
                    });
                }

            });

        }

        /// <summary>
        /// 时间方法
@@ -1448,12 +1378,6 @@
                    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;
            }
@@ -1579,7 +1503,7 @@
            {
                return false;
            }
            if (this.function.spk == SPK.VideoDoorLock ||
            if (
               this.function.spk == SPK.doorgate
                )
            {