From b07d4f6ffbbc942c2e00fbedee5203bbec8d52fb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 五月 2023 09:41:34 +0800
Subject: [PATCH] IOS门锁开锁二次确认弹窗，LC Sdk更新
---
DLL/Shared.IOS.dll | 0
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 5 ++---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 1 -
HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs | 2 +-
HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs | 1 +
DLL/Shared.Droid.dll | 0
6 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/DLL/Shared.Droid.dll b/DLL/Shared.Droid.dll
index a6fff16..19c36b0 100644
--- a/DLL/Shared.Droid.dll
+++ b/DLL/Shared.Droid.dll
Binary files differ
diff --git a/DLL/Shared.IOS.dll b/DLL/Shared.IOS.dll
index f149f02..7ee6e6b 100644
--- a/DLL/Shared.IOS.dll
+++ b/DLL/Shared.IOS.dll
Binary files differ
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 12a85bf..4bd3b61 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -238,10 +238,8 @@
doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
break;
case SPK.IpCam_Imou:
-
#if __IOS__
- if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null)
- {//鏈垵濮嬪寲鎽勫儚澶�
+ if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null){//鏈垵濮嬪寲鎽勫儚澶�
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
@@ -251,6 +249,7 @@
//璺宠浆澶у崕鎽勫儚澶�
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name, Shared.Application.currentVC);
+ Shared.Application.currentVC.NavigationController.NavigationBar.Hidden = false;
#else
FunctionList.List.GetIpCamImouList();
if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
diff --git a/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs b/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
index 24a238b..d15ddc9 100644
--- a/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
@@ -76,6 +76,7 @@
btnText.TextAlignment = TextAlignment.TopLeft;
btnText.TextColor = UI.CSS.CSS_Color.MainColor;
btnText.Text = textValue;
+ btnText.Enable = false;
#if __Android__
btnText.Foucs = false;
#endif
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 8443ee9..219f44d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -35,7 +35,6 @@
bodyView = this;
functionList = new List<Function>();
- throw new ArgumentNullException();
}
public void LoadPage(int titleId_out)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index a431833..8dd444b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -159,7 +159,7 @@
{ IsBackground = true }.Start();
function.trait_on_off.curValue = "off";
function.SetAttrState(FunctionAttributeKey.Percent, 0);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ var d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(function, d);
//CurtainAnimation(100);
--
Gitblit v1.8.0