From 8ee8336485e98ba9722c5feb1cafacd93c6b5c1a Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 11 三月 2020 09:16:51 +0800
Subject: [PATCH] 2020-03-11-1
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 271 +++---------------------------------------------------
1 files changed, 15 insertions(+), 256 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index a55530b..84db891 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -1746,20 +1746,23 @@
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
/// </summary>
private void ShowAutotion()
- {
- // functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
-
+ {
+ // functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ #region ---鎺ㄨ崘妯℃澘鐨勭粍浠�
+ //鎺ㄨ崘妯℃澘鑳屾櫙鎺т欢
var bjFrameLayout = new FrameLayout
{
Width = Application.GetRealWidth(1080 - 58),
Height = Application.GetRealHeight(170),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ BackgroundColor =ZigbeeColor.Current.LogicBackgroundColor,
X = Application.GetRealWidth(58),
//Radius = (uint)Application.GetRealHeight(50),
Y = Application.GetRealHeight(30),
+
};
functionSceneAutoBodyView.AddChidren(bjFrameLayout);
bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+ //鍥炬爣鎺т欢
var sigBtn = new Button
{
Width = Application.GetMinRealAverage(84),
@@ -1769,7 +1772,7 @@
Gravity = Gravity.CenterVertical,
};
bjFrameLayout.AddChidren(sigBtn);
-
+ //鎺ㄨ崘妯℃澘鏂囨湰鎺т欢
var recommendtextBtn = new Button
{
Width = Application.GetMinRealAverage(300),
@@ -1783,7 +1786,7 @@
TextSize = 15,
};
bjFrameLayout.AddChidren(recommendtextBtn);
-
+ //鎺ㄨ崘妯℃澘寮�鍏虫帶浠�
var recommendswitchBtn = new Button
{
Width = Application.GetMinRealAverage(104),
@@ -1794,8 +1797,8 @@
Gravity = Gravity.CenterVertical,
};
bjFrameLayout.AddChidren(recommendswitchBtn);
-
-
+ #endregion
+ //榛樿鎺ㄨ崘妯℃澘宸﹀彸鍙粦鎺т欢
var scenehorizontalScrol = new HorizontalScrolViewLayout
{
Width = Application.GetRealWidth(1080 - 58),
@@ -1804,7 +1807,7 @@
Height = Application.GetRealHeight(0),
};
functionSceneAutoBodyView.AddChidren(scenehorizontalScrol);
-
+ //鏄剧ず鑷姩鍖栧垪琛ㄤ笂涓嬪彲婊戞帶浠�
var logicScrolView = new VerticalRefreshLayout//VerticalScrolViewLayout
{
Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
@@ -1815,6 +1818,7 @@
functionSceneAutoBodyView.AddChidren(logicScrolView);
logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
bool no = false;
+ //鏄剧ず榛樿妯℃澘鐨勭晫闈簨浠�
recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
{
int Yheight = 0;
@@ -1908,6 +1912,7 @@
logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
Automationview(logicScrolView,no);
};
+ //涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
logicScrolView.BeginHeaderRefreshingAction += () =>
{
//閲嶆柊鍒锋柊logic鍒楄〃
@@ -2153,254 +2158,8 @@
logicRowlayout.AddChidren(logictimeBtn);
///鏄剧ず鎵ц鍛ㄦ湡
- switch (logic.TimeAttribute.Repeat)
- {
- ///0:鍙墽琛屼竴娆★紝鎵ц鍚嶪sEnable鍊肩疆;1,浠婂勾鍐呮墽琛�;2锛氭瘡澶╂墽琛�;3锛氭瘡鏈堟墽琛�;4锛氭瘡骞存墽琛�;5锛氬懆閲嶅銆�
- case 0:
- {
- logictimeBtn.Text = Language.StringByID(MyInternationalizationString.executeonce);
- }; break;
- case 1: { }; break;
- case 2:
- {
- logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyday);
- }; break;
- case 3:
- {
+ Logic.Method.UpdateWeek(logictimeBtn,logic);
- string len = "", value = "";
- var stringvalue = Convert.ToString(logic.TimeAttribute.MonthDate, 2);
- var str = stringvalue.Insert(0, new string('0', 32 - stringvalue.Length));
- for (int j = 31; j >= 0; j--)
- {
- len += str.Substring(j, 1);
- }
- for (int j = 0; j < len.Length; j++)
- {
- var strvalue = len.Substring(j, 1);
- if (strvalue == "1")
- {
- value += (j + 1).ToString() + ",";
- }
- }
- logictimeBtn.Text = Language.StringByID(MyInternationalizationString.monthly) + value.TrimEnd(',') + Language.StringByID(MyInternationalizationString.day);
-
- }; break;
- case 4:
- {
-
- Dictionary<int, int> dictionary = new Dictionary<int, int>();
- ///鎵惧嚭鎵ц鐨勬湀浠藉拰澶╂暟
- if (logic.TimeAttribute.SelectMonDate.Count != 0)
- {
- for (int i = 0; i < logic.TimeAttribute.SelectMonDate.Count; i++)
- {
- var dayvalue = logic.TimeAttribute.SelectMonDate[i];
- if (dayvalue != 0)
- {
- dictionary.Add(i + 1, dayvalue);
- }
- }
- }
- if (dictionary.Count != 0 && dictionary.Count == 1)
- {
- string len = "", leng = "";
- int minvalue = 0, Maximum = 0;
- foreach (var value in dictionary)
- {
- ///鍙栧嚭鏈堜唤
- var month = value.Key;
- ///鍙栧嚭鏃ユ暟
- var day = value.Value;
- var maxvalue = Convert.ToString(day, 2);
- var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
- for (int j = 31; j >= 0; j--)
- {
- len += str.Substring(j, 1);
- }
-
- for (int j = 0; j < len.Length; j++)
- {
- var strvalue = len.Substring(j, 1);
- if (strvalue == "1")
- {
- minvalue = j + 1;
- break;
- }
- }
- for (int j = 0; j < len.Length; j++)
- {
- var strvalue = len.Substring(j, 1);
- if (strvalue == "1")
- {
- Maximum = j + 1;
- }
- }
-
- if (month.ToString().Length < 2)
- {
- leng = "0" + month.ToString();
- }
- else
- {
- leng = month.ToString();
- }
- if (minvalue == Maximum)
- {
- logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString());
- }
- else
- {
- logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-" + leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
- }
- }
-
- }
- else
- {
- int b = 0;
- string stringtext = "";
- foreach (var value in dictionary)
- {
- string len = "", leng = "";
- int minvalue = 0, Maximum = 0;
- ///鍙栧嚭鏈堜唤
- var month = value.Key;
- ///鍙栧嚭鏃ユ暟
- var day = value.Value;
- var maxvalue = Convert.ToString(day, 2);
- var str = maxvalue.Insert(0, new string('0', 32 - maxvalue.Length));
- for (int j = 31; j >= 0; j--)
- {
- len += str.Substring(j, 1);
- }
-
-
- if (month.ToString().Length < 2)
- {
- leng = "0" + month.ToString();
- }
- else
- {
- leng = month.ToString();
- }
-
-
-
- if (b == 0)
- {
- for (int j = 0; j < len.Length; j++)
- {
- var strvalue = len.Substring(j, 1);
- if (strvalue == "1")
- {
- minvalue = j + 1;
- break;
- }
- }
- stringtext += leng + "/" + (minvalue.ToString().Length < 2 ? "0" + minvalue.ToString() : minvalue.ToString()) + "-";
-
- }
-
- if (b == dictionary.Count - 1)
- {
- for (int j = 0; j < len.Length; j++)
- {
- var strvalue = len.Substring(j, 1);
- if (strvalue == "1")
- {
- Maximum = j + 1;
- }
- }
- stringtext += leng + "/" + (Maximum.ToString().Length < 2 ? "0" + Maximum.ToString() : Maximum.ToString());
-
- }
- b++;
- }
- logictimeBtn.Text = Language.StringByID(MyInternationalizationString.everyyear) + stringtext;
- }
-
- }; break;
- case 5:
- {
- string len = "", text = "";
- List<int> listvalueInt = new List<int>();
- listvalueInt.Clear();
- var maxvalue = Convert.ToString(logic.TimeAttribute.WeekDay, 2);
- var str = maxvalue.Insert(0, new string('0', 8 - maxvalue.Length));
- for (int j = 7; j >= 0; j--)
- {
- len += str.Substring(j, 1);
- }
-
- for (int j = 0; j < len.Length; j++)
- {
- var strvalue = len.Substring(j, 1);
- if (strvalue == "1")
- {
- listvalueInt.Add(j + 1);
-
-
- if ((j + 1) == 1)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.mon1) + ",";
- //text += Language.StringByID(MyInternationalizationString.mon) + ",";
- }
- else if ((j + 1) == 2)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.tue1) + ",";
- //text += Language.StringByID(MyInternationalizationString.tue) + ",";
- }
- else if ((j + 1) == 3)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.wed1) + ",";
- //text += Language.StringByID(MyInternationalizationString.wed) + ",";
- }
- else if ((j + 1) == 4)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.thu1) + ",";
- //text += Language.StringByID(MyInternationalizationString.thu) + ",";
- }
- else if ((j + 1) == 5)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.frl1) + ",";
- //text += Language.StringByID(MyInternationalizationString.frl) + ",";
- }
- else if ((j + 1) == 6)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sat1) + ",";
- //text += Language.StringByID(MyInternationalizationString.sat) + ",";
- }
- else if ((j + 1) == 7)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sun1) + ",";
- //text += Language.StringByID(MyInternationalizationString.sun) + ",";
- }
-
-
- }
- }
- //鏆傛椂闅愯棌鎺夛紝闇�瑕佹樉绀哄懆鏈拰宸ヤ綔鏃ュ啀鏀惧紑锛�
- //if (listvalueInt.Count == 5 && !listvalueInt.Contains(6) && !listvalueInt.Contains(7))
- //{
- // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.workingday);
- //}
- //else if (listvalueInt.Count == 2 && listvalueInt.Contains(6) && listvalueInt.Contains(7))
- //{
- // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.weekend);
- //}
- //else if (listvalueInt.Count == 7)
- //{
- // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.everyday);
- //}
- //else
- //{
- // btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
- //}
- logictimeBtn.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
- //btndisplaycycle.Text = text.TrimEnd(',');
- }; break;
- }
List<string> indexlist = new List<string>();
List<string> iconIndexlist = new List<string>();
--
Gitblit v1.8.0