From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6

---
 HDL_ON/Common/HDLCommon.cs |  179 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 155 insertions(+), 24 deletions(-)

diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 0480e9f..cf27527 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -248,44 +248,82 @@
         #region 鈻� 鎺ㄩ�佸鐞哶______________________
         /// <summary>
         /// 鎺ㄩ�佹秷鎭鐞�
+        /// 娉ㄦ剰锛欰ndroid瑕佸湪涓荤嚎绋嬶紙UI绾跨▼锛夋墽琛�
         /// </summary>
         /// <param name="jpushMessageInfo"></param>
         public void AdjustPushMessage(JPushMessageInfo jpushMessageInfo)
         {
             try
             {
-                if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("OffLine"))
-                {
-                    Shared.Application.RunOnMainThread(() =>
-                    {
-                        ////璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
-                        //new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
-                        //閫�鍑虹櫥褰曟搷浣�
-                        CheckLogout();
+                //Extras涓虹┖涓嶅鐞�
+                if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
 
-                    });
-                    return;
+                if (jpushMessageInfo.Extras.Contains(PushMessageType.OffLine.ToString()))
+                {
+                    CheckLogout();
                 }
                 else
                 {
-                    Shared.Application.RunOnMainThread(() =>
+                    GetPushMessageAction?.Invoke();
+
+                    //messageType涓虹┖涓嶅鐞�
+                    if (string.IsNullOrEmpty(jpushMessageInfo.messageType)) return;
+
+                    //鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
+                    if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
                     {
-                        GetPushMessageAction?.Invoke();
-                        //鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
-                        if (jpushMessageInfo.messageType != null && jpushMessageInfo.messageType.Contains("Alarm"))
+                        //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
+                        ShowAlarmPushMessage(jpushMessageInfo);
+                    }
+                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
+                    {
+                        if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
+
+                        ESVideoInfo eSVideoInfo = GetESOnVideoJson(jpushMessageInfo.expantContent);
+
+                        if (eSVideoInfo == null) return;
+
+                        if (string.IsNullOrEmpty(eSVideoInfo.uuid)) return;
+
+                        if (eSVideoInfo.uuid.Contains(","))
                         {
-                            //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
-                            ShowAlarmPushMessage(jpushMessageInfo);
-                            //new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
+                            var uuid = eSVideoInfo.uuid.Split(',');
+                            eSVideoInfo.ESVideoUUID = uuid[0];
                         }
-                       
-                    });
-                    return;
+                        else
+                        {
+                            eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid;
+                        }
+
+                        ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo);
+
+                    }
                 }
+            }
+            catch(Exception EX)
+            {
+                Utlis.WriteLine("catch: " + EX.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="jsonStr"></param>
+        /// <returns></returns>
+        ESVideoInfo GetESOnVideoJson(string jsonStr)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(jsonStr))
+                {
+                    return Newtonsoft.Json.JsonConvert.DeserializeObject<ESVideoInfo>(jsonStr);
+                }
+                return null;
             }
             catch
             {
-
+                return null;
             }
         }
 
@@ -310,6 +348,9 @@
                 case "13375012446":
                 case "13602944661":
                 case "18778381374":
+                case "18316672920":
+                case "15626203746":
+                case "551775569@qq.com":
                     return;
             }
 
@@ -383,8 +424,9 @@
             {
                 //Dialog
                 alarmPushConfirmDialog = null;
-                Action backAction = () => {
-                   
+                Action backAction = () =>
+                {
+
                 };
                 var skipPage = new MessageCenterPage();
                 MainPage.BasePageView.AddChidren(skipPage);
@@ -479,7 +521,7 @@
             {
                 MainPage.InternetStatus = 1;
                 Control.Ins.SearchLoaclGateway();
-                
+
             }
             else if (internetStatus == 2)//WiFi缃戠粶
             {
@@ -488,5 +530,94 @@
             }
         }
         #endregion
+
+        #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+
+        /// <summary>
+        /// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
+        /// </summary>
+        /// <param name="bodyView"></param>
+        public void Go2EZvizMonitor(FrameLayout bodyView)
+        {
+            var waitPage = new Loading();
+            bodyView.AddChidren(waitPage);
+            waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+            new Thread(() =>
+            {
+                try
+                {
+                    //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
+                    var result = new HttpServerRequest().EZGetChildToken();
+                    if (result.Code == StateCode.SUCCESS)
+                    {
+                        var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString());
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (!string.IsNullOrEmpty(ezChildAccessToken.accessToken))
+                            {
+#if __IOS__
+                                //iOS
+                                //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
+                                EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
+                                //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
+                                EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
+                                EZSDK.IOS.EZSDK.SetRequestHttpsHost(OnAppConfig.Instance.RequestHttpsHost);
+                                //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
+                                EZSDK.IOS.EZSDK.SetEZAccessToken(ezChildAccessToken.accessToken);
+                                //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+                                EZSDK.IOS.EZSDK.Go2EZvizMonitor();
+
+#else
+                                //Android
+                                //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
+                                //2.璁剧疆钀ょ煶瀛愯处鍙风殑token
+                                //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+                                ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
+                                {
+                                    if (b)
+                                    {
+                                        Android.Content.Intent intent = new Android.Content.Intent();
+                                        var bundle = new Android.OS.Bundle();
+                                        //浼犻�抧ame鍙傛暟涓簍inyphp
+                                        bundle.PutString("Token", ezChildAccessToken.accessToken);
+                                        bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
+                                        bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
+                                        intent.PutExtras(bundle);
+                                        intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+                                        Shared.Application.Activity.StartActivity(intent);
+                                    }
+                                });
+#endif
+
+
+                            }
+
+                        });
+                    }
+                    else
+                    {
+                        IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
+                    }
+                }
+                catch (Exception ex)
+                {
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+
+        #endregion
     }
 }

--
Gitblit v1.8.0