From b08e205f2ca465a80988fb72286481b8ba5b92ef Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 七月 2021 14:18:59 +0800
Subject: [PATCH] 代码合并整理
---
HDL_APP_Project.sln | 14 ---
HDL-ON_iOS/HDL-ON_iOS.csproj | 6
.vs/HDL_APP_Project/xs/UserPrefs.xml | 72 ++++++++----------
HDL_ON/HDL_ON.projitems | 7 -
HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs | 132 +++++++++++++++++++++++++++++++++
5 files changed, 167 insertions(+), 64 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index f6f3f8d..224fa0f 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,61 +1,53 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/Function/Scene.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs">
<Files>
<File FileName="HDL_ON/Entity/Function/Function.cs" Line="1193" Column="45" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="141" Column="30" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="304" Column="1" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="367" Column="51" />
- <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" Line="15" Column="6" />
- <File FileName="HDL_ON/Entity/Enumerative/Command.cs" Line="1713" Column="27" />
- <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" Line="631" Column="50" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" Line="855" Column="46" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" Line="20" Column="41" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneCatchFunctionListPage.cs" Line="170" Column="82" />
- <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="440" Column="23" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
+ <File FileName="HDL_ON/Entity/Enumerative/MyEnum.cs" />
+ <File FileName="HDL_ON/Entity/Enumerative/Command.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneAddPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/CatchSceneCatchFunctionListPage.cs" />
+ <File FileName="HDL_ON/Entity/Function/Scene.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="566" Column="15" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs" Line="13" Column="10" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="DAL" expanded="True">
- <Node name="DriverLayer" expanded="True" />
- <Node name="Mqtt" expanded="True" />
- <Node name="Server" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True">
- <Node name="Enumerative" expanded="True" />
- <Node name="Function" expanded="True">
- <Node name="Scene.cs" selected="True" />
- </Node>
- </Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
<Node name="3-Intelligence" expanded="True">
- <Node name="Scene" expanded="True" />
+ <Node name="Automation" expanded="True">
+ <Node name="LogicView" expanded="True">
+ <Node name="TopView.cs" selected="True" />
+ </Node>
+ </Node>
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="AddDevice" expanded="True">
+ <Node name="MiniRemoteControl" expanded="True" />
+ </Node>
</Node>
<Node name="FuntionControlView" expanded="True">
- <Node name="1ContorlPage" expanded="True" />
- <Node name="FoolHeating" expanded="True" />
- <Node name="Light" expanded="True" />
- <Node name="Music" expanded="True" />
+ <Node name="Energy" expanded="True" />
</Node>
</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="Other" expanded="True" />
- <Node name="Resources" expanded="True" />
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
@@ -66,13 +58,13 @@
<String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
+ <String>../LCOpenSDK_iOS/iOS/Xamarin/Shared.IOS.LCVideoOnSDK/Shared.IOS.LCVideoOnSDK/Shared.IOS.LCVideoOnSDK.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" line="79" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" line="44" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 6d7a729..15f7215 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -95,12 +95,12 @@
<Reference Include="Shared.IOS">
<HintPath>..\DLL\Shared.IOS.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS.LCVideoOnSDK">
- <HintPath>..\..\LCOpenSDK_iOS\iOS\Xamarin\Shared.IOS.LCVideoOnSDK\Shared.IOS.LCVideoOnSDK\bin\Release\Shared.IOS.LCVideoOnSDK.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.ESVideoOnSDK">
<HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS.LCVideoOnSDK">
+ <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
diff --git a/HDL_APP_Project.sln b/HDL_APP_Project.sln
index 2c65910..6e5610f 100644
--- a/HDL_APP_Project.sln
+++ b/HDL_APP_Project.sln
@@ -9,8 +9,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Blufi", "HdlBluWi\Blufi.csproj", "{2DDF4C3C-6998-432E-9F43-6786D82F0630}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.LCVideoOnSDK", "..\LCOpenSDK_iOS\iOS\Xamarin\Shared.IOS.LCVideoOnSDK\Shared.IOS.LCVideoOnSDK\Shared.IOS.LCVideoOnSDK.csproj", "{D78A9ED7-34A3-416F-B645-7475E2E2DE93}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -57,17 +55,5 @@
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|iPhone.Build.0 = Debug|Any CPU
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhone.ActiveCfg = Release|Any CPU
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhone.Build.0 = Release|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Release|Any CPU.Build.0 = Release|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Debug|iPhone.Build.0 = Debug|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Release|iPhone.ActiveCfg = Release|Any CPU
- {D78A9ED7-34A3-416F-B645-7475E2E2DE93}.Release|iPhone.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 43f2613..7f0ab9d 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -124,7 +124,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Curtain\RollingShutterPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Curtain\CurtainModulePageBLL.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Energy\EnergyMainPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Energy\EchartsOption_Energy.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EnvironmentalSciencePageBLL.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EnvironmentalSciencePage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EchartsOption_Pie.cs" />
@@ -250,7 +249,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\RoomsManagementPageBLL.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferInputPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferConfirmPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\AdminMigrationInputPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\AdminMigrationConfirmPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferUserConfirmPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\AddRoom\AddRoomPage.cs" />
@@ -274,11 +272,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\UnlockSetting\AppUnlockSettingsPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\UnlockSetting\AppUnlockSettingsPageBLL.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\UnlockSetting\AppUnlockPasswordPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection3Page.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection1Page.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection2Page.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection4Page.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddThirdPartyDeviceMenuListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\FunctionIntroductionPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\AboutOnPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\ComplaintsPage.cs" />
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
new file mode 100644
index 0000000..09e746e
--- /dev/null
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AirQuality.cs
@@ -0,0 +1,132 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared;
+namespace HDL_ON.UI.UI2.Intelligence.Automation
+{
+ public class AirQuality : FrameLayout
+ {
+ public AirQuality()
+ {
+ Tag = "Logic";
+ }
+ public void Show()
+ {
+ #region 鐣岄潰甯冨眬
+ LogicView.TopView topView = new LogicView.TopView();
+ topView.frameLayout.Height = Application.GetRealHeight(64 + 20);
+ this.AddChidren(topView.FLayoutView());
+ topView.topNameBtn.TextID = StringId.selectionCondition;
+ topView.Location();
+ topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
+ {
+ RemoveFromParent();
+ };
+
+ FrameLayout viewLayout = new FrameLayout
+ {
+ Y = Application.GetRealHeight(64 + 20),
+ Width = Application.GetRealWidth(LogicView.TextSize.view375),
+ Height = Application.GetRealHeight(LogicView.TextSize.view667 - 64 - 20),
+ BackgroundColor = CSS.CSS_Color.viewMiddle,
+ };
+ this.AddChidren(viewLayout);
+ #endregion
+
+ var list = new List<string> {
+ Language.StringByID(StringId.kongqiyou),
+ Language.StringByID(StringId.kongqiliang),
+ Language.StringByID(StringId.kongqicha),
+ };
+ for (int i = 0; i < list.Count; i++)
+ {
+ 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());
+
+ view.btnClick.MouseUpEventHandler += (sen, e) =>
+ {
+ string value = "";
+ string text = view.btnClick.Tag.ToString();
+ if (text == Language.StringByID(StringId.kongqiyou))
+ {
+ //浼�
+ value = "excellent";
+ }
+ else if (text == Language.StringByID(StringId.kongqiliang))
+ {
+ //鑹�
+ value = "good";
+ }
+ else if (text == Language.StringByID(StringId.kongqicha))
+ {
+ //宸�
+ value = "poor";
+ }
+ AddDic(value);
+ };
+ }
+
+ }
+ /// <summary>
+ /// 灏佽鏁版嵁
+ /// </summary>
+ /// <param name="value"></param>
+ private void AddDic(string value)
+ {
+ Input input = new Input();
+ input.sid = LogicMethod.NewSid();
+ input.condition_type = "9";
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", "air_quality");
+ LogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.dictionary(dic, "data_type", "string");
+ LogicMethod.dictionary(dic, "value", value);
+ input.condition.Add(dic);
+ AddCondition(input);
+ }
+ /// <summary>
+ /// 娣诲姞鏉′欢
+ /// </summary>
+ /// <param name="input"></param>
+ private void AddCondition(Input input)
+ {
+ ///璁板綍绱㈠紩鍊�
+ int index = -1;
+ for (var i = 0; i < Logic.currlogic.input.Count; i++)
+ {
+ var condition_type = Logic.currlogic.input[i].condition_type;
+ if (condition_type == "9")
+ {
+ ///鎵惧埌鏍囪绱㈠紩锛岄��鍑哄惊鐜綋
+ index = i;
+ break;
+ }
+ }
+ if (index != -1)
+ {
+ //绉婚櫎鏃ф暟鎹�
+ Logic.currlogic.input.RemoveAt(index);
+ //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�
+ Logic.currlogic.input.Insert(index, input);
+ }
+ else
+ {
+ Logic.currlogic.input.Add(input);
+ }
+
+ LogicMethod.RemoveAllView();
+ AddLogic addLogic = new AddLogic();
+ MainPage.BasePageView.AddChidren(addLogic);
+ addLogic.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ }
+ }
+}
--
Gitblit v1.8.0