Merge branch 'WJC' into temp-wxr

wxr

2021-03-26 311aa775e05f567795e9cc131c67310b3bb133aa

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs

@@ -10,7 +10,7 @@
        public FrameLayout frameLayout = new FrameLayout
        {
            X = Application.GetRealWidth(16),
            Y = Application.GetRealHeight(12),
            //Y = Application.GetRealHeight(12),
            Width = Application.GetRealWidth(343),
            Height = Application.GetRealHeight(102),
            BackgroundColor = CSS.CSS_Color.view,
@@ -48,8 +48,8 @@
        /// </summary>
        public Button btnStateIcon = new Button
        {
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            Y = Application.GetRealHeight(8),
            X = Application.GetRealWidth(TextSize.left12),

@@ -60,8 +60,8 @@
        public Button btnLienIcon = new Button
        {

            Width = Application.GetMinRealAverage(20),
            Height = Application.GetMinRealAverage(20),
            Width = Application.GetRealWidth(20),
            Height = Application.GetRealWidth(20),
            Y = Application.GetRealHeight(66),
            X = Application.GetRealWidth(48),

@@ -72,13 +72,22 @@
        /// </summary>
        public Button btnSwitchIcon = new Button
        {
            Width = Application.GetMinRealAverage(36),
            Height = Application.GetMinRealAverage(36),
            Width = Application.GetRealWidth(36),
            Height = Application.GetRealWidth(36),
            Y = Application.GetRealHeight(58),
            X = Application.GetRealWidth(295),
            UnSelectedImagePath = "LogicIcon/off.png",
            SelectedImagePath = "LogicIcon/on.png",

    };
        };
        /// <summary>
        /// 点击事件
        /// </summary>
        public Button btnclick= new Button
        {
            Width = Application.GetRealWidth(343),
            Height = Application.GetRealHeight(102),
        };

        /// <summary>
        /// View的方法
@@ -90,6 +99,7 @@
            frameLayout.AddChidren(btnWeekText);
            frameLayout.AddChidren(btnStateIcon);
            frameLayout.AddChidren(btnLienIcon);
            frameLayout.AddChidren(btnclick);
            frameLayout.AddChidren(btnSwitchIcon);
            return frameLayout;
        }