From 48842fad1eeab086db62907e2694852658c61b99 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 四月 2023 13:54:00 +0800
Subject: [PATCH] 2023年04月12日13:53:35

---
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 0a6aec7..5bc4b2f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -16,6 +16,7 @@
     /// </summary>
     public class CommonMethod
     {
+        
         private Loading loading;
         /// <summary>
         /// 璁板綍褰撳墠鐣岄潰绱㈠紩鍊�
@@ -127,11 +128,12 @@
         /// <param name="isDialog">鏄惁闇�瑕佸脊妗�</param>
         public void SkipRTVActivity(string deviceSerial, string deviceId, string spk, bool isDialog)
         {
-
+            this.Loading.Start();
             this.InitializationAndroidData((isEzChildAccessToken) =>
             {
                 this.MainThread(() =>
                 {
+                    this.Loading.Hide();
                     if (isDialog)
                     {
                         Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
@@ -214,7 +216,7 @@
         public void InitializationAndroidData(Action<bool> action)
         {
             bool isBool = true;
-            this.Loading.Start();
+            //this.Loading.Start();
             this.SunThread(() =>
             {
                 try
@@ -227,14 +229,21 @@
                         {
                             //Token
                             isBool = false;
-                            this.ShowTip("鑾峰彇钀ょ煶浜戝瓙璐﹀彿token澶辫触銆�");
+                            //this.ShowTip("鑾峰彇钀ょ煶浜戝瓙璐﹀彿token澶辫触銆�");
                             return;
                         }
+
+                        string appKey = "1aa98a90489b4838b966b57018b4b04b";//姝e紡鏈嶅姟鍣�
+                        if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
+                        {
+                            appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
+                        }
+
 
 #if __IOS__
                         //iOS
                         //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
-                        EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
+                        EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey(appKey, appKey);
                         //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
                         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);
@@ -246,7 +255,8 @@
                         //info.de
                         //EZSDK.IOS.EZSDK.Play(info);
 #else
-                            HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 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);
 
 #endif
 
@@ -261,7 +271,7 @@
                 {
                     this.MainThread(() =>
                     {
-                        this.Loading.Hide();
+                        //this.Loading.Hide();
                         action?.Invoke(isBool);
                     });
                 }
@@ -398,11 +408,11 @@
 
             if (comerom == Comerom.collect)
             {
-                return "FunctionIcon/DoorLock/VideoDoorLockOpen.png";
+                return "FunctionIcon/DoorLock/VideoDoorLockOpen1.png";
             }
             else
             {
-                return "FunctionIcon/DoorLock/VideoDoorlockClose.png";
+                return "FunctionIcon/DoorLock/VideoDoorlockClose1.png";
             }
 
         }

--
Gitblit v1.8.0