From f982455916297ab07379d902a7f15b7a7a867c94 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 20 十月 2021 09:19:20 +0800
Subject: [PATCH] 1
---
HDL-ON_iOS/Info.plist | 4 ++--
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 19 ++++++++++++-------
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 9e98fbd..74e0071 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,6 +1,6 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.3E789E7C-7F16-463D-8CAD-6AA84628D6C8" />
+ <MonoDevelop.Ide.Workbench>
<Files>
<File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="253" Column="41" />
<File FileName="HDL-ON_iOS/Info.plist" />
@@ -9,16 +9,21 @@
<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" Line="10" Column="9" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="21" Column="61" />
+ <File FileName="HDL_ON/Entity/Function/SecurityAlarm.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="20" Column="61" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL_ON" expanded="True" selected="True">
+ <Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="HttpUtil.cs" selected="True" />
+ </Node>
+ </Node>
+ <Node name="UI" expanded="True">
+ <Node name="UI1-Login" expanded="True" />
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True" />
@@ -33,7 +38,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index e9b73ce..763bdef 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.202110191</string>
+ <string>1.2.202110201</string>
<key>CFBundleVersion</key>
- <string>1.2.10191</string>
+ <string>1.2.10201</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index cf4a06a..d2292ee 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>
--
Gitblit v1.8.0