Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -83,10 +83,65 @@
            unSelectPic = "Device/DimmableLightOneLoad.png";
            this.AddMenuRow(objectText, unSelectPic, "DimmableLightOneLoadDirectionForm");

            //Zigbee智能开合帘电机
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId100);
            unSelectPic = "Device/CurtainAutoOpen.png";

            this.AddMenuRow(objectText, unSelectPic, "CurtainAutoOpenDirectionForm");



            //Zigbee智能管状电机

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId101);
            unSelectPic = "Device/CurtainSiphonate.png";
            this.AddMenuRow(objectText, unSelectPic, "CurtainSiphonateDirectionForm");



            //空调

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId3600);
            unSelectPic = "Device/AirConditionerZbGateway.png";
            this.AddMenuRow(objectText, unSelectPic, "AirConditionerZbGatewayDirectionForm");

            //智能门锁
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);
            unSelectPic = "Device/IntelligentLocksH06C.png";
            this.AddMenuRow(objectText, unSelectPic, "IntelligentLocksH06cDirectionForm");
            this.AddMenuRow(objectText, unSelectPic, "IntelligentLocksH06cDirectionForm");



            //PIR传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1200);
            unSelectPic = "Device/SensorPir.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorPirDirectionForm");



            //红外传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1303);
            unSelectPic = "Device/SensorInfrared.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorInfraredDirectionForm");



            //燃气传感器

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



            //烟雾传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1302);
            unSelectPic = "Device/SensorFire.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorFireDirectionForm");



            //水浸传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1304);
            unSelectPic = "Device/SensorWater.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorWaterDirectionForm");



            //门窗传感器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId1301);
            unSelectPic = "Device/SensorDoorWindow.png";
            this.AddMenuRow(objectText, unSelectPic, "SensorDoorWindowDirectionForm");



            //中继器

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId3900);
            unSelectPic = "Device/RepeaterZigbee.png";
            this.AddMenuRow(objectText, unSelectPic, "RepeaterZigbeeDirectionForm");



            //空气开关

            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceModelId4100);
            unSelectPic = "Device/AirSwitchCloudContr.png";
            this.AddMenuRow(objectText, unSelectPic, "AirSwitchCloudContrDirectionForm");

            //第三方设备
            objectText = Language.StringByID(R.MyInternationalizationString.uThirdPartyDevice);
@@ -99,12 +154,7 @@
            };

            //调整列表控件的高度
            var realHeight = listView.ChildrenCount * listView.GetChildren(listView.ChildrenCount - 1).Height + Application.GetRealHeight(23);
            if (realHeight < listView.Height)
            {
                //缩小控件高度
                listView.Height = realHeight;
            }
            listView.AdjustRealHeight(Application.GetRealHeight(23));
        }

        #endregion