From 954202b30a4685177ace5189c4d835fcc7903e70 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 09 七月 2021 18:29:22 +0800
Subject: [PATCH] 2021-07-09 1.告警消息相关接口替换，改为河东管理
---
HDL_ON/Common/HDLCommon.cs | 10 +++++-----
DLL/IOS/EZSDK.IOS.dll | 0
.vs/HDL_APP_Project/xs/UserPrefs.xml | 27 ++++++++++++++-------------
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 10 +++++-----
4 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 90b7114..c38285b 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,26 +1,26 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/HDLCommon.cs">
<Files>
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="322" Column="27" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" Line="83" Column="17" />
- <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="63" Column="39" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" Line="11" Column="31" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="92" Column="53" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" Line="30" Column="46" />
- <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="636" Column="1" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="22" Column="95" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="627" Column="38" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoSend.cs" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
</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="Common" expanded="True">
+ <Node name="HDLCommon.cs" selected="True" />
+ </Node>
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
- </Node>
+ <Node name="Server" expanded="True" />
<Node name="ThirdPartySdk" expanded="True" />
</Node>
<Node name="UI" expanded="True">
@@ -33,6 +33,7 @@
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
</State>
</Pad>
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index fb2f1f7..9ec3766 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index af8827c..414077c 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -626,14 +626,14 @@
#if __IOS__
//iOS
//鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
- EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
+ EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
//1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
- EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
- EZSDK.IOS.EZSDK.SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
+ EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
+ EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
//2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
- EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken);
+ EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
- EZSDK.IOS.EZSDK.Go2EZvizMonitor();
+ EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
//EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
//info.de
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 19a9398..bcce120 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -158,15 +158,15 @@
{
//钀ょ煶鐚溂鍛煎彨
//鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
- EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
+ EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
//1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
- EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
+ EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
- EZSDK.IOS.EZSDK.SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, mESVideoInfo.HomeId);
+ EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, mESVideoInfo.HomeId);
//2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
- EZSDK.IOS.EZSDK.SetEZAccessToken(mESVideoInfo.Lc_AccessToken);
+ EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(mESVideoInfo.Lc_AccessToken);
//3.鎵撳紑瑙嗛鎾斁椤甸潰
- EZSDK.IOS.EZSDK.PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
}
else
--
Gitblit v1.8.0