2020-4-27-1

陈嘉乐

2020-04-27 18b93d511dc764b469d7c4a7e755f7274f89cdb4

 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs

@@ -1,4 +1,5 @@
using System;

using Shared.Phone.UserCenter;

using System;

using System.Collections.Generic;

using System.Text;

using ZigBee.Device;

@@ -68,11 +69,24 @@
            //深度卡片信息

            this.frameTable.ButtonClickEvent += (sender, e) =>

            {

                var lightControl = new Device.Light.AirSwitchControl();

                UserView.HomePage.Instance.AddChidren(lightControl);

                UserView.HomePage.Instance.PageIndex += 1;

                lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);

                lightControl.action += this.CardDetailInfoBackEvent;

                int backHeight = 0;

                if (i_device.DfunctionType == DeviceFunctionType.A开关)

                {

                    backHeight = 1290;

                }

                else if (i_device.DfunctionType == DeviceFunctionType.A插座)

                {

                    backHeight = 1290;

                }

                else

                {

                    backHeight = 1316;

                }



                //继电器类型的深度卡片界面(含空气开关)

                var form = new MainPage.ControlForm.DeviceRelayDetailCardForm();

                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

            };

        }



@@ -102,7 +116,7 @@
            //检测能否发送获取状态命令

            if (this.CheckCanSendStatuComand() == true)

            {

                Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendLightStatuComand(this.device);

                HdlDeviceAttributeLogic.Current.SendLightStatuComand(this.device);

            }

        }