From 8111a96164218c531104d7f958a643f041976a16 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 14:41:47 +0800
Subject: [PATCH] 2021-5-17-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/LogicTypeTitleView.cs | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 2 +-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 29 ++++++++++-------------------
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 2 +-
5 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 1b3095f..a717256 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,37 +1,24 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="185" Column="33" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMethod.cs" Line="186" Column="45" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="271" Column="50" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="14" Column="10" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="140" Column="51" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="43" Column="23" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs" Line="901" Column="22" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="35" Column="68" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="43" Column="13" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True" />
- <Node name="Entity" expanded="True">
- <Node name="Function" expanded="True" />
- </Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True">
- <Node name="LogicMethod.cs" selected="True" />
+ <Node name="AddTarget.cs" selected="True" />
</Node>
</Node>
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AddFunction" expanded="True" />
- <Node name="PirDevice" expanded="True" />
- </Node>
+ <Node name="4-PersonalCenter" expanded="True" />
<Node name="FuntionControlView" expanded="True">
<Node name="Music" expanded="True">
<Node name="View" expanded="True" />
@@ -45,7 +32,11 @@
<Node name="Other" expanded="True" />
</Node>
<Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="LogicIcon" expanded="True" />
+ </Node>
+ </Node>
</Node>
</Node>
</State>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
index d3bb907..d185e19 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -46,7 +46,7 @@
LogicView.SelectTypeView delayView = new LogicView.SelectTypeView();
delayView.frameLayout.Y = sceneView.frameLayout.Bottom;
delayView.btnText.TextID = StringId.delayLogic;
- delayView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
+ delayView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
//viewLayout.AddChidren(delayView.FLayoutView());
#endregion
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 0dede77..3de977d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -926,7 +926,7 @@
break;
case "3":
{
- targetView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
+ targetView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
string value = dic["value"];
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/LogicTypeTitleView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/LogicTypeTitleView.cs
index 6a25605..8eea8c9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/LogicTypeTitleView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/LogicTypeTitleView.cs
@@ -28,7 +28,7 @@
//Y = Application.GetRealHeight(12),
X = Application.GetRealWidth(12),
Gravity = Gravity.CenterVertical,
- IsMoreLines = true,
+ // IsMoreLines = true,
};
/// <summary>
/// 鍥炬爣
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
index e199ffc..a36dc65 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
@@ -203,7 +203,7 @@
{
//鍒濆鍖栧垪琛�
var hList = new List<string>();
- for (int i = 0; i < 23; i++)
+ for (int i = 0; i < 24; i++)
{
if (i < 10)
{
--
Gitblit v1.8.0