From 831d75f92e2e828a04ea096247e729b44852c1ed Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 06 六月 2021 16:17:33 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 60 +++++++++++---------
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/DAL/Server/HttpServerRequest.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs | 10 +++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 61 +++++++++----------
HDL_ON/HDL_ON.projitems | 1
6 files changed, 76 insertions(+), 62 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 152b3f5..922e5e6 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,46 +1,40 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs">
<Files>
<File FileName="HDL_ON/Common/R.cs" Line="9" Column="19" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1905" Column="12" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="622" Column="34" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs" Line="152" Column="29" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" Line="174" Column="66" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="1" Column="1" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
<File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="10" Column="10" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" Line="163" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs" Line="89" Column="48" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="148" Column="50" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="342" Column="53" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="68" Column="30" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs" Line="9" Column="40" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" Line="143" Column="28" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs" Line="48" Column="56" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="845" Column="50" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1137" Column="45" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="218" Column="39" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/SenesorMegahealthManagerPage.cs" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/ArmSensorHistroyPaging.cs" />
+ <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SenesorMegahealthPage.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
+ <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="681" Column="5" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="UI" expanded="True">
- <Node name="UI2" expanded="True">
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="AddDevice" expanded="True">
- <Node name="SenesorMegahealth" expanded="True" />
- </Node>
- <Node name="AddFunction" expanded="True" />
- <Node name="PirDevice" expanded="True">
- <Node name="PirSend.cs" selected="True" />
- </Node>
- </Node>
+ <Node name="DAL" expanded="True">
+ <Node name="Mqtt" expanded="True">
+ <Node name="MqttClient.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -62,6 +56,9 @@
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1857" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="119" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="678" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 6d7f11a..bac8ac7 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1859,7 +1859,7 @@
d.Add("extDevId", extDevId);
var requestJson = HttpUtil.GetSignRequestJson(d);
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_IndependentRegister3TyDevcie, requestJson);
}
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 2b7a612..a3d47c1 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 5bac84d..6145835 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -412,6 +412,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\MiniRemoteControl\AddThirdPartyDeviceMenuListPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\SenesorMegahealth\SenesorMegahealthManagerPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmSensor\SenesorMegahealthPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\IrFanPage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 79ccdd8..1883317 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -27,45 +27,51 @@
/// </summary>
public static void LoadEvent_RefreshEnvirIndoorHumi()
{
- if (bodyView != null)
+ Application.RunOnMainThread(() =>
{
- var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
- double humiTotalValues = 0;
- foreach (var temp in humiSensorList)
+ if (bodyView != null)
{
- double humiValue = 0;
- double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out humiValue);
- humiTotalValues += humiValue;
+ var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
+ double humiTotalValues = 0;
+ foreach (var temp in humiSensorList)
+ {
+ double humiValue = 0;
+ double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out humiValue);
+ humiTotalValues += humiValue;
+ }
+ if (humiTotalValues > 0)
+ {
+ bodyView.btnIndoorHumiValues.Text = "/" + humiTotalValues + "%";
+ }
+ bodyView.btnIndoorHumiValues.Width = bodyView.btnIndoorHumiValues.GetTextWidth();
}
- if (humiTotalValues > 0)
- {
- bodyView.btnIndoorHumiValues.Text = "/" + humiTotalValues + "%";
- }
- bodyView.btnIndoorHumiValues.Width = bodyView.btnIndoorHumiValues.GetTextWidth();
- }
+ });
}
/// <summary>
/// 鏇存柊瀹ゅ唴浼犳劅鍣ㄦ暟鎹�-鏅氱偣
/// </summary>
public static void LoadEvent_RefreshEnvirIndoorTemp()
- {
- if (bodyView != null)
+ {
+ Application.RunOnMainThread(() =>
{
- var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
- double tempTotalValues = 0;
- foreach (var temp in tempSensorList)
+ if (bodyView != null)
{
- double tempValue = 0;
- double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out tempValue);
- tempTotalValues += tempValue;
+ var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
+ double tempTotalValues = 0;
+ foreach (var temp in tempSensorList)
+ {
+ double tempValue = 0;
+ double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out tempValue);
+ tempTotalValues += tempValue;
+ }
+ if (tempTotalValues > 0)
+ {
+ bodyView.btnIndoorTempValues.Text = "/" + tempTotalValues + "掳";
+ }
+ bodyView.btnIndoorTempValues.Width = bodyView.btnIndoorTempValues.GetTextWidth();
}
- if (tempTotalValues > 0)
- {
- bodyView.btnIndoorTempValues.Text = "/" + tempTotalValues + "掳";
- }
- bodyView.btnIndoorTempValues.Width = bodyView.btnIndoorTempValues.GetTextWidth();
- }
+ });
}
/// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
new file mode 100644
index 0000000..ab85ff9
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -0,0 +1,10 @@
+锘縰sing System;
+namespace HDL_ON.UI.UI2.FuntionControlView.Electrical
+{
+ public class IrFanPage
+ {
+ public IrFanPage()
+ {
+ }
+ }
+}
--
Gitblit v1.8.0