合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs

@@ -370,6 +370,23 @@
                var form = new DeviceMacInfoEditorForm();

                form.AddForm(device.DeviceAddr);

            }

            else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A窗帘)

            {

                var form = new DeviceMacInfoEditorForm();

                form.AddForm(device.DeviceAddr);

            }

            //pir传感器

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_Pir)

            {

                var form = new DevicePirSensor.PirSensorBindTargetSettionForm();

                form.AddForm((IASZone)device);

            }

            //中央空调

            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.AirConditioner_ZbGateway)

            {

                var form = new DeviceAirConditioner.IndoorUnitSettionForm();

                form.AddForm((AC)device);

            }

            //面板设备

            else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板)

            {

@@ -599,11 +616,11 @@
                return;

            }

            string gwId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //这里主要只是获取在线状态

                var zbway = HdlGatewayLogic.Current.GetLocalGateway(gwId);

                var result = await Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

                var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);

            });

        }