From e64dd8689cf4bdf812b43a2f02e51c2100bedd02 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 27 四月 2021 19:06:15 +0800
Subject: [PATCH] 2021-4-27-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 4 ++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 34 ++++++++++++++++++++--------------
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 1 +
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index c3090ba..6c1c182 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,32 +1,38 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+锘�<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>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs">
+ <Files>
+ <File FileName="HDL-ON_Android/Application.cs" Line="356" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="27" Column="22" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="35" Column="26" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="502" Column="41" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="131" Column="65" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" Line="219" Column="30" />
+ </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="Entity" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="ThirdPartySdk" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Stan" expanded="True" />
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True">
- <Node name="MainView.cs" selected="True" />
+ <Node name="AddInputType.cs" selected="True" />
</Node>
</Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Video" expanded="True" />
- </Node>
+ <Node name="FuntionControlView" expanded="True" />
</Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 41b3be7..9d3cb3c 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -56,7 +56,7 @@
if (MainView.IsGatewayType)
{
- viewLayout.AddChidren(shiwaiView.FLayoutView());
+ //viewLayout.AddChidren(shiwaiView.FLayoutView());
}
#endregion
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index f8b2ea0..85da9ad 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -122,13 +122,13 @@
push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
push.btnClick.Width = Application.GetRealWidth(305);
- viewLayout.AddChidren(push.FLayoutView());
+ //viewLayout.AddChidren(push.FLayoutView());
///鍙戦�侀�氱煡View
LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
notification.btnText.TextID = StringId.notification;
notification.btnLine.BackgroundColor = CSS.CSS_Color.textWhiteColor;
- viewLayout.AddChidren(notification.FLayoutView());
+ // viewLayout.AddChidren(notification.FLayoutView());
//鏄剧ず涔嬪墠鎺ㄩ�佸紑鍏崇姸鎬�
if (Logic.currlogic.noticeConfig.enable)
{
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 3e24635..9113330 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -142,6 +142,7 @@
}
else
{
+
var onePortAutomation = new OnePortAutomation();
MainPage.BasePageView.AddChidren(onePortAutomation);
onePortAutomation.Show();
--
Gitblit v1.8.0