Merge branch 'WJC' into temp-wxr

wxr

2021-03-19 355bf4219bcd33f2178ed3b1aa54e0af71905fdf

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs

@@ -84,8 +84,7 @@
        public Button sumBtn = new Button
        {
            Y = Application.GetRealHeight(59),

            Width = Application.GetRealWidth(20),
            Width = Application.GetRealWidth(50),
            Height = Application.GetRealHeight(17),
            Text = "/10",
            TextAlignment = TextAlignment.CenterLeft,
@@ -102,8 +101,8 @@
            X = Application.GetRealWidth(291),
            Width = Application.GetRealWidth(8),
            Height = Application.GetRealWidth(8),
            UnSelectedImagePath = "PirIcon/online.png",
            SelectedImagePath = "PirIcon/offline.png",
            UnSelectedImagePath ="PirIcon/offline.png",
            SelectedImagePath = "PirIcon/online.png",
        };

        /// <summary>
@@ -118,8 +117,8 @@
            TextID = StringId.zaixianhwb,
            TextAlignment = TextAlignment.CenterLeft,
            TextSize = TextSize.text12,
            TextColor = 0xFF67D569,// CSS.CSS_Color.textColor,
            SelectedTextColor = CSS.CSS_Color.textRedColor,
            TextColor = CSS.CSS_Color.textRedColor,// CSS.CSS_Color.textColor,
            SelectedTextColor = 0xFF67D569,
            IsBold = true,
        };
        /// <summary>