From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 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 100644
new mode 100755
index 6096f7f..0dce8c7
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
@@ -15,17 +15,18 @@
             Width = Application.GetRealWidth(343),
             X = Application.GetRealWidth(16),
             BackgroundColor = CSS.CSS_Color.view,
-            Radius=(uint)Application.GetRealHeight(12),
+            Radius =(uint)Application.GetRealHeight(12),
         };
         /// <summary>
         /// 鏃堕棿鎺т欢UIPickerView 
         /// </summary>
         public UIPickerView mUIPickerView = new UIPickerView
         {
-            //Y = Application.GetRealHeight(44),
+            X= Application.GetRealWidth(12),
             Height = Application.GetRealHeight(297),
-            Width = Application.GetRealWidth(343),
-            BackgroundColor = CSS.CSS_Color.viewTranslucence,
+            Width = Application.GetRealWidth(343-12*2),
+            BackgroundColor =CSS.CSS_Color.viewTranslucence,
+            Radius = (uint)Application.GetRealHeight(12),
 
         };
         /// <summary>
@@ -39,7 +40,8 @@
             Width = Application.GetRealWidth(52),
             Height = Application.GetRealHeight(32),
             Y = Application.GetRealHeight(6),
-            X = Application.GetRealWidth(8)
+            X = Application.GetRealWidth(8),
+            
         };
         /// <summary>
         /// 纭畾Btn
@@ -62,7 +64,8 @@
             BackgroundColor = CSS.CSS_Color.viewLine,
             Width = Application.GetRealWidth(343),
             Height = 1,
-            Y = Application.GetRealWidth(44)
+            Y = Application.GetRealWidth(44),
+           
         };
         /// <summary>
         /// 鏃堕棿View鐨勬柟娉�
@@ -70,21 +73,49 @@
         /// <returns></returns>
         public void FLayoutView(FrameLayout fLayout)
         {
+           
+            fLayout.AddChidren(frameLayout);
             frameLayout.AddChidren(mUIPickerView);
             frameLayout.AddChidren(btnCancel);
             frameLayout.AddChidren(btnConfirm);
             frameLayout.AddChidren(btnLine);
-            fLayout.AddChidren(frameLayout);
         }
         /// <summary>
-        /// 鑾峰彇24灏忔椂鍒楄〃
+        /// 鑾峰彇1-24灏忔椂鍒楄〃
         /// </summary>
         /// <returns></returns>
         public List<string> GethStringList()
         {
             //鍒濆鍖栧垪琛�
             var hList = new List<string>();
-            for (int i = 1; i < 24; i++)
+            for (int i = 0; i < 24; i++)
+            {
+                if (i < 10)
+                {
+                    var a = "0" + i.ToString();
+                    //娣诲姞鏁版嵁
+                    hList.Add(a + " " + Language.StringByID(StringId.h));
+                }
+                else
+                {
+                    //娣诲姞鏁版嵁
+                    hList.Add(i.ToString() + " " + Language.StringByID(StringId.h));
+                }
+
+            }
+            return hList;
+
+
+        }
+        /// <summary>
+        /// 鑾峰彇0-23灏忔椂鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GethStringList0()
+        {
+            //鍒濆鍖栧垪琛�
+            var hList = new List<string>();
+            for (int i = 0; i < 23; i++)
             {
                 if (i < 10)
                 {
@@ -131,14 +162,14 @@
         }
 
         /// <summary>
-        /// 鑾峰彇24灏忔椂鍒楄〃
+        /// 鑾峰彇023灏忔椂鍒楄〃
         /// </summary>
         /// <returns></returns>
         public List<int> GethIntList()
         {
             //鍒濆鍖栧垪琛�
             var hList = new List<int>();
-            for (int i = 1; i < 24; i++)
+            for (int i = 0; i < 24; i++)
             {
                 //娣诲姞鏁版嵁
                 hList.Add(i);
@@ -147,6 +178,7 @@
 
 
         }
+        
         /// <summary>
         /// 鑾峰彇60鍒嗛挓鍒楄〃
         /// </summary>

--
Gitblit v1.8.0