合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 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;

@@ -13,20 +14,12 @@
        #region ■ 初始化_____________________________



        /// <summary>

        /// 分类界面的空气开关设备行控件

        /// </summary>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>

        public DeviceAirSwitchRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)

        {

        }



        /// <summary>

        /// 初始化控件

        /// </summary>

        /// <param name="i_device"></param>

        public override void InitControl(CommonDevice i_device)

        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)

        {

            base.InitControl(i_device);

            base.InitControl(i_device, i_nowSelectRoom);



            //添加跳转深度卡片信息事件

            this.AddDetailInfoEvent(i_device);

@@ -35,6 +28,14 @@
            var btnSwitch = this.AddSwitchControl();

            btnSwitch.ButtonClickEvent += (sender, e) =>

            {

                //如果住宅为虚拟住宅

                if (Common.Config.Instance.Home.IsVirtually == true)

                {

                    //直接变更缓存

                    ((LightBase)i_device).OnOffStatus = btnSwitch.IsSelected == true ? 0 : 1;

                    this.RefreshControlInfo(this.device);

                    return;

                }

                bool setStatu = !btnSwitch.IsSelected;

                //变更卡片状态

                this.SetRowOpenStatu(setStatu);

@@ -84,7 +85,8 @@


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

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

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

                form.RowOrCardControl = this;

                form.AddForm(i_device, this.nowSelectRoom, 965, backHeight);

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

            };

        }

@@ -112,10 +114,15 @@
        /// </summary>

        public override void SendStatuComand()

        {

            //如果住宅为虚拟住宅,此功能无效

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return;

            }

            //检测能否发送获取状态命令

            if (this.CheckCanSendStatuComand() == true)

            {

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

                HdlDeviceAttributeLogic.Current.SendLightStatuComand(this.device);

            }

        }