From 388ece21a0c608c2571775137a89ad32ca0cedd8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:35:23 +0800
Subject: [PATCH] 2021-1-11-2
---
HDL_ON/UI/UI2/.DS_Store | 0
/dev/null | 0
HDL_ON/UI/.DS_Store | 0
.DS_Store | 0
HDL_ON/UI/UI2/3-Intelligence/.DS_Store | 0
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 17 +++++++----------
HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs | 40 ++++++++++++++++++++++++++--------------
8 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index b05e08d..3909a6a 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 47659cc..badab7e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,15 +1,15 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="268" Column="79" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="246" Column="120" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="106" Column="27" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="71" Column="41" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" Line="9" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" Line="62" Column="62" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs" Line="13" Column="13" />
<File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="17" Column="13" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs" Line="19" Column="12" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs" Line="77" Column="21" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -18,12 +18,9 @@
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True" />
<Node name="UI" expanded="True">
- <Node name="UI2" expanded="True">
+ <Node name="UI2" expanded="True" selected="True">
<Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="LogicView" expanded="True" />
- <Node name="OutdoorEnvironment.cs" selected="True" />
- </Node>
+ <Node name="Automation" expanded="True" />
</Node>
<Node name="4-PersonalCenter" expanded="True" />
</Node>
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index f17f451..b97f103 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 9a6dc9d..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 cefbeed..0000000
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/UI/.DS_Store b/HDL_ON/UI/.DS_Store
index 7467d0f..91c331b 100755
--- a/HDL_ON/UI/.DS_Store
+++ b/HDL_ON/UI/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI2/.DS_Store b/HDL_ON/UI/UI2/.DS_Store
index 866aed9..f752d80 100644
--- a/HDL_ON/UI/UI2/.DS_Store
+++ b/HDL_ON/UI/UI2/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/.DS_Store b/HDL_ON/UI/UI2/3-Intelligence/.DS_Store
index 5c32cca..6d1e570 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/.DS_Store
+++ b/HDL_ON/UI/UI2/3-Intelligence/.DS_Store
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
index 19b6a60..67c8638 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
@@ -61,26 +61,38 @@
};
for (int i = 0; i < list.Count; i++)
{
- LogicView.SelectTypeView timeView = new LogicView.SelectTypeView();
- timeView.frameLayout.Y = Application.GetRealHeight(i * 50);
- timeView.btnIcon.Visible = false;
- timeView.btnText.X = Application.GetRealWidth(16);
- timeView.btnLine.X = Application.GetRealWidth(16);
- timeView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
- timeView.btnText.Text = list[i];
- timeView.btnClick.Tag = list[i];
- viewLayout.AddChidren(timeView.FLayoutView());
+ LogicView.SelectTypeView view = new LogicView.SelectTypeView();
+ view.frameLayout.Y = Application.GetRealHeight(i * 50);
+ view.btnIcon.Visible = false;
+ view.btnNextIcon.Visible = false;
+ view.btnText.X = Application.GetRealWidth(16);
+ view.btnLine.X = Application.GetRealWidth(16);
+ view.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
+ view.btnText.Text = list[i];
+ view.btnClick.Tag = list[i];
+ viewLayout.AddChidren(view.FLayoutView());
- timeView.btnClick.MouseUpEventHandler += (sen, e) =>
+ view.btnClick.MouseUpEventHandler += (sen, e) =>
{
- //string
- //if () { }
- //else if () { }
- //else if () { }
+ string text = view.btnClick.Tag.ToString();
+ if (text == Language.StringByID(StringId.clearday))
+ {
+
+ }
+ else if (text == Language.StringByID(StringId.cloudy))
+ {
+
+ }
+ else if (text == Language.StringByID(StringId.rain))
+ {
+
+ }
};
}
}
+
+
}
}
--
Gitblit v1.8.0