From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 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 e199ffc..a79324c 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs @@ -72,7 +72,6 @@ /// </summary> /// <returns></returns> public void FLayoutView(FrameLayout fLayout) - //public void FLayoutView(FrameLayout fLayout, string currState, Action<string> action) { fLayout.AddChidren(frameLayout); @@ -80,7 +79,6 @@ frameLayout.AddChidren(btnCancel); frameLayout.AddChidren(btnConfirm); frameLayout.AddChidren(btnLine); - //TimePoint(fLayout, action,currState); } /// <summary> /// 閫変腑鏃堕棿鐨勬柟娉� @@ -203,7 +201,7 @@ { //鍒濆鍖栧垪琛� var hList = new List<string>(); - for (int i = 0; i < 23; i++) + for (int i = 0; i < 24; i++) { if (i < 10) { @@ -248,6 +246,32 @@ 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)); + } + + } + + return mList; + } /// <summary> /// 鑾峰彇023灏忔椂鍒楄〃 -- Gitblit v1.8.0