Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

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

@@ -147,6 +147,7 @@
            geBtn.Width = geBtn.GetTextWidth();
            devfLayout.AddChidren(sumBtn);
            sumBtn.X = geBtn.Right;
            sumBtn.TextAlignment = TextAlignment.CenterLeft;
            devfLayout.AddChidren(stateIconBtn);
            devfLayout.AddChidren(stateTextBtn);
            devfLayout.AddChidren(lineBtn);