合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs

@@ -65,7 +65,7 @@
            X = Application.GetRealWidth(x);
            Y = Application.GetRealHeight(y);
            Width = Application.GetRealWidth(1022);
            Height = Application.GetRealHeight(127);
            Height = Application.GetRealHeight(127-2);
            //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
        }

@@ -141,7 +141,7 @@

            var line = new Button()
            {
                X = Application.GetRealWidth(200),
                X = Application.GetRealWidth(181),
                Y = Height - 1,
                Width = Application.GetRealWidth(821),
                Height = 1,
@@ -210,5 +210,16 @@
        {
            SwitchBtn.Visible = !statu;
        }

        /// <summary>
        /// SetDeviceIcon
        /// </summary>
        /// <param name="imagePath"></param>
        /// <param name="selectedImagePath"></param>
        public void SetDeviceIcon(string imagePath, string selectedImagePath)
        {
            ImageBtn.UnSelectedImagePath = imagePath;
            ImageBtn.SelectedImagePath = selectedImagePath;
        }
    }
}