Merge branch 'CJL' into temp-wxr

wxr

2021-04-01 0c0a436a30bc24d4cd470eea7ba980ee418018ff

 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);