2020.1.10

gxc

2020-01-10 b9cb076fe6127160c96c35bf9c8cebcffe1d5ccd

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

old mode 100755
new mode 100644
@@ -13,7 +13,7 @@
        /// <summary>
        /// The action.
        /// </summary>
        public Action action;
        public Action<DeviceUI,Common.Room> action;

        /// <summary>
        /// 收藏按钮
@@ -218,8 +218,8 @@
        /// Changeds the IS cene status.
        /// </summary>
        /// <param name="scene">Scene.</param>
        public void ChangedISceneStatus(Scene scene)

        {

        public void ChangedISceneStatus(Scene scene)
        {
            //throw new NotImplementedException();
        }
        #endregion
@@ -246,8 +246,8 @@
        {
            UserView.HomePage.Instance.ScrollEnabled = true;
            ZigBee.Device.ZbGateway.StatusList.Remove(this);
            //action();
            //action = null;
            action(device,room);
            action = null;
            RemoveUpdateControlDeviceStatuAction();
            if (IsDrawerLockMode)
            {
@@ -298,8 +298,7 @@
                }
            }

            var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
            if (de == null)
            if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
            {
                collectionBtn.IsSelected = false;
            }
@@ -654,9 +653,9 @@
            UserView.HomePage.Instance.AddChidren(detailInfo);
            UserView.HomePage.Instance.PageIndex += 1;
            detailInfo.Show(device, room);
            detailInfo.EditAction = (d,r) =>
            detailInfo.EditAction += (curDev,curRoom) =>
            {
                Show(device, room);
                Show(curDev, curRoom);
            };
        }

@@ -803,13 +802,13 @@
            layout.AddChidren(ProgressBtn);
        }

        /// <summary>
        /// OnProgressButtonMove
        /// </summary>
        private void OnProgressButtonMove(int mProgress)
        {
            ProgressBtn.Y = ProgressBtnY + curtainRollSeekBar.NowProgressY;
            ProgressBtn.Text = mProgress + "%";
        /// <summary>

        /// OnProgressButtonMove

        /// </summary>

        private void OnProgressButtonMove(int mProgress)

        {

            ProgressBtn.Y = ProgressBtnY + curtainRollSeekBar.NowProgressY;

            ProgressBtn.Text = mProgress + "%";

        }


@@ -834,13 +833,13 @@
            layout.AddChidren(ProgressBtn);
        }

        /// <summary>
        /// OnProgressButtonMove
        /// </summary>
        private void OnProgressButtonMoveForCurtain(int mProgress)
        {
            ProgressBtn.X = ProgressBtnX + curtainSeekBar.NowProgressX- Application.GetMinReal(5);
            ProgressBtn.Text = mProgress + "%";
        /// <summary>

        /// OnProgressButtonMove

        /// </summary>

        private void OnProgressButtonMoveForCurtain(int mProgress)

        {

            ProgressBtn.X = ProgressBtnX + curtainSeekBar.NowProgressX- Application.GetMinReal(5);

            ProgressBtn.Text = mProgress + "%";

        }

        #endregion