Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

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

old mode 100755
new mode 100644
@@ -191,8 +191,8 @@
        {
            ZbGateway.StatusList.Remove(this);
            UserView.HomePage.Instance.ScrollEnabled = true;
            action();
            action = null;
            //action();
            //action = null;
            base.RemoveFromParent();
        }

@@ -269,16 +269,6 @@
            {
                RemoveFromParent();
            };

            var sharedBtn = new Button
            {
                X = Application.GetRealWidth(850),
                Width = Application.GetMinReal(69),
                Height = Application.GetMinReal(69),
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Shared.png"
            };
            top.topView.AddChidren(sharedBtn);

            var moreBtn = new Button
            {