Merge branch 'wjc' into Dev-Branch

wxr

2022-12-07 b90d429e8b9a55f5ce56077754853a8cfed8b725

Merge branch 'wjc' into Dev-Branch

 HDL-ON_Android/Assets/Language.ini

@@ -1120,6 +1120,7 @@
7165=Area intrusion alarm
7166=camera
7167=main switch
7168=pm10



@@ -2344,6 +2345,7 @@
7165=区域入侵告警
7166=摄像头
7167=总控开关
7168=pm10




 HDL-ON_iOS/Resources/Language.ini

@@ -1120,6 +1120,8 @@
7165=Area intrusion alarm
7166=camera
7167=main switch
7168=pm10




@@ -2344,6 +2346,7 @@
7165=区域入侵告警
7166=摄像头
7167=总控开关
7168=pm10




 HDL_ON/Common/R.cs

@@ -3059,7 +3059,11 @@
        /// 总控开关
        /// </summary>
        public const int zongkogkaiguan = 7167;
        
        /// <summary>
        /// PM210
        /// </summary>
        public const int pm10= 7168;



        #region LE新增

 HDL_ON/Entity/Function/Function.cs

@@ -1682,6 +1682,10 @@

        #region 环境传感器
        /// <summary>
        /// （PM10传感器）
        /// </summary>
        public const string SensorPm10 = "sensor.pm10";
        /// <summary>
        /// （温度传感器）
        /// </summary>
        public const string SensorTemperature = "sensor.temperature";

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

@@ -466,6 +466,21 @@
                        };
                    }
                    break;
                //pm210
                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:
                    {

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

@@ -386,6 +386,7 @@

                                    }
                                    break;
                                case SPK.SensorPm10:
                                case SPK.SensorCO2:
                                case SPK.SensorPm25:
                                case SPK.SensorTVOC:

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

@@ -187,7 +187,7 @@
            var list2 = this.GetVideoDeviceList();
            list.AddRange(list1);
            list.AddRange(list2);
            GetTestDevice(ref list, true);
            //GetTestDevice(ref list, true);
            return list;
        }
        /// <summary>
@@ -349,13 +349,16 @@
        /// </summary>
        /// <param name="device">设备</param>
        /// <returns></returns>
        public string GetDeviceIconPath(Function device)  
        public string GetDeviceIconPath(Function device)
        {

            if (SPK.MusicStandard == device.spk
                || SPK.AvMusic == device.spk)
            {
                return "MusicIcon/localMusic.png";
            }
            else if (SPK.SensorPm10 == device.spk)
            {
                return "LogicIcon/sensor.png";
            }
            //LogicIcon/heatlogic.png"
            return $"FunctionIcon/Icon/{device.IconName}.png";
@@ -552,6 +555,7 @@
                        || device.spk == SPK.SensorTVOC
                          || device.spk == SPK.SensorHcho
                          || device.spk == SPK.SensorHelp
                          || device.spk == SPK.SensorPm10
            );
            if (sensor != null)
            {
@@ -673,6 +677,7 @@
                functionTypeList.Add(SPK.SensorTVOC);
                functionTypeList.Add(SPK.SensorHcho);
                functionTypeList.Add(SPK.SensorHelp);
                functionTypeList.Add(SPK.SensorPm10);


            }
@@ -763,6 +768,7 @@
                functionTypeList.Add(SPK.doorgate);
                functionTypeList.Add(SPK.MechanicalArm);
                functionTypeList.Add(SPK.IpCam_Imou);
                functionTypeList.Add(SPK.SensorPm10);

            }

@@ -821,6 +827,7 @@
                        deviceTypeList.Add(SPK.DoorLock);
                        deviceTypeList.Add(SPK.doorgate);
                        deviceTypeList.Add(SPK.IpCam_Imou);
                        deviceTypeList.Add(SPK.SensorPm10);

                    }
                    break;
@@ -1164,7 +1171,7 @@
                 //  new Entity.Function { sid = "1234567892", name = "湿度传感器", spk = Entity.SPK.SensorHumidity },
                    new Entity.Function { sid = "12345678933456", name = "调光灯", spk = Entity.SPK.LightDimming },
                      new Entity.Function { sid = "1234567895444", name = "面板", spk = Entity.SPK.PanelSocket },
                      //new Entity.Function { sid = "1234567896", name = "毫米波传感器", spk = Entity.SPK.SenesorMegahealth },
                      new Entity.Function { sid = "12345678968888", name = "pm10", spk = Entity.SPK.SensorPm10 },
                      //  new Entity.Function { sid = "1234567897", name = "毫米波传感器1", spk = Entity.SPK.SenesorMegahealth2 },
                      // new Entity.Function { sid = "1234567899", name = "门磁传感器", spk = Entity.SPK.SensorDoorWindow },
                      //  new Entity.Function { sid = "12345678991234", name = "HDL机械手", spk = Entity.SPK.MechanicalArm },