Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2023-04-21 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c

 HDL-ON_iOS/AppDelegate.cs

@@ -262,7 +262,7 @@
                {
                    Language.CurrentLanguage = "russian";
                }
                else if (NSLocale.PreferredLanguages[0].Contains( "bul"))
                else if (NSLocale.PreferredLanguages[0].Contains("bul"))
                {
                    Language.CurrentLanguage = "български";
                }
@@ -327,10 +327,11 @@
            return true;
        }

        /// <summary>
        /// 处理通知消息
        /// </summary>
        void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
        
            /// <summary>
            /// 处理通知消息
            /// </summary>
            void HandleNotificationMessageUserInfo(NSDictionary userInfo, bool bFinishedLaunching)
        {
            try
            {
@@ -397,7 +398,7 @@
                        UserInfo.Current.pushMessageInfo = pushMes;
                        UserInfo.Current.inCall = DateTime.Now;
                    }

                    
                    if (bFinishedLaunching)
                    {
                        if (pushMes.Extras != null)
@@ -413,13 +414,15 @@
                            }
                            else
                            {
                                HDLCommon.Current.AdjustPushMessage(pushMes);
                                //HDLCommon.Current.AdjustPushMessage(pushMes);
                                this.CommonAdjustPushMessage(pushMes);//2023年04月13日15:55:54 修改
                            }
                        }
                    }
                    else
                    {
                        HDLCommon.Current.AdjustPushMessage(pushMes);
                        //HDLCommon.Current.AdjustPushMessage(pushMes);
                        this.CommonAdjustPushMessage(pushMes);
                    }
                   
                }
@@ -500,6 +503,23 @@
        }


        public  void CommonAdjustPushMessage(JPushMessageInfo pushMes)
        {
            new System.Threading.Thread(new System.Threading.ThreadStart(() =>
            {
                while (MainPage.BasePageView == null)
                {
                    System.Threading.Thread.Sleep(300);
                }
                Shared.Application.RunOnMainThread(() =>
                {
                    HDLCommon.Current.AdjustPushMessage(pushMes);
                });
            })).Start();

        }


    }

}