合并乐橙代码

wei

2021-07-06 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5

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

@@ -322,8 +322,6 @@
            #endregion

            new TopViewDiv(bodyView, Language.StringByID(StringId.PJT)).LoadTopView_FunctionTop(device, actionRefresh);
            DriverLayer.Control.Ins.SendReadCommand(device);

            LoadEventList();

        }
@@ -344,8 +342,8 @@

            var bodyView = new FrameLayout()
            {
                Y = Application.GetRealHeight(427),//667
                Height = Application.GetRealHeight(240),
                Y = Application.GetRealHeight(417),//667
                Height = Application.GetRealHeight(250),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            div.AddChidren(bodyView);
@@ -355,6 +353,7 @@
                Y = Application.GetRealHeight(16),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(296 + 200),
                Height = Application.GetRealHeight(234),
            };
            bodyView.AddChidren(contentView);

@@ -503,9 +502,6 @@

            dialog.Show();
        }



        
        /// <summary>
        /// 加载事件列表