From 610a6a826a00d47320b17478cb5ca5f60abfa291 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 24 五月 2022 17:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs
index 0b9a0d1..290a07f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs
@@ -97,7 +97,7 @@
/// View鐨勬柟娉�
/// </summary>
/// <param name="frame">鐖舵帶浠�</param>
- /// <param name="i">鏄剧ず閫夋嫨View鏁伴噺</param>
+ /// <param name="i">琛ㄧずView鏁伴噺</param>
///<param name="stateVuale">涔嬪墠鐨勭姸鎬佸��</param>
/// <param name="action">杩斿洖鍥炶皟</param>
/// <returns></returns>
@@ -166,23 +166,30 @@
/// View鐨勬柟娉�
/// </summary>
/// <param name="frame">鐖舵帶浠�</param>
- /// <param name="text1">鐖舵帶浠�</param>
- /// <param name="text2">鏄剧ず閫夋嫨View鏁伴噺</param>
+ /// <param name="text1">绗竴涓娉�</param>
+ /// <param name="text2">绗簩涓娉�</param>
///<param name="stateVuale">涔嬪墠鐨勭姸鎬佸��</param>
+ /// <param name="i">琛ㄧずView鏁伴噺</param>
/// <param name="action">杩斿洖鍥炶皟</param>
/// <returns></returns>
- public void FLayoutView(FrameLayout frame, int text1, int text2, string stateVuale, Action<int> action,bool tag=true)
+ public void FLayoutView(FrameLayout frame, int text1, int text2, string stateVuale, int i, Action<int> action,bool tag=true)
{
- int i = 2;
frameLayout.Y = Application.GetRealHeight(603 - (44 * i));
frameLayout.Height = Application.GetRealHeight(44 * i);
frame.AddChidren(frameLayout);
frame.AddChidren(btnCancel);
btnOn.TextID = text1;
btnOff.TextID = text2;
- frameLayout.AddChidren(btnOn);
- frameLayout.AddChidren(btnLine);
- frameLayout.AddChidren(btnOff);
+ if (i == 1)
+ {
+ frameLayout.AddChidren(btnOn);
+ }
+ else if (i == 2)
+ {
+ frameLayout.AddChidren(btnOn);
+ frameLayout.AddChidren(btnLine);
+ frameLayout.AddChidren(btnOff);
+ }
//鍙栨秷鐐瑰嚮浜嬩欢
btnCancel.MouseUpEventHandler += (sender1, e1) =>
{
--
Gitblit v1.8.0