Merge branch 'hxb-test' into wxr7-ez

wxr

2021-07-16 c8dfa6df784741900a4c06918929d3db3c876234

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

@@ -82,7 +82,7 @@
        public Button stateIconBtn = new Button
        {
            Y = Application.GetRealHeight(23),
            X = Application.GetRealWidth(291),
            X = Application.GetRealWidth(291-5),
            Width = Application.GetRealWidth(8),
            Height = Application.GetRealWidth(8),
            UnSelectedImagePath ="PirIcon/offline.png",
@@ -95,8 +95,8 @@
        public Button stateTextBtn = new Button
        {
            Y = Application.GetRealHeight(18),
            X = Application.GetRealWidth(303),
            Width = Application.GetRealWidth(30),
            X = Application.GetRealWidth(303-5),
            Width = Application.GetRealWidth(30+5),
            Height = Application.GetRealHeight(17),
            TextID = StringId.zaixianhwb,
            TextAlignment = TextAlignment.CenterLeft,