From 28af8fe24b23a958d365e40789dcf061e45056ad Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 22 九月 2023 11:25:16 +0800
Subject: [PATCH] 删除专线
---
OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml | 188 +++++++++++++++++++++++-----------------------
OnPro/HDL_ON/DAL/Server/HttpUtil.cs | 2
OnPro/HDL_ON/DAL/Server/NewApiRes.cs | 6
OnPro/HDL_ON/Common/OnAppConfig.cs | 2
4 files changed, 98 insertions(+), 100 deletions(-)
diff --git a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
index dbef2a9..81b5916 100644
--- a/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/OnPro/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,98 +1,9 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Mqtt/MqttClient.cs">
- <Files>
- <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferInputPage.cs" />
- <File FileName="HDL_ON/UI/MainPage.cs" />
- <File FileName="HDL_ON/UI/UI2/UserPage.cs" />
- <File FileName="HDL_ON/Common/R.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1128" Column="109" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" />
- <File FileName="HDL-ON_Android/Resources/xml/file_paths.xml" />
- <File FileName="HDL-ON_Android/Resources/values/ic_launcher_background.xml" />
- <File FileName="HDL-ON_Android/Resources/values/dimens.xml" />
- <File FileName="HDL-ON_Android/Resources/values/colors.xml" />
- <File FileName="HDL-ON_Android/Resources/values/styles.xml" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushFirmBroadcast.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" />
- <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" />
- <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="180" Column="58" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" />
- <File FileName="HDL_ON/Entity/Function/InverterInfo.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" />
- <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Android/Xamarin.Android.Common.targets" />
- <File FileName="HDL-ON_Android/SplashActivity.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="920" Column="1" />
- </Files>
- <Pads>
- <Pad Id="ProjectPad">
- <State name="__root__">
- <Node name="HDL_APP_Project" selected="True">
- <Node name="HDL_ON">
- <Node name="DAL" expanded="True">
- <Node name="Mqtt" expanded="True" />
- <Node name="Server" expanded="True" />
- </Node>
- <Node name="Entity" expanded="True" />
- <Node name="UI" expanded="True">
- <Node name="BindingResidence" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="2-Classification" expanded="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>revertObj.Data.ToString()</Value>
- </State>
- </Pad>
- </Pads>
- </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__Android.HideInfoBar="True" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
<MultiItemStartupConfigurations />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__iOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.13498F66-393A-4EBD-AF80-526AEAE54F80" />
+ <Xamarin.Addins.Core.Project ActiveDebugTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs" line="326" column="1" />
@@ -164,10 +75,97 @@
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI1-Login/SelectServerDialog.cs" relfile="HDL_ON/UI/UI1-Login/SelectServerDialog.cs" line="150" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" line="50" column="1" />
<Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="237" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="920" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/Projcect/RongAn2/OnPro/HDL_ON/DAL/Server/HttpServerRequest.cs" relfile="HDL_ON/DAL/Server/HttpServerRequest.cs" line="1126" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.MonoDroid LastDeploySdkVersion="13.2.1.2" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__iOS.HideInfoBar="True" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.13498F66-393A-4EBD-AF80-526AEAE54F80" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android Xamarin.HotReload.WrongLinkerErrorInfoBar.HDL-ON__Android.HideInfoBar="True" PreferredExecutionTarget="Android.SelectDevice" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/UdpSocket.cs">
+ <Files>
+ <File FileName="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferInputPage.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/UserPage.cs" />
+ <File FileName="HDL_ON/Common/R.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/RegisterPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" />
+ <File FileName="HDL-ON_Android/Resources/xml/file_paths.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/ic_launcher_background.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/dimens.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/colors.xml" />
+ <File FileName="HDL-ON_Android/Resources/values/styles.xml" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushOpenClickActivity.cs" />
+ <File FileName="HDL-ON_Android/Other/JPush/JPushFirmBroadcast.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" />
+ <File FileName="HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs" />
+ <File FileName="HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs" />
+ <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" />
+ <File FileName="HDL_ON/Entity/Function/InverterInfo.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs" />
+ <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" />
+ <File FileName="../../../../../../Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Android/Xamarin.Android.Common.targets" />
+ <File FileName="HDL-ON_Android/SplashActivity.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" />
+ <File FileName="HDL_ON/Entity/MyEnum.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
+ <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" Line="29" Column="10" />
+ <File FileName="HDL_ON/DAL/DriverLayer/CRC.cs" />
+ </Files>
+ <Pads>
+ <Pad Id="ProjectPad">
+ <State name="__root__">
+ <Node name="HDL_APP_Project" expanded="True">
+ <Node name="HDL_ON">
+ <Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True">
+ <Node name="UdpSocket.cs" selected="True" />
+ </Node>
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True" />
+ <Node name="UI" expanded="True">
+ <Node name="BindingResidence" expanded="True" />
+ <Node name="UI1-Login" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </State>
+ </Pad>
+ </Pads>
+ </MonoDevelop.Ide.Workbench>
</Properties>
\ No newline at end of file
diff --git a/OnPro/HDL_ON/Common/OnAppConfig.cs b/OnPro/HDL_ON/Common/OnAppConfig.cs
index 884c037..5c55ece 100644
--- a/OnPro/HDL_ON/Common/OnAppConfig.cs
+++ b/OnPro/HDL_ON/Common/OnAppConfig.cs
@@ -80,7 +80,7 @@
/// <summary>
/// 璐﹀彿娉ㄥ唽鏈嶅姟鍣ㄤ俊鎭�
/// </summary>
- public string RequestHttpsHost = "https://china.hdlcontrol.com";
+ public string RequestHttpsHost = "https://china-gateway.hdlcontrol.com";
/// <summary>
///
/// </summary>
diff --git a/OnPro/HDL_ON/DAL/Server/HttpUtil.cs b/OnPro/HDL_ON/DAL/Server/HttpUtil.cs
index 3b93a4b..0eb6d1e 100644
--- a/OnPro/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/OnPro/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,7 +18,7 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";//"https://china-gateway.hdlcontrol.com";
//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "CWNHXZKB";
const string SECRET_KEY = "CWNHXZKRCWNHXZLH";
diff --git a/OnPro/HDL_ON/DAL/Server/NewApiRes.cs b/OnPro/HDL_ON/DAL/Server/NewApiRes.cs
index d48aa6a..8a88c0b 100644
--- a/OnPro/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/OnPro/HDL_ON/DAL/Server/NewApiRes.cs
@@ -44,9 +44,9 @@
[System.Serializable]
public class GlobalRegionListRes
{
- public string regionId;
- public string regionName;
- public string regionUrl;
+ public string regionId = "100000000000000001";
+ public string regionName = "HDL China";
+ public string regionUrl = "https://china-gateway.hdlcontrol.com";
}
/// <summary>
--
Gitblit v1.8.0