From a40848272e33822f72a7fe0310f079717bf73f23 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 18 十月 2024 16:21:39 +0800
Subject: [PATCH] 修复金茂科技系统,金茂光伏问题

---
 HDL_ON/Common/HDLCommon.cs |   53 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 8a0a362..ce6a03e 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -247,6 +247,10 @@
         {
             try
             {
+                if (OnAppConfig.Instance.LastLoginUserId == "")
+                {
+                    return;
+                }
                 //MainPage.Log($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
                 //Extras涓虹┖涓嶅鐞�
                 if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
@@ -359,31 +363,40 @@
                             }
 
 #if __ANDROID__
-                            Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 30;
-                            Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(true);
-                            Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone();
-                            new Thread(() =>
+                            try
                             {
-                                try
+                                //瀹夊崜濡傛灉璁剧疆浜嗛潤闊筹紝涓嶈兘鍝嶉搩
+                                if (Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.AudioManager.RingerMode.ToString().ToLower() == "normal")
                                 {
-                                    DateTime dateTime = DateTime.Now;
-                                    while (true)
+                                    Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 30;
+                                    Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(true);
+                                    Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone();
+                                    new Thread(() =>
                                     {
-                                        Thread.Sleep(1000);
-                                        if (!Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MediaPlayerPlayingStatus || dateTime.AddSeconds(Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime) <= DateTime.Now)
+                                        try
                                         {
-                                            break;
+                                            DateTime dateTime = DateTime.Now;
+                                            while (true)
+                                            {
+                                                Thread.Sleep(1000);
+                                                if (!Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MediaPlayerPlayingStatus || dateTime.AddSeconds(Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime) <= DateTime.Now)
+                                                {
+                                                    break;
+                                                }
+                                            }
+                                            Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
                                         }
-                                    }
-                                    Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
+                                        catch (Exception ex)
+                                        {
+                                            MainPage.Log("error", "鑷爺鍙瀵硅閾冨0鎾斁寮傚父:" + ex.Message);
+                                        }
+                                    })
+                                    { IsBackground = true }.Start();
                                 }
-                                catch (Exception ex)
-                                {
-                                    MainPage.Log("error", "鑷爺鍙瀵硅閾冨0鎾斁寮傚父:" + ex.Message);
-                                }
-                            })
-                            { IsBackground = true }.Start();
-
+                            }catch(Exception ex)
+                            {
+                                MainPage.Log("Error", $"瀹夊崜鍙瀵硅鍝嶉搩寮傚父:{ex.StackTrace}");
+                            }
 #elif __IOS__
                             SoundPlayer.Ins.PlaySound();
                             new Thread(() => {
@@ -566,7 +579,7 @@
                 Logout();
             }catch (Exception ex)
             {
-                MainPage.Log($"鎸や笅绾垮紓甯�:{ex.Message}");
+                MainPage.Log("Error",$"鎸や笅绾垮紓甯�:{ex.Message}");
             }
         }
 

--
Gitblit v1.8.0