请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -29,7 +29,7 @@
            {

                bool setStatu = !btnSwitch.IsSelected;

                //变更卡片状态

                this.SetCardStatu(setStatu);

                this.SetCardOpenStatu(setStatu);

                //检测是否获取网关反馈的结果,如果网关没有回复,则会弹出消息

                this.StartCheckResponeResult(!setStatu);



@@ -61,13 +61,10 @@
            this.ButtonClickEvent += (sender, e) =>

            {

                Common.CommonPage.Instance.IsDrawerLockMode = true;

                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;

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

                var form = new ControlForm.DeviceCurtainDetailCardForm();

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

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

            };

        }



@@ -82,7 +79,7 @@
        /// <returns></returns>

        public override bool CheckIsOpenStatu(CommonDevice i_device)

        {

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

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

        }



        #endregion

@@ -92,10 +89,18 @@
        /// <summary>

        /// 发送获取状态命令

        /// </summary>

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

        public override void SendStatuComand(CommonDevice i_device)

        public override void SendStatuComand()

        {

            Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(i_device);

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

            if (this.CheckCanSendStatuComand() == true)

            {

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

            }

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

            {

                //读取窗帘类型

                ((Rollershade)this.device).ReadWcdType();

            }

        }



        #endregion