合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

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

@@ -36,7 +36,7 @@
            //初始化中部控件
            this.InitMiddleFrame();

            this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(HdlGatewayResourse.AppOldSelectGatewayId);
            this.zbGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId);
        }

        /// <summary>
@@ -144,6 +144,16 @@
            unSelectPic = "Device/IntelligentLocksH06C.png";
            this.AddMenuRow(objectText, unSelectPic, "IntelligentLocksH06cDirectionForm");

            //晾衣架
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName31);
            unSelectPic = "Device/Airer.png";
            this.AddMenuRow(objectText, unSelectPic, "AirerDirectionForm");

            //空气质量传感器
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName32);
            unSelectPic = "Device/AirQualitySensor.png";
            this.AddMenuRow(objectText, unSelectPic, "AirQualitySensorDirectionForm");

            //PIR传感器
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName17);
            unSelectPic = "Device/SensorPir.png";
@@ -244,18 +254,18 @@
        /// </summary>
        private string CheckGateway()
        {
            if (zbGateway != null && zbGateway.LinuxImageType == 11)
            if (HdlGatewayLogic.Current.IsMiniGateway(zbGateway) == true)
            {
                //mini夜灯只能限制加入16和设备
                this.ShowProgressBar();

                int statu = 0;
                //重新获取设备列表
                var listDevice = HdlDeviceCommonLogic.Current.GetDeviceListFromGateway(zbGateway.GwId, ref statu, true, ShowErrorMode.NO);
                var listDevice = Common.LocalDevice.Current.GetDeviceListFromGateway(zbGateway.GwId, ref statu, true, ShowErrorMode.NO);
                if (statu != 1)
                {
                    //如果
                    listDevice = HdlDeviceCommonLogic.Current.GetDeviceByGatewayID(zbGateway.GwId);
                    listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(zbGateway.GwId);
                }
                //检测mini网关的设备数
                var listMac = new HashSet<string>();