From 36db32b8c8f777f2d4f973a24502ba1b361b64f9 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 06 六月 2024 11:58:52 +0800
Subject: [PATCH] 萤石Sdk更新，活动检测界面2次打开的问题修复，动态传入APPKEY
---
HDL-ON_Android/HDL-ON_Android.csproj | 6 +++---
HDL-ON_iOS/Info.plist | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 3 ++-
HDL_ON/Common/HDLCommon.cs | 3 ++-
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 2 +-
DLL/Android/HdlEzvizDroid.dll | 0
HDL_ON/UI/MainPage.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | 6 ------
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 3 ++-
HDL_ON/Entity/Function/Sensor.cs | 4 ++++
11 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/DLL/HdlEzvizDroid.dll b/DLL/Android/HdlEzvizDroid.dll
similarity index 91%
rename from DLL/HdlEzvizDroid.dll
rename to DLL/Android/HdlEzvizDroid.dll
index 6e4edec..0f2639a 100644
--- a/DLL/HdlEzvizDroid.dll
+++ b/DLL/Android/HdlEzvizDroid.dll
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 39c105f..5c1479b 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -192,12 +192,12 @@
<Reference Include="Shared.Droid">
<HintPath>..\DLL\Android\Shared.Droid.dll</HintPath>
</Reference>
- <Reference Include="HdlEzvizDroid">
- <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath>
- </Reference>
<Reference Include="Shared.Droid.HDLLinphone">
<HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
+ <Reference Include="HdlEzvizDroid">
+ <HintPath>..\DLL\Android\HdlEzvizDroid.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 136f2cf..61b982d 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@
<key>CFBundleName</key>
<string>On Pro</string>
<key>CFBundleShortVersionString</key>
- <string>2.4.5</string>
+ <string>2.4.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>2.4.5</string>
+ <string>2.4.6</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixinULAPI</string>
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 9e8aee9..d99e10b 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -772,7 +772,8 @@
((BaseActivity)Shared.Application.Activity).SetPermission(result =>
{
//2023骞�03鏈�29鏃�13:08:35 淇敼
- Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
+ Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id,
+ HttpUtil.APP_KEY, HttpUtil.SECRET_KEY);
Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
//if (result)
//{
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index cd66d30..262fad1 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -19,8 +19,8 @@
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- const string APP_KEY = "HDL-HOME-APP";
- const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
+ public const string APP_KEY = "HDL-HOME-APP";
+ public const string SECRET_KEY = "CPL345bn28gHnvi9G4tYbq3cTYkiHC";
//public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 88dfbdf..c7174a6 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -291,7 +291,8 @@
{
var ezChildAccessToken = result.Data.ToString();
- Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
+ Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id,
+ HttpUtil.APP_KEY, HttpUtil.SECRET_KEY);
Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,
mESVideoInfo.Lc_DeviceId, mESVideoInfo.DeviceSerial, mESVideoInfo.spk, mESVideoInfo.msgId);
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 51e0716..b86e111 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -505,6 +505,10 @@
else
level = 3;
break;
+ default:
+ level = 1;
+ break;
+
}
return level;
}
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 89db532..b56522b 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.4.5";
+ public static string VersionString = "2.4.6";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 0d20f45..4fdd6fa 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -727,7 +727,7 @@
{
btnAddIcon.MouseUpEventHandler = (sender, e) =>
{
- if (btnSecurityTitle.IsSelected)
+ if (btnSecurityTitle != null && btnSecurityTitle.IsSelected)
{
return;
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 8f2ec34..e9393fd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -278,7 +278,8 @@
//EZSDK.IOS.EZSDK.Play(info);
#else
- HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, appKey, 1, DB_ResidenceData.Instance.CurrentRegion.id);
+ HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, appKey, 1, DB_ResidenceData.Instance.CurrentRegion.id,
+ HttpUtil.APP_KEY, HttpUtil.SECRET_KEY);
#endif
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
index c21f027..d86a322 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -648,11 +648,5 @@
return false;
}
-
-
-
-
}
-
-
}
--
Gitblit v1.8.0