From 42fad29b1e280b512452f5552d1e9ce98474252e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 09:40:14 +0800
Subject: [PATCH] 2021-05-17 1.在阿廖分支基础上增加iOS乐橙可视对讲功能，目前呼叫还有一点问题，偶尔会闪退，目前还没定位到原因
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
index 1672a9f..00a669b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 鏈�涓婇潰鍧梀iew
/// </summary>
- public FrameLayout fLayout = new FrameLayout
+ public FrameLayout frameLayout = new FrameLayout
{
BackgroundColor = CSS.CSS_Color.viewTop,
Height = Application.GetRealHeight(64),
@@ -33,7 +33,7 @@
public Button backBtn = new Button
{
Width = Application.GetRealWidth(12),
- Height = Application.GetRealHeight(20),
+ Height = Application.GetRealWidth(20),
X = Application.GetRealWidth(TextSize.left16),
Y = Application.GetRealHeight(32),
UnSelectedImagePath = "LogicIcon/back.png",
@@ -44,10 +44,10 @@
/// </summary>
public Button setBtn = new Button
{
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(28),
X = Application.GetRealWidth(337),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
UnSelectedImagePath = "LogicIcon/set.png",
Visible = false,
};
@@ -62,11 +62,11 @@
/// <summary>
/// 璁剧疆鍥炬爣澧炲姞鐑敭澶у皬
/// </summary>
- public Button clickSetBtn = new Button
+ public Button clickSetBtn = new Button
{
X = Application.GetRealWidth(337 - 37),
- Width = Application.GetMinRealAverage(28 + 37),
- Height = Application.GetMinRealAverage(28 + 7 + 29),
+ Width = Application.GetRealWidth(28 + 37),
+ Height = Application.GetRealWidth(28 + 7 + 29),
};
/// <summary>
/// 鏈�涓婇潰鐨勯偅鍧楁柟娉�
@@ -74,12 +74,12 @@
/// <returns></returns>
public FrameLayout FLayoutView()
{
- fLayout.AddChidren(topNameBtn);
- fLayout.AddChidren(backBtn);
- fLayout.AddChidren(setBtn);
- fLayout.AddChidren(clickBackBtn);
- fLayout.AddChidren(clickSetBtn);
- return fLayout;
+ frameLayout.AddChidren(topNameBtn);
+ frameLayout.AddChidren(backBtn);
+ frameLayout.AddChidren(setBtn);
+ frameLayout.AddChidren(clickBackBtn);
+ frameLayout.AddChidren(clickSetBtn);
+ return frameLayout;
}
#endregion
}
--
Gitblit v1.8.0