Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

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

@@ -48,7 +48,7 @@
            X = Application.GetRealWidth(337),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            UnSelectedImagePath = "PirIcon/adddevice.png",
            UnSelectedImagePath = "LogicIcon/set.png",
            Visible = false,
        };
        /// <summary>