From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL_ON/DAL/Server/HttpUtil.cs | 12 +++---
HDL-ON_iOS/HDL-ON_iOS.csproj | 6 +-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 49 +++++++++++++-----------
DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll | 0
4 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index d824b75..c8ea8c3 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,32 +1,36 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="../../../../../../Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/src/Xamarin.iOS/ObjCRuntime/Runtime.cs">
- <Files>
- <File FileName="HDL_ON/DAL/Server/HttpUtil.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/DAL/Server/HttpServerRequestBase.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="130" Column="56" />
- <File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" Line="343" Column="36" />
- <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="94" Column="37" />
- <File FileName="../../../../../../Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/src/Xamarin.iOS/ObjCRuntime/Runtime.cs" Line="407" Column="1" />
- </Files>
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench>
<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" expanded="True" />
+ </Node>
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True" />
- <Node name="ThirdPartySdk" expanded="True">
- <Node name="ESOnVideo.cs" selected="True" />
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
+ <Node name="Server" expanded="True">
+ <Node name="NewApiRes.cs" selected="True" />
+ </Node>
+ <Node name="ThirdPartySdk" 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="FuntionControlView" expanded="True">
+ <Node name="Video" expanded="True" />
+ </Node>
</Node>
</Node>
- <Node name="Entity" expanded="True" />
- <Node name="UI" expanded="True" />
</Node>
- <Node name="Shared.IOS.LCVideoOnSDK" expanded="True">
- <Node name="NativeReferenceFolder" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True" />
</Node>
</Node>
</State>
@@ -40,12 +44,11 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
- <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/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/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" />
- <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" line="180" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/FhControlPage.cs" line="79" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/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/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
index 78a7649..7974ad9 100644
--- a/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
+++ b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
Binary files differ
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 71ba93e..f13d5ec 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -94,12 +94,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_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index a67833e..cbc3002 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";
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
/// <summary>
/// RegionMark
/// </summary>
@@ -153,12 +153,12 @@
{
urlHead = OnAppConfig.Instance.RequestHttpsHost;
}
- //string requestFullUrl = urlHead + apiPath;
+ string requestFullUrl = urlHead + apiPath;
- ////**************娴嬭瘯**************
- string requestFullUrl = GlobalRequestHttpsHost + apiPath;
- ////**************娴嬭瘯**************
+ //////**************娴嬭瘯**************
+ //string requestFullUrl = GlobalRequestHttpsHost + apiPath;
+ //////**************娴嬭瘯**************
RestClient client = new RestClient(requestFullUrl);
--
Gitblit v1.8.0