2019.1.7

gxc

2020-01-07 aed247d7fa4499665041864479fae82089eafe5f

 ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs

@@ -13,7 +13,7 @@
        /// <summary>
        /// The action.
        /// </summary>
        public Action action;
        public Action<DeviceUI, Common.Room> action;
        ///// <summary>
        ///// The top view.
        ///// </summary>
@@ -211,8 +211,8 @@
        {
            ZbGateway.StatusList.Remove(this);
            UserView.HomePage.Instance.ScrollEnabled = true;
            //action();
            //action = null;
            action(device, room);
            action = null;
            if (IsDrawerLockMode)
            {
                CommonPage.Instance.IsDrawerLockMode = false;
@@ -314,9 +314,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);
            };
        }

@@ -525,7 +525,10 @@
                Height = Application.GetMinReal(104),

                UnSelectedImagePath = "Item/ProgressBubbles.png",

                Visible = false,

                Gravity = Gravity.CenterHorizontal

                Gravity = Gravity.CenterHorizontal,

                TextSize = 14,
                IsBold = true,
                TextColor = ZigbeeColor.Current.GXCTextWhiteColor

            };

            layout.AddChidren(ProgressBtn);

        }