From ae142832f9721956f963cf008047a2620a035bf7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 27 十一月 2020 17:00:58 +0800
Subject: [PATCH] 2020-11-27-3
---
/dev/null | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 139 +++++++++++++++++++++++++++++++++++++++-------
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 23 ++++---
4 files changed, 129 insertions(+), 33 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 80a44ae..1b96239 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,17 +1,16 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Assets/Language.ini">
<Files>
- <File FileName="HDL_ON/Common/R.cs" Line="456" Column="45" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="462" Column="1" />
+ <File FileName="HDL_ON/Common/R.cs" Line="442" Column="33" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="434" Column="7" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="9" Column="21" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs" Line="210" Column="45" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="285" Column="59" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="266" Column="18" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="58" Column="23" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs" Line="22" Column="44" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/MonView.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="56" Column="45" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/DateView.cs" Line="26" Column="43" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -21,12 +20,11 @@
<Node name="Common" expanded="True" />
<Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
+ <Node name="CSS" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True">
- <Node name="LogicView" expanded="True">
- <Node name="DateView.cs" selected="True" />
- </Node>
+ <Node name="LogicView" expanded="True" />
</Node>
</Node>
<Node name="FuntionControlView" expanded="True" />
@@ -38,6 +36,7 @@
<Node name="Phone" expanded="True">
<Node name="LogicIcon" expanded="True" />
</Node>
+ <Node name="Language.ini" selected="True" />
</Node>
</Node>
</Node>
@@ -54,7 +53,9 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.4b65c4650918" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="262" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 0a406a6..339847b 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
deleted file mode 100644
index 3de504c..0000000
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
+++ /dev/null
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
deleted file mode 100644
index 73b5707..0000000
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index c20eedd..0526ac0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -11,10 +11,10 @@
{
Tag = "Logic";
}
-
+
public void Show()
{
-
+
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
LogicView.TopView topView = new LogicView.TopView();
this.AddChidren(topView.FLayoutView());
@@ -23,7 +23,7 @@
RemoveFromParent();
};
topView.topNameBtn.TextID = StringId.newAutomation;
-
+
VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
{
Y = Application.GetRealHeight(64),
@@ -101,7 +101,7 @@
BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
};
this.AddChidren(fLayout);
- DateMethod(fLayout,cyclicTitle.btnText);
+ DateMethod(fLayout, cyclicTitle.btnText);
};
@@ -135,7 +135,7 @@
Logic.LogicList.Add(Logic.currlogic);
LogicMethod.RemoveAllView();
MainView.MainShow();
-
+
};
//saveView.frameLayout.Y = this.Height - saveView.frameLayout.Height;
#endregion
@@ -148,7 +148,7 @@
/// </summary>
/// <param name="fLayout">寮规涓绘帶浠�</param>
/// <param name="button">鏄剧ず鏂囨湰</param>
- public void DateMethod(FrameLayout fLayout,Button button)
+ public void DateMethod(FrameLayout fLayout, Button button)
{
LogicView.DateView dateView = new LogicView.DateView();
@@ -204,7 +204,8 @@
}
dateTypeView.btnText.Text = weekName;
//寰幆绫诲瀷(渚嬪锛氭瘡鏈堬紝姣忓ぉ)鐐瑰嚮浜嬩欢
- dateTypeView.btnClick.MouseUpEventHandler += (sender, e) => {
+ dateTypeView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
int clickIndex = int.Parse(dateTypeView.btnClick.Tag.ToString());
switch (clickIndex)
{
@@ -227,7 +228,7 @@
break;
case 2:
{
- // weekName = Language.StringByID(StringId.weekly);
+ // weekName = Language.StringByID(StringId.weekly);
WeekMethod(fLayout, button);
}
break;
@@ -242,7 +243,7 @@
}
};
-
+
//鏄剧ず涔嬪墠鐨勭姸鎬�
if (button.Text == weekName)
{
@@ -258,12 +259,18 @@
//纭畾淇濆瓨
dateView.btnConfirm.MouseUpEventHandler += (sender3, e3) =>
{
+ if (weekName == Language.StringByID(StringId.monthly)|| weekName!= Language.StringByID(StringId.weekly)) {
+ //鎻愮ず锛氳繕鏈��
+ return;
+
+ }
+
if (weekName == Language.StringByID(StringId.performA))
{
//鎵ц涓�娆�
Logic.currlogic.cycle.type = "once";
}
- else if (weekName == Language.StringByID(StringId.performA))
+ else if (weekName == Language.StringByID(StringId.days))
{
//姣忓ぉ
Logic.currlogic.cycle.type = "day";
@@ -292,7 +299,7 @@
};
//瀹氫箟涓�涓眬閮╳eekList鍒楄〃鐢ㄦ潵璁板綍閫変腑鏁版嵁;
List<string> weekList = new List<string>();
- if (Logic.currlogic.cycle.type == "mon")
+ if (Logic.currlogic.cycle.type == "week")
{
//鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
weekList.AddRange(Logic.currlogic.cycle.value);
@@ -388,12 +395,14 @@
}
//纭畾鐐瑰嚮浜嬩欢
- weekView.btnConfirm.MouseUpEventHandler += (sender1, e1) => {
- if (weekList.Count==0) {
+ weekView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ {
+ if (weekList.Count == 0)
+ {
//鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
return;
}
- Logic.currlogic.cycle.type = "mon";
+ Logic.currlogic.cycle.type = "week";
Logic.currlogic.cycle.value = weekList;
button.Text = GetWeekString(weekList);
fLayout.RemoveFromParent();
@@ -414,23 +423,89 @@
{
monView.frameLayout.RemoveFromParent();
};
- //58
+ //瀹氫箟涓�涓眬閮╩onList鍒楄〃鐢ㄦ潵璁板綍閫変腑鏁版嵁;
+ List<string> monList = new List<string>();
+ if (Logic.currlogic.cycle.type == "mon")
+ {
+ //鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
+ monList.AddRange(Logic.currlogic.cycle.value);
+ }
+ //瀹氫箟涓�涓彉閲忚褰曡鏁�
int lineSun = 0;
- for (int i = 0; i < 32; i++)
+ for (int i = 1; i < 32; i++)
{
Button monTextBtn = new Button
{
Width = Application.GetMinRealAverage(30),
Height = Application.GetMinRealAverage(30),
+ Radius = (uint)Application.GetRealHeight(15),
+ Text = i.ToString(),
+ TextSize = LogicView.TextSize.text14,
+ TextColor = CSS.CSS_Color.textColor,
+ SelectedTextColor = CSS.CSS_Color.view,
+ SelectedBackgroundColor = CSS.CSS_Color.textConfirmColor,
+ BackgroundColor = CSS.CSS_Color.viewTranslucence,
+ Tag = i,
};
+ monView.frameLayout.AddChidren(monTextBtn);
+ if (lineSun > 0)
+ {
+ monTextBtn.X = Application.GetRealWidth(16 + ((i - 1) - lineSun * 7) * 46);
+ }
+ else
+ {
+
+ monTextBtn.X = Application.GetRealWidth(16 + (i - 1) * 46);
+ }
+ monTextBtn.Y = Application.GetRealWidth(58 + 10 + lineSun * (30 + 10));
+
if (i % 7 == 0)
{
+ //涓�瀹氭墽琛屽畬鍐嶅垽鏂槸鍚﹁鎹㈣.
+ lineSun = lineSun + 1;
+
}
- else { }
+ monTextBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ string clickIndex = monTextBtn.Tag.ToString();
+ monTextBtn.IsSelected = !monTextBtn.IsSelected;
+ if (monTextBtn.IsSelected)
+ {
+ monTextBtn.IsSelected = true;
+ if (!monList.Contains(clickIndex))
+ {
+ //娣诲姞閫変腑鏁版嵁
+ monList.Add(clickIndex);
+ }
+ }
+ else
+ {
+ monTextBtn.IsSelected = false;
+ if (monList.Contains(clickIndex))
+ {
+ //绉婚櫎閫変腑鏁版嵁
+ monList.Remove(clickIndex);
+ }
+ }
+ };
-
-
+ if (monList.Contains(i.ToString())) {
+ monTextBtn.IsSelected = true;
+ }
}
+ //纭畾鐐瑰嚮浜嬩欢
+ monView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ {
+ if (monList.Count == 0)
+ {
+ //鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
+ return;
+ }
+ Logic.currlogic.cycle.type = "mon";
+ Logic.currlogic.cycle.value = monList;
+ button.Text = GetMonString(monList);
+ fLayout.RemoveFromParent();
+ };
}
/// <summary>
/// 鑾峰彇鏄熸湡鐨勫瓧绗︿覆
@@ -441,8 +516,9 @@
{
string weekTextName = "";
- if (weekList.Contains("0")) {
- weekTextName += Language.StringByID(StringId.monday)+",";
+ if (weekList.Contains("0"))
+ {
+ weekTextName += Language.StringByID(StringId.monday) + ",";
}
if (weekList.Contains("1"))
{
@@ -468,10 +544,29 @@
{
weekTextName += Language.StringByID(StringId.sunday) + ",";
}
- if (weekTextName=="") {
+ if (weekTextName == "")
+ {
return "";
}
return weekTextName.TrimEnd(',');
}
+ /// <summary>
+ /// 鑾峰彇姣忔湀鐨勫瓧绗︿覆
+ /// </summary>
+ /// <param name="monList"></param>
+ /// <returns></returns>
+ public string GetMonString(List<string> monList)
+ {
+ string monTextName = Language.StringByID(StringId.monthly);
+
+ for (int i = 1; i < 32; i++)
+ {
+ if (monList.Contains(i.ToString()))
+ {
+ monTextName += i.ToString() + ",";
+ }
+ }
+ return monTextName.TrimEnd(',');
+ }
}
}
--
Gitblit v1.8.0