Merge branch 'wxr6' into temp-wxr

wxr

2021-06-23 197faa202beea7bc6723b24d3bc1de2d5fa48844

 HDL_ON/UI/UI2/FuntionControlView/Electrical/IrLearnPage.cs

@@ -45,7 +45,6 @@

            var row = new FrameLayout()
            {
                //Width = Application.GetRealWidth(200),
                Height = Application.GetRealHeight(56),
            };
            contentView.AddChidren(row);
@@ -53,11 +52,10 @@
            int index = 0;
            foreach(var attr in device.attributes)
            {
                if(index != 0 && index%3==0)
                if (index != 0 && index % 3 == 0)
                {
                    row = new FrameLayout()
                    {
                        Width = Application.GetRealWidth(200),
                        Height = Application.GetRealHeight(56),
                    };
                    contentView.AddChidren(row);