2019-10-31-1

WJC

2019-10-31 d7ad5a3953a8cd001659092ebde204b881f94b9d

 ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs

@@ -107,21 +107,29 @@
                        {
                            return;
                        }
                        if ((common as Rollershade).DeviceStatusReport.CluterID == 258)
                        if (common.DeviceStatusReport.CluterID == 258)
                        {
                            if ((common as Rollershade).DeviceStatusReport.AttriBute[0].AttributeId == 8)
                            if (common.DeviceStatusReport.AttriBute[0].AttributeId == 8)
                            {
                                //窗帘百分比
                                var rollerShade = deviceUI.CommonDevice as Rollershade;
                                rollerShade.DeviceStatusReport = (common as Rollershade).DeviceStatusReport;
                                rollerShade.WcdCurrentPositionLiftPercentage = (common as Rollershade).DeviceStatusReport.AttriBute[0].AttriButeData;
                                rollerShade.DeviceStatusReport = common.DeviceStatusReport;
                                rollerShade.WcdCurrentPositionLiftPercentage = common.DeviceStatusReport.AttriBute[0].AttriButeData;
                                SeekBar.Progress = rollerShade.WcdCurrentPositionLiftPercentage;
                                seekBarTitle.Text = $"{SeekBar.Progress} %";
                                rollerShade.LastDateTime = DateTime.Now;
                            }
                            else if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
                            {
                                //窗帘类型
                                var rollerShade = deviceUI.CommonDevice as Rollershade;
                                rollerShade.DeviceStatusReport = common.DeviceStatusReport;
                                rollerShade.WcdType = common.DeviceStatusReport.AttriBute[0].AttriButeData;
                                rollerShade.LastDateTime = DateTime.Now;
                            }
                        }
                        //***新改***设备状态上报中，当CluterID=3,证明设备在线，直接标记
                        else if ((common as Rollershade).DeviceStatusReport.CluterID == 3)
                        else if (common.DeviceStatusReport.CluterID == 3)
                        {
                            var rollerShade = deviceUI.CommonDevice as Rollershade;
                            rollerShade.IsOnline = 1;
@@ -153,7 +161,7 @@
                            return;
                        }
                        var rollerShade = deviceUI.CommonDevice as Rollershade;
                        rollerShade.IsOnline = (common as Rollershade).IsOnline;
                        rollerShade.IsOnline = common.IsOnline;
                        rollerShadeIMG.IsSelected = rollerShade.IsOnline == 1;
                        rollerShade.LastDateTime = DateTime.Now;
                    }
@@ -205,6 +213,7 @@
            UserView.HomePage.Instance.ScrollEnabled = true;
            ZigBee.Device.ZbGateway.StatusList.Remove(this);
            action();
            action = null;
            RemoveUpdateControlDeviceStatuAction();
            base.RemoveFromParent();
        }
@@ -433,7 +442,52 @@
            {
                collectionBtn.IsSelected = true;
            }

            if (rollerShade.WcdType == -1)
            {
                CommonPage.Loading.Start();
                new System.Threading.Thread(() =>
                {
                    ZigBee.Device.Rollershade.ReadWcdTypeAction(rollerShade, () =>
                    {
                        Application.RunOnMainThread(() =>
                        {
                            if (rollerShade.WcdType == 0)
                            {
                                downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png";
                                downBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png";
                                upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png";
                                upBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png";
                            }
                            else
                            {
                                downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png";
                                downBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png";
                                upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png";
                                upBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png";
                            }
                            CommonPage.Loading.Hide();
                        });
                    });
                })
                { IsBackground = true }.Start();
            }
            else if(rollerShade.WcdType == 0)
            {
                downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png";
                downBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png";
                upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png";
                upBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png";
            }
            else
            {
                downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png";
                downBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png";
                upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png";
                upBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png";
            }
            #endregion


            BindEvent();
        }
@@ -630,7 +684,6 @@
                Shared.Common.Room.Lists[0].AddDevice(device.FileName);
                collectionBtn.IsSelected = true;
            }
            action?.Invoke();
        }

        #endregion