Merge branch 'Dev-Branch' into wxr-2.1

wxr

2023-07-31 0f66b9ebc18398af6f7e2c2b411f65c84fe718fc

Merge branch 'Dev-Branch' into wxr-2.1

 DLL/IOS/EZSDK.IOS.dll

Binary files differ

 HDL_ON/Common/HDLCommon.cs

@@ -258,7 +258,7 @@
        {
            try
            {
                Console.WriteLine($"接收到推送，，，，.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
                //Console.WriteLine($"接收到推送，，，，.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");

                //Extras为空不处理
                if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;

 HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs

@@ -1,7 +1,7 @@
using System;
using HDL_ON.UI.CSS;
using Shared;
using Xamarin.Essentials;
//using Xamarin.Essentials;

namespace HDL_ON.UI
{
@@ -100,10 +100,10 @@
                phoneBtn.X = callBtn.X;
            }

            phoneBtn.MouseUpEventHandler += (sender, e) =>
            {
                PhoneDialer.Open(Constant.SUPPORT_TELEPHONENUMBER);
            };
            //phoneBtn.MouseUpEventHandler += (sender, e) =>
            //{
            //    PhoneDialer.Open(Constant.SUPPORT_TELEPHONENUMBER);
            //};

            serverBtn.Text = Language.StringByID(StringId.CurrentAccountServerOwnership) + OnAppConfig.Instance.GlobalRegion.regionName;