From 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:48:35 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
index 7b051bd..5873fdd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs
+++ b/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);
@@ -504,9 +503,6 @@
dialog.Show();
}
-
-
-
/// <summary>
/// 鍔犺浇浜嬩欢鍒楄〃
/// </summary>
--
Gitblit v1.8.0