From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Common/Logic/HdlControlLogic.cs | 87 +++----------------------------------------
1 files changed, 7 insertions(+), 80 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlControlLogic.cs
similarity index 71%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
rename to ZigbeeApp/Shared/Phone/Common/Logic/HdlControlLogic.cs
index a328d0f..0dfc8ec 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlControlLogic.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 鎺т欢鐨勯�昏緫
@@ -221,90 +221,17 @@
#endregion
- #region 鈻� 鏄剧ず搴曢儴寮圭獥鐨勬埧闂村垪琛╛____________
+ #region 鈻� 鏄剧ず鍚姩椤礯________________________
/// <summary>
- /// 鏄剧ず搴曢儴寮圭獥鐨勬椂闂村垪琛�
+ /// 鏄剧ず鍚姩椤�
/// </summary>
- /// <param name="hKey">閫夋嫨鐨勬椂闂翠富閿�</param>
- /// <param name="mKey">閫夋嫨鐨勫垎閽熶富閿�</param>
- /// <param name="titleText">鏍囬淇℃伅</param>
- /// <param name="SelectTimeEvent">纭閫夋嫨鏃堕棿鐨勫洖璋冨嚱鏁� </param>
- /// <param name="type">鏅捐。鏋舵椂闂� 锛�1鐑樺共锛�2:椋庡共锛�3娑堟瘨</param>
- public bool ShowBottomListTimeView(string hKey, string mKey, string titleText, Action<string, string> SelectTimeEvent, int type)
+ public void ShowLoginLoadView()
{
- //灏忔椂鍒楄〃鍚嶅瓧
- var listHourName = new List<string>();
- //灏忔椂鍒楄〃涓婚敭
- var listHourKeys = new List<string>();
- //鍒嗛挓鍚嶅瓧
- var listMinName = new List<List<string>>();
- //鍒嗛挓涓婚敭
- var listMinKeys = new List<List<string>>();
- var listKeys = new List<string>() { "" };
- var listName = new List<string>() { "" };
- if (type == 3)
- {
- //鍚嶅瓧鍜岄敭鏀堕泦
- for (int i = 1; i < 31; i++)
- {
- listName.Add(i.ToString());
- listKeys.Add(i.ToString());
- }
- listMinName.Add(listName);
- listMinKeys.Add(listKeys);
- }
- else
- {
- //鍚嶅瓧鍜岄敭鏀堕泦
- for (int i = 0; i < 4; i++)
- {
- listHourName.Add(i.ToString());
- listHourKeys.Add((i + 1).ToString());
- }
- for (int i = 0; i < 60; i++)
- {
- listName.Add(i.ToString());
- listKeys.Add((i + 1).ToString());
- }
- listMinName.Add(listName);
- listMinKeys.Add(listKeys);
- }
-
- int index1 = hKey != null ? int.Parse(hKey) : 0;
- int index2 = mKey != null ? int.Parse(mKey) : 0;
-
- if (type == 3)
- {
- //鍙湁鍒嗛挓锛屾秷姣掓椂闂�
- PickerView.Show(
- listMinName[0],
- (value) =>
- {
- mKey = listMinKeys[0][value];
- SelectTimeEvent?.Invoke(mKey, listMinKeys[0][value]);
- },
- index2,
- titleText,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
- }
- else
- {
- //鏈夊皬鏃讹紝鍒嗛挓
- PickerView.ShowSecondary(listHourName, listMinName, (value1, value2) =>
- {
- mKey = listMinKeys[value1][value2];
- string name = listHourName[value1] + " " + listMinName[value1][value2];
- SelectTimeEvent?.Invoke(mKey, name);
-
- }, index1, index2, titleText,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
- }
- return true;
+ var loginLoad = new UserView.LoginLoading();
+ Common.CommonPage.Instance.AddChidren(loginLoad);
+ loginLoad.Show();
}
#endregion
-
}
}
--
Gitblit v1.8.0