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/FuntionControlView/FunctionBaseInfoSetPage.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index cae1f2d..ed8ba3b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -36,7 +36,7 @@
Action actionRefresh;
#endregion
- public FunctionBaseInfoSetPage(Function func,Action action)
+ public FunctionBaseInfoSetPage(Function func, Action action)
{
bodyView = this;
function = func;
@@ -72,8 +72,8 @@
btnFunctionName = new Button()
{
- X = Application.GetRealWidth(186),
- Width = Application.GetRealWidth(137),
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
@@ -125,8 +125,8 @@
btnLocationValues = new Button()
{
- X = Application.GetRealWidth(186),
- Width = Application.GetRealWidth(137),
+ X = Application.GetRealWidth(86),
+ Width = Application.GetRealWidth(237),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
@@ -196,6 +196,7 @@
// });
#endregion
+#if stage2
#region 娣诲姞鍒版闈�
var addToDesktopView = new FrameLayout()
{
@@ -227,7 +228,7 @@
addToDesktopView.AddChidren(btnAddToDesktopRight);
#endregion
-
+#endif
LoadEventList();
}
--
Gitblit v1.8.0