From a4d0a03f3f87fcb5e4485e98a1f7b1a119c26eab Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 28 四月 2021 11:27:55 +0800
Subject: [PATCH] 121-04-28-2
---
HDL-ON_Android/HDL-ON_Android.csproj | 1 +
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 2 +-
HDL-ON_iOS/Resources/Phone/LogicIcon/shiwaitianqi.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 1 +
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 4 ++--
HDL-ON_Android/Assets/Phone/LogicIcon/shiwaitianqi.png | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 23 ++++++++++++++---------
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 14 ++++++++++++++
8 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 6c1c182..e3724b4 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,18 +1,23 @@
锘�<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/AddInputType.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.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" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="82" Column="41" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="365" Column="29" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="49" Column="23" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs" Line="78" Column="50" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs" Line="205" Column="38" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs" Line="8" Column="16" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs" Line="8" Column="16" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -27,7 +32,7 @@
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
<Node name="Automation" expanded="True">
- <Node name="AddInputType.cs" selected="True" />
+ <Node name="AirQuality.cs" selected="True" />
</Node>
</Node>
<Node name="FuntionControlView" expanded="True" />
@@ -46,7 +51,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/shiwaitianqi.png b/HDL-ON_Android/Assets/Phone/LogicIcon/shiwaitianqi.png
new file mode 100644
index 0000000..a920e56
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/LogicIcon/shiwaitianqi.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index b85e077..8010f6f 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -1097,6 +1097,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\shiwaitianqi.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index c2f83ed..6e444f2 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1216,6 +1216,7 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\shiwaitianqi.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/shiwaitianqi.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/shiwaitianqi.png
new file mode 100644
index 0000000..a920e56
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/LogicIcon/shiwaitianqi.png
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 9d3cb3c..41b3be7 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 85da9ad..f8b2ea0 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 9113330..2543213 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -377,6 +377,14 @@
}
break;
+ case 4:
+ case 6:
+ case 9:
+ {
+ iconInt = 3;
+
+ }
+ break;
}
if (!iconIntValue.Contains(iconInt))
@@ -468,6 +476,12 @@
strIcon = "LogicIcon/selectTheFun.png";
}
break;
+ case 3:
+ {
+
+ strIcon = "LogicIcon/shiwaitianqi.png";
+ }
+ break;
case 11:
{
//鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
--
Gitblit v1.8.0