From 03b344bc7ea98aa6018a6cc11c0641594898a6e7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 10 四月 2023 18:08:52 +0800
Subject: [PATCH] 2023年04月10日18:08:23
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 11 +++++++----
HDL-ON_iOS/HDL-ON_iOS.csproj | 1 +
ys/Jars/hdl_ezvizsdk.aar | 0
DLL/IOS/EZSDK.IOS.dll | 0
HDL_ON/UI/MainPage.cs | 2 +-
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index 248f142..f6f0270 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 5cda6b8..886b32a 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1576,6 +1576,7 @@
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 4aa662a..aaaf1c7 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.6.6";
+ public static string VersionString = "1.7.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 221c195..afc8c39 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -194,7 +194,7 @@
}
else if (function.spk == SPK.VideoDoorLock)
{
- btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
+ btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
}
else if (function.spk == SPK.HvacCac)
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 37fa625..0a6aec7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -214,6 +214,7 @@
public void InitializationAndroidData(Action<bool> action)
{
bool isBool = true;
+ this.Loading.Start();
this.SunThread(() =>
{
try
@@ -226,7 +227,7 @@
{
//Token
isBool = false;
- this.ShowTip("鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken澶辫触銆�");
+ this.ShowTip("鑾峰彇钀ょ煶浜戝瓙璐﹀彿token澶辫触銆�");
return;
}
@@ -260,6 +261,7 @@
{
this.MainThread(() =>
{
+ this.Loading.Hide();
action?.Invoke(isBool);
});
}
@@ -393,6 +395,7 @@
/// </summary>
public string GetVideoDoorLockIcon(Comerom comerom)
{
+
if (comerom == Comerom.collect)
{
return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
@@ -542,13 +545,13 @@
collect,//鏀惰棌
room,//鎴块棿
push,//鎺ㄩ��
- sanfan,//涓夋柟
+ sanfan,//娣诲姞绗笁鏂硅澶�
}
#if __IOS__
IosIHdlInterface ezsdkDelegate;
/// <summary>
- /// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢ㄧ潃,娌℃湁鐗规畩鍚箟
+ /// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢�,娌℃湁鐗规畩鍚箟
/// </summary>
public class IosIHdlInterface : EZSDK.IOS.EZSDKDelegate
{
@@ -569,7 +572,7 @@
}
#else
/// <summary>
- /// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤鐫�,娌℃湁鐗规畩鍚箟
+ /// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤,娌℃湁鐗规畩鍚箟
/// </summary>
public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
{
diff --git a/ys/Jars/hdl_ezvizsdk.aar b/ys/Jars/hdl_ezvizsdk.aar
index 4ee84dd..1c6af32 100644
--- a/ys/Jars/hdl_ezvizsdk.aar
+++ b/ys/Jars/hdl_ezvizsdk.aar
Binary files differ
--
Gitblit v1.8.0