Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs

@@ -152,6 +152,11 @@
            unSelectPic = "Device/SensorCarbonMonoxide.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorCarbonMonoxideDirectionForm");



            //吸顶燃气传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName26);
            unSelectPic = "Device/SensorCarbonMonoxide.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorCeilingGasDirectionForm");



            //烟雾传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName20);
            unSelectPic = "Device/SensorFire.png";
@@ -171,6 +176,11 @@
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName23);
            unSelectPic = "Device/SensorTemperatureHumidity.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorTemperatureHumidityForm");


            //PM2.5空气质量传感器
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName27);
            unSelectPic = "Device/SensorPMTwoPointFive.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorPMTwoPointFiveForm");


            //PM2.5空气质量传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName26);