From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs |  145 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 113 insertions(+), 32 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
old mode 100755
new mode 100644
index 0dce8c7..a79324c
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
@@ -81,6 +81,92 @@
             frameLayout.AddChidren(btnLine);
         }
         /// <summary>
+        /// 閫変腑鏃堕棿鐨勬柟娉�
+        /// </summary>
+        /// <param name="fLayout">鐖舵帶浠�</param>
+        /// <param name="currState">涔嬪墠鐘舵�佸��</param>
+        /// <param name="action">杩斿洖鏃堕棿鍊�</param>
+        public void TimePoint(FrameLayout fLayout, string currState, Action<string> action)
+        {
+            //鍙栨秷鐐瑰嚮浜嬩欢
+            btnCancel.MouseUpEventHandler += (sender, e1) =>
+            {
+                //绉婚櫎fLayout鐣岄潰
+                fLayout.RemoveFromParent();
+            };
+            //鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
+            mUIPickerView.setNPicker(GethStringList(), GetmStringList(), null);
+            var systemHour = DateTime.Now.Hour; //鑾峰彇灏忔椂
+            var systeMinute = DateTime.Now.Minute;//鑾峰彇鍒嗛挓
+            int systemHourIndex = 0;
+            int systeMinuteIndex = 0;
+            for (int i = 0; i < GethIntList().Count; i++)
+            {
+                var currhour = GethIntList()[i];
+                if (systemHour == currhour)
+                {
+                    systemHourIndex = i;
+                    break;
+                }
+            }
+            for (int i = 0; i < GetmIntList().Count; i++)
+            {
+                var currminute = GetmIntList()[i];
+                if (systeMinute == currminute)
+                {
+                    systeMinuteIndex = i;
+                    break;
+                }
+            }
+
+            //榛樿鍒濆閫変腑鐘舵��
+            mUIPickerView.setCurrentItems(systemHourIndex, systeMinuteIndex, 0);
+            string currH = "";
+            string currM = "";
+            if (systemHour < 10)
+            {
+                currH = "0" + systemHour.ToString();
+            }
+            else
+            {
+                currH = systemHour.ToString();
+            }
+            if (systeMinute < 10)
+            {
+                currM = "0" + systeMinute.ToString();
+            }
+            else
+            {
+                currM = systeMinute.ToString();
+            }
+            //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
+            string timepoint = currH + ":" + currM;
+            if (currState != "")
+            {
+                int hIndex = GetValueIndex(currState, 0, 1, GethIntList());
+                int mIndex = GetValueIndex(currState, 1, 0, GetmIntList());
+                //鏇存柊鍒濆鐘舵��
+                mUIPickerView.setCurrentItems(hIndex, mIndex, 0);
+                timepoint = currState;
+            }
+
+            //閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
+            mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) =>
+            {
+                string hour = GethStringList()[index1].Split(' ')[0];
+                string minuet = GetmStringList()[index2].Split(' ')[0];
+                timepoint = hour + ":" + minuet;
+            };
+            //纭畾鐐瑰嚮浜嬩欢
+            btnConfirm.MouseUpEventHandler += (sender, e3) =>
+            {
+                action(timepoint);
+                //绉婚櫎fLayout鐣岄潰
+                fLayout.RemoveFromParent();
+
+            };
+        }
+        /// <summary>
         /// 鑾峰彇1-24灏忔椂鍒楄〃
         /// </summary>
         /// <returns></returns>
@@ -115,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)
                 {
@@ -160,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灏忔椂鍒楄〃
@@ -195,37 +307,6 @@
             return mList;
         }
        
-        /// <summary>
-        /// 杩斿洖鎸囧畾鍗曚綅鍒楄〃
-        /// </summary>
-        /// <param name="min">鏈�灏忓��</param>
-        /// <param name="max">鏈�澶у��</param>
-        /// <param name="name">鍗曚綅(鏃讹紝鍒嗭紝绉�)</param>
-        /// <param name="digit">浣嶆暟(10浠ヤ笅鐢�(1浣嶈繕鏄�2浣�)鏄剧ず)</param>
-        /// <returns></returns>
-        public List<string> GetStringList(int min, int max, string name, int digit)
-        {
-            //鍒濆鍖栧垪琛�
-            var list = new List<string>();
-
-            for (int i = min; i < max; i++)
-            {
-                if (i < 10 && digit == 2)
-                {
-                    var a = "0" + i.ToString();
-                    //娣诲姞鏁版嵁
-                    list.Add(a + " " + name);
-                }
-                else
-                {
-                    //娣诲姞鏁版嵁
-                    list.Add(i.ToString() + " " + name);
-                }
-
-            }
-            return list;
-        }
-
         /// <summary>
         /// 鑾峰彇鏃堕棿鍊�
         /// </summary>

--
Gitblit v1.8.0