From 90d4fdb42a7f4818897ff76def0a151a99d2d9e1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 十一月 2023 13:56:14 +0800
Subject: [PATCH] 2.4.2Google
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 48 ++++++++++++++++--------------------------------
1 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 8f2ec34..1e761e9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -6,7 +6,6 @@
#if __IOS__
using Foundation;
#else
-using Com.Videogo.Hdl;
#endif
namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
@@ -16,7 +15,7 @@
/// </summary>
public class CommonMethod
{
-
+
private Loading loading;
/// <summary>
/// 璁板綍褰撳墠鐣岄潰绱㈠紩鍊�
@@ -76,16 +75,6 @@
EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
#else
- HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list);
- HDLEzvizSdk.SetAddCallback(new
- AndroidIHdlInterface((isBool, serials) =>
- {
- if (isBool)
- {
- this.GetYingshiDeviceList(serials);
- }
-
- }));
#endif
});
@@ -167,7 +156,6 @@
EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
#else
- HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk,"");
#endif
@@ -187,7 +175,6 @@
EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);
#else
- HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk,msgId);
#endif
@@ -206,7 +193,6 @@
//鎵撳紑钀ょ煶鍘嗗彶璁板綍鐣岄潰
EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView(deviceId);
#else
- HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
#endif
});
});
@@ -226,7 +212,6 @@
//鎵撳紑钀ょ煶涓存椂瀵嗙爜鐣岄潰
EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
#else
- HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif
});
});
@@ -256,10 +241,10 @@
}
string appKey = "1aa98a90489b4838b966b57018b4b04b";//姝ｅ紡鏈嶅姟鍣�
- //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
- //{
- // appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
- //}
+ //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ //{
+ // appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
+ //}
#if __IOS__
@@ -278,7 +263,6 @@
//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);
#endif
@@ -310,8 +294,7 @@
if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;
#if __IOS__
#else
- HDLEzvizSdk.Instance.SetHomeId(home.id);
-
+
#endif
}
@@ -355,7 +338,7 @@
{
return;
}
- if ( expantContent.spk != SPK.VideoDoorLock)
+ if (expantContent.spk != SPK.VideoDoorLock)
{
return;
}
@@ -383,9 +366,10 @@
//寮�闂ㄦ帹閫�
this.UpdateDoorLockState(PushMessageType.Prompt);
}
- }catch(Exception ex)
+ }
+ catch (Exception ex)
{
-
+
}
});
@@ -500,7 +484,7 @@
}
-
+
#region ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
/// <summary>
/// 瀛愮嚎绋�
@@ -585,7 +569,7 @@
});
}
-
+
#endregion
/// <summary>
/// 寮规绫诲瀷
@@ -634,12 +618,12 @@
/// <summary>
/// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤,娌℃湁鐗规畩鍚箟
/// </summary>
- public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
+ public class AndroidIHdlInterface : Java.Lang.Object//, IHdlInterface
{
- Action<bool,string> mAction;
+ Action<bool, string> mAction;
Action<string> mDoorlockAnswer;
- public AndroidIHdlInterface(Action<bool,string> action)
+ public AndroidIHdlInterface(Action<bool, string> action)
{
mAction = action;
}
@@ -650,7 +634,7 @@
/// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
public void AddCallback(bool p0, string p1)
{
- mAction?.Invoke(p0,p1);
+ mAction?.Invoke(p0, p1);
}
public void DoorlockAnswer(string p0)
--
Gitblit v1.8.0