2020-4-27-1

陈嘉乐

2020-04-27 18b93d511dc764b469d7c4a7e755f7274f89cdb4

 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs

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

using Shared.Phone.UserCenter;

using System;

using System.Collections.Generic;

using System.Text;

using ZigBee.Device;

@@ -27,6 +28,15 @@
            var btnSwitch = this.AddSwitchControl();

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

            {

                //如果住宅为虚拟住宅

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

                {

                    //直接变更缓存

                    ((Rollershade)i_device).WcdCurrentPositionLiftPercentage = btnSwitch.IsSelected == true ? 0 : 100;

                    this.RefreshControlInfo(this.device);

                    return;

                }



                bool setStatu = !btnSwitch.IsSelected;

                //变更卡片状态

                this.SetCardOpenStatu(setStatu);

@@ -60,13 +70,11 @@
            //深度卡片信息

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

            {

                var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();

                UserView.HomePage.Instance.AddChidren(rollerShadeControl);

                UserView.HomePage.Instance.PageIndex += 1;

                UserView.HomePage.Instance.ScrollEnabled = false;

                rollerShadeControl.IsDrawerLockMode = true;

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

                rollerShadeControl.action += this.CardDetailInfoBackEvent;

                Common.CommonPage.Instance.IsDrawerLockMode = true;

                //窗帘类型的深度卡片界面

                var form = new ControlForm.DeviceCurtainDetailCardForm();

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

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

            };

        }



@@ -81,7 +89,7 @@
        /// <returns></returns>

        public override bool CheckIsOpenStatu(CommonDevice i_device)

        {

            return ((Rollershade)i_device).WcdCurrentPositionLiftPercentage > 10;

            return ((Rollershade)i_device).WcdCurrentPositionLiftPercentage > 0;

        }



        #endregion

@@ -93,10 +101,15 @@
        /// </summary>

        public override void SendStatuComand()

        {

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

            {

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

                return;

            }

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

            if (this.CheckCanSendStatuComand() == true)

            {

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

                HdlDeviceAttributeLogic.Current.SendCurtainStatuComand(this.device);

            }

            if (((Rollershade)this.device).WcdType == -1)

            {