新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

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

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

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

        /// <summary>
@@ -143,16 +143,6 @@
            objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName16);
            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);
@@ -261,11 +251,11 @@

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