From 503be86621ef8fdc69f0a53cd3e0156b274c418e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 21 十月 2021 11:14:58 +0800
Subject: [PATCH] 1
---
HDL_ON/DAL/Server/HttpUtil.cs | 4 +-
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 2
.vs/HDL_APP_Project/xs/UserPrefs.xml | 56 +++++++++++++++++++--------
HDL_ON/UI/UI1-Login/LoginPage.cs | 10 +++--
HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs | 2
5 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 74e0071..0eb9b07 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,29 +1,51 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.3E789E7C-7F16-463D-8CAD-6AA84628D6C8" />
- <MonoDevelop.Ide.Workbench>
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/Utlis.cs">
<Files>
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="253" Column="41" />
- <File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/Entity/Function/Scene.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
- <File FileName="HDL_ON/UI/MainPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" />
- <File FileName="HDL_ON/Entity/Function/SecurityAlarm.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="20" Column="61" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs" Line="138" Column="39" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="265" Column="24" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="506" Column="21" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="52" Column="6" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="509" Column="46" />
+ <File FileName="HDL_ON/Common/Utlis.cs" Line="118" Column="39" />
</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="Utlis.cs" selected="True" />
+ </Node>
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
- </Node>
+ <Node name="Mqtt" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
<Node name="UI1-Login" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="2-Classification" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Energy" expanded="True" />
+ <Node name="EnvironmentalScience" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Assets" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="FunctionIcon" expanded="True">
+ <Node name="Icon" expanded="True">
+ <Node name="HomeIcon" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True" />
@@ -38,8 +60,8 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" line="42" column="1" />
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index d2292ee..cf4a06a 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/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 9f6c480..911e6d2 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -233,13 +233,15 @@
//etAccount.Text = "tf@smarttech.com.ua";
etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
//etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
- //etAccount.Text = "18402017839";//wjc
+ etAccount.Text = "18402017839";//wjc
//etAccount.Text = "13430286286";//cwc
- etAccount.Text = "13709260805";
- etAccount.Text = "support5@hdlchina.com.cn";
+ //etAccount.Text = "13709260805";
+ //etAccount.Text = "support5@hdlchina.com.cn";
+ //etAccount.Text = "13375012441";
+ etAccount.Text = "info@smartlife-ks.com";
}
b = !b;
- etPassword.Text = "A85521566";
+ etPassword.Text = "123456";
if(etAccount.Text == "fslcjm5@163.com")
{
etPassword.Text = "a123456";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
index 5675b0c..b39f8be 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs
@@ -310,7 +310,7 @@
TextColor = CSS_Color.PromptingColor2,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
+ Text = Language.StringByID(StringId.month),//DateTime.Now.Month.ToString() +
};
showDataTypeView.AddChidren(btnShowHistroyData_Month);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 996a4e5..de2bdaa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -130,7 +130,7 @@
TextColor = CSS_Color.PromptingColor2,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
+ Text = Language.StringByID(StringId.month),//DateTime.Now.Month.ToString() +
};
showDataTypeView.AddChidren(btnShowHistroyData_Month);
#endregion
--
Gitblit v1.8.0