From 90fadf3023d54d780154eaa2a839e2106317297f Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 05 七月 2021 13:38:59 +0800
Subject: [PATCH] 代码合并整理
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
index a79324c..a36dc65 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
@@ -72,6 +72,7 @@
/// </summary>
/// <returns></returns>
public void FLayoutView(FrameLayout fLayout)
+ //public void FLayoutView(FrameLayout fLayout, string currState, Action<string> action)
{
fLayout.AddChidren(frameLayout);
@@ -79,6 +80,7 @@
frameLayout.AddChidren(btnCancel);
frameLayout.AddChidren(btnConfirm);
frameLayout.AddChidren(btnLine);
+ //TimePoint(fLayout, action,currState);
}
/// <summary>
/// 閫変腑鏃堕棿鐨勬柟娉�
@@ -240,32 +242,6 @@
{
//娣诲姞鏁版嵁
mList.Add(i.ToString() + " " + Language.StringByID(StringId.m));
- }
-
- }
-
- return mList;
- }
- /// <summary>
- /// 鑾峰彇60绉掑垪琛�
- /// </summary>
- /// <returns></returns>
- public List<string> GetsStringList()
- {
- //鍒濆鍖栧垪琛�
- var mList = new List<string>();
- for (int i = 0; i < 60; i++)
- {
- if (i < 10)
- {
- var a = "0" + i.ToString();
- //娣诲姞鏁版嵁
- mList.Add(a + " " + Language.StringByID(StringId.s));
- }
- else
- {
- //娣诲姞鏁版嵁
- mList.Add(i.ToString() + " " + Language.StringByID(StringId.s));
}
}
--
Gitblit v1.8.0