From 3c8f41f50076a3b904705ef9f94d1a827ecd8c52 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 15:43:19 +0800
Subject: [PATCH] 2021-8-28-4
---
HDL_ON/Common/HDLCommon.cs | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 77ed877..955fb51 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -627,14 +627,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
@@ -648,18 +648,25 @@
{
if (b)
{
- Android.Content.Intent intent = new Android.Content.Intent();
- var bundle = new Android.OS.Bundle();
- //浼犻�抧ame鍙傛暟涓簍inyphp
- bundle.PutString("EzChildAccessToken", ezChildAccessToken);
- bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
- bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
- bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
- bundle.PutInt("Platform", 1);
- bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
- intent.PutExtras(bundle);
- intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
- Shared.Application.Activity.StartActivity(intent);
+ ((BaseActivity)Shared.Application.Activity).SetPermission(result =>
+ {
+ if(result)
+ {
+ Android.Content.Intent intent = new Android.Content.Intent();
+ var bundle = new Android.OS.Bundle();
+ //浼犻�抧ame鍙傛暟涓簍inyphp
+ bundle.PutString("EzChildAccessToken", ezChildAccessToken);
+ bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
+ bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
+ bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
+ bundle.PutInt("Platform", 1);
+ bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ intent.PutExtras(bundle);
+ intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+ Shared.Application.Activity.StartActivity(intent);
+ }
+ }, "android.permission.RECORD_AUDIO");
+
}
});
#endif
--
Gitblit v1.8.0