Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -216,7 +216,6 @@
            //向右图标

            var btnRight = rowMenu.frameTable.AddMostRightEmptyIcon(58, 58);

            rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);

            btnRight.UseClickStatu = false;

            btnRight.UnSelectedImagePath = "Item/Next.png";

            btnRight.SelectedImagePath = "Item/Down.png";



@@ -369,6 +368,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 +615,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);

            });

        }



@@ -999,6 +1015,10 @@
            {

                //获取本地网关对象

                ZbGateway zbway = HdlGatewayLogic.Current.GetLocalGateway(zbGatewayId);

                if (zbway == null)

                {

                    return;

                }

                btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);

                if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)

                {