From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码

---
 ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
index 227faea..7e3008e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
@@ -154,25 +154,38 @@
             };
             timeFL.AddChidren(pickView);
 
-            var minuList = new List<int> { };
-            var secList = new List<int> { };
-            var minuStrList = new List<string> { };
-            var secStrList = new List<string> { };
-            for (int i = 0; i < 60; i++)
+            //鍒�
+            string strMinute = Language.StringByID(R.MyInternationalizationString.uMinute);
+            //绉�
+            string strSecond = Language.StringByID(R.MyInternationalizationString.uSecond);
+            var listfirst = new List<string>();
+            var listSecond = new List<List<string>>();
+            for (int i = 0; i <= 59; i++)
             {
-                minuList.Add(i);
-                minuStrList.Add($"{i}{Language.StringByID(R.MyInternationalizationString.Minute)}");
-                secList.Add(i);
-                secStrList.Add($"{i}{Language.StringByID(R.MyInternationalizationString.Second)}");
+                listfirst.Add(i.ToString().PadLeft(2, '0') + strMinute);
+                var listTemp = new List<string>();
+                for (int j = 0; j <= 59; j++)
+                {
+                    if (i == 0 && j == 0)
+                    {
+                        continue;
+                    }
+                    listTemp.Add(j.ToString().PadLeft(2, '0') + strSecond);
+                }
+                listSecond.Add(listTemp);
             }
-
-            pickView.setNPicker(minuStrList, secStrList, null);
-
+            //鍔犱竴涓�60鍒嗛挓鍚�
+            listfirst.Add("60" + strMinute);
+            var listTemp2 = new List<string>() { "00" + strSecond };
+            listSecond.Add(listTemp2);
+
+            pickView.setPicker(listfirst, listSecond);
             pickView.setCurrentItems(totalSecond / 60, totalSecond % 60, 0);
-
-            pickView.OnSelectChangeEvent += (l1, l2, l3) =>
-            {
-                totalSecond = minuList[l1] * 60 + secList[l2];
+            pickView.OnSelectChangeEvent += (value1, value2, value3) =>
+            {
+                int minute = Convert.ToInt32(listfirst[value1].Substring(0, 2));
+                int second = Convert.ToInt32(listSecond[value1][value2].Substring(0, 2));
+                totalSecond = minute * 60 + second;
             };
 
             var confirmBtn = new CommonForm.CompleteButton(1656, 907, 127);

--
Gitblit v1.8.0