From 8960f866958ece0900b0ee13e70c9320507f98db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 二月 2023 18:50:23 +0800
Subject: [PATCH] 2023年02月07日18:50:21

---
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs |   87 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 45144a9..3a74f8e 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -233,38 +233,79 @@
                         doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                         break;
                     case SPK.IpCam_Imou:
-                        new System.Threading.Thread(() =>
+                        FunctionList.List.GetIpCamImouList();
+                        if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
                         {
-                            var http = new HttpServerRequest();
-                            var pack = http.GetLcSubAccountToken();
-                            if (pack.Code == StateCode.SUCCESS)
+                            var waitPage = new Loading();
+                            MainPage.BaseView.AddChidren(waitPage);
+                            waitPage.Start("");
+                            new System.Threading.Thread(() =>
                             {
-                                if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+                                try
+                                {
+                                    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(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
+                                            });
+                                        }
+#if __ANDROID__
+                                    Application.RunOnMainThread(() =>
+                                        {
+                                            try
+                                            {
+                                                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(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
+                                        });
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
+                                }
+                                finally
                                 {
                                     Application.RunOnMainThread(() =>
                                     {
-                                        new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触");
+                                        if (waitPage != null)
+                                        {
+                                            waitPage.RemoveFromParent();
+                                            waitPage = null;
+                                        }
                                     });
                                 }
-                                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
+                            })
+                            { IsBackground = true }.Start();
+                        }
+                        else
+                        {
+                            try
                             {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触({pack.Code})");
-                                });
+                                Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
                             }
-                        })
-                        { IsBackground = true }.Start();
+                            catch (Exception ex)
+                            {
+
+                            }
+                        }
                         break;
                 }
             };

--
Gitblit v1.8.0