From 8301df084faa8f43f4b9cb7f92088e5fd9e64524 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 15:41:53 +0800
Subject: [PATCH] 大华摄像头更新

---
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs |   66 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 45144a9..78a0c6a 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -233,34 +233,62 @@
                         doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
                     case SPK.IpCam_Imou:
+                        FunctionList.List.GetIpCamImouList();
+
+                        var waitPage = new Loading();
+                        MainPage.BaseView.AddChidren(waitPage);
+                        waitPage.Start("");
                         new System.Threading.Thread(() =>
                         {
-                            var http = new HttpServerRequest();
-                            var pack = http.GetLcSubAccountToken();
-                            if (pack.Code == StateCode.SUCCESS)
+                            try
                             {
-                                if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+                                var http = new HttpServerRequest();
+                                var pack = http.GetLcSubAccountToken();
+                                if (pack.Code == StateCode.SUCCESS)
+                                {
+                                    if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+                                    {
+                                        Application.RunOnMainThread(() =>
+                                        {
+                                            new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触");
+                                        });
+                                    }
+#if __ANDROID__
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        try
+                                        {
+                                            Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+                                            Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
+                                            Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+                                            Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
+                                        }
+                                        catch (Exception ex)
+                                        {
+
+                                        }
+                                    });
+#endif
+                                }
+                                else
                                 {
                                     Application.RunOnMainThread(() =>
                                     {
-                                        new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触");
+                                        new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触({pack.Code})");
                                     });
                                 }
-                                Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
-                                Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
-                                Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
-                                Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
-                                Application.RunOnMainThread(() =>
-                                {
-                                    //Com.Utils.HdlToLcUtils.Instance.OpenActivity();
-                                    Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId,function.name);
-                                });
-                            }
-                            else
+                            }catch(Exception ex)
                             {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触({pack.Code})");
+                                MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
+                            }
+                            finally
+                            {
+                                Application.RunOnMainThread(() => {
+                                    if (waitPage != null)
+                                    {
+                                        waitPage.RemoveFromParent();
+                                        waitPage = null;
+                                    }
                                 });
                             }
                         })

--
Gitblit v1.8.0