Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

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

@@ -247,7 +247,7 @@
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
                                        }
                                       

                                    }
                                    break;
                                case SPK.SensorUtrasonic:
@@ -307,12 +307,14 @@
                                    {
                                        string value = this.GetValue(dicList);
                                        inputView.btnState.Text = Language.StringByID(StringId.wuren);
                                        if (value == "fall") {
                                        if (value == "fall")
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.diedao);
                                        }
                                    }
                                    break;
                                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                                case SPK.SensorEnvironment:
                                case SPK.SensorEnvironmentHailin:
                                case SPK.SensorEnvironment2:
                                case SPK.SensorEnvironment3:
                                    {
@@ -376,7 +378,7 @@
                                case SPK.SensorTemperature:
                                    {

                                        string str =this.GetText(dicList, "temperature");
                                        string str = this.GetText(dicList, "temperature");
                                        inputView.btnState.Text = str;
                                    }
                                    break;
@@ -409,22 +411,51 @@
                                    break;
                                case SPK.VideoDoorLock:
                                    {
                                        string value = this.GetValue(dicList);
                                        inputView.btnState.Text = value;
                                        string s = string.Empty;
                                        string tag = string.Empty;
                                        for (int b = 0; b < dicList.Count; b++)
                                        {
                                            var dic = dicList[b];
                                            //var userId = dic["value"].ToString();
                                            //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
                                            //s += FaceItem.userName;
                                            //s += ",";
                                            //tag += FaceItem.userId;
                                            //tag += "_";
                                            var userName = dic["value"].ToString();
                                            s += userName;
                                            s += ",";
                                        }
                                        inputView.btnState.Text = s;
                                    }
                                    break;
                                case SPK.doorgate:
                                    {
                                        string s = string.Empty;
                                        if (inputCondition.identifier == "door_call_cloud_event")
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.shipintonghuahujiao);
                                            s = Language.StringByID(StringId.shipintonghuahujiao);
                                        }
                                        else
                                        {
                                            string userId = this.GetKeyValue("user_id",dicList);
                                            var FaceItem = this.GetFaceItem(userId, device.deviceId);
                                            inputView.btnState.Text = FaceItem.userName;
                                            for (int b = 0; b < dicList.Count; b++)
                                            {
                                                var dic = dicList[b];
                                                var key = dic["key"].ToString();
                                                if (key != "user_id")
                                                {
                                                    continue;
                                                }
                                                var userId = dic["value"].ToString();
                                                var FaceItem = this.GetFaceItem(userId, device.deviceId);
                                                s += FaceItem.userName;
                                                s += ",";


                                            }

                                        }
                                        inputView.btnState.Text = s;
                                    }
                                    break;
                                case SPK.IpCam_Imou:
@@ -433,7 +464,32 @@
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
                                        }
                                        

                                    }
                                    break;
                                case SPK.SensorPirHold:
                                    {
                                        string value = this.GetKeyValue("people_status", dicList);
                                        if (string.IsNullOrEmpty(value))
                                        {
                                            inputView.btnState.Text = inputCondition.hold_time + "s";
                                            break;

                                        }
                  
                                        inputView.btnState.Text = Language.StringByID(StringId.wuren);
                                        if (value == "true")
                                        {
                                            inputView.btnState.Text = Language.StringByID(StringId.youren);

                                        }
                                        if (!string.IsNullOrEmpty(inputCondition.hold_time) && int.Parse(inputCondition.hold_time) > 0)
                                        {

                                            inputView.btnState.Text += "持续" + inputCondition.hold_time + "s";
                                        }


                                    }
                                    break;
                            }
@@ -1499,7 +1555,7 @@
                //开关灯光
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                    //机械手
                //机械手
                case SPK.MechanicalArm:
                    {
                        foreach (var dic in dicList)
@@ -1949,6 +2005,7 @@
                        }
                    }
                    break;
              
                case SPK.SensorGas:
                case SPK.SensorSmoke:
                    {
@@ -2015,6 +2072,23 @@
                                button1.Text = Language.StringByID(StringId.wuren);
                            }
                        }
                    }
                    break;
                case SPK.SensorPirHold:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            if (value == "true")
                            {
                                button1.Text = Language.StringByID(StringId.youren);
                            }
                            else
                            {
                                button1.Text = Language.StringByID(StringId.wuren);
                            }
                        }

                    }
                    break;
                case SPK.SensorDoorWindow:
@@ -2139,11 +2213,23 @@
                    break;
                case SPK.VideoDoorLock:
                    {
                        foreach (var dic in dicList)
                        string s = string.Empty;
                        string tag = string.Empty;
                        for (int b = 0; b < dicList.Count; b++)
                        {
                            string value = dic["value"];
                            button1.Text = value;
                            var dic = dicList[b];
                            //var userId = dic["value"].ToString();
                            //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
                            //s += FaceItem.userName;
                            //s += ",";
                            //tag += FaceItem.userId;
                            //tag += "_";
                            var userName = dic["value"].ToString();
                            s += userName;
                            s += ",";
                        }
                        button1.Text = s;
                        button1.Tag = tag;
                    }
                    break;
                case SPK.MusicStandard:
@@ -2164,11 +2250,28 @@
                    break;
                case SPK.doorgate:
                    {
                        string value = this.GetKeyValue("user_id", dicList);
                        button2.Text = this.GetFaceItem(value, device.deviceId).userName;
                        string s = string.Empty;
                        string tag = string.Empty;
                        for (int b = 0; b < dicList.Count; b++)
                        {
                            var dic = dicList[b];
                            var key = dic["key"].ToString();
                            if (key != "user_id")
                            {
                                continue;
                            }
                            var userId = dic["value"].ToString();
                            var FaceItem = this.GetFaceItem(userId, device.deviceId);
                            s += FaceItem.userName;
                            s += ",";
                            tag += FaceItem.userId;
                            tag += "_";
                        }
                        button2.Text = s;
                        button2.Tag = tag;
                    }
                    break;
              

            }
        }
        /// <summary>
@@ -2635,7 +2738,7 @@
            }
        }
        /// <summary>
        /// 查找指定userId
        /// 查找指定可视对讲userId
        /// </summary>
        /// <param name="userId"></param>
        /// <returns></returns> 
@@ -2652,6 +2755,24 @@
            }
            return face;
        }
        /// <summary>
        /// 查找指定萤石视频门锁userId
        /// </summary>
        /// <param name="userId"></param>
        /// <returns></returns> 
        public Face GetVideoDoorLockUserItem(string userId, Function device)
        {
            if (Send.Current.VideoDoorLockUserListInfo.Count == 0)
            {
                Send.Current.GetVideoDoorLockUserListInfo(device);
            }
            var face = Send.Current.VideoDoorLockUserListInfo.Find((o) => { return o.userId == userId; });
            if (face == null)
            {
                face = new Face();
            }
            return face;
        }

    }
}