Merge remote-tracking branch 'origin/wjc' into feature/V2.7_Google

wxr

2024-10-28 881bf7fef29eef7581d830130bed9595665b2e61

Merge remote-tracking branch 'origin/wjc' into feature/V2.7_Google

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
    public partial class Resource
    {
        

 HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs

@@ -56,8 +56,6 @@
        {
           UpdateThread.updateCurrMusicThread(this, middViewLayout, A31MusicModel.Current);
        }

       

    }
}

 HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs

@@ -349,6 +349,8 @@
        {
            timerThread = new System.Threading.Thread((obj) =>
            {
                try
                {
                while (true)
                {
                    Application.RunOnMainThread(() =>
@@ -525,6 +527,8 @@
                    });
                    System.Threading.Thread.Sleep(1000 * 1);
                }
                }
                catch (Exception e) { }
            })
            { IsBackground = true };
            timerThread.Start();

 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs

@@ -283,6 +283,8 @@
            //更新状态线程
            var musicThread = new System.Threading.Thread(() =>
            {
                try
                {
                while (true)
                {
                    if (!player.functionMusic.isOnline())
@@ -294,6 +296,8 @@
                    SendMethod.Current.GetDeviceStatus(ref player, new List<string> { player.functionMusic.deviceId }, player.functionMusic.sid);
                    System.Threading.Thread.Sleep(1000);
                    Application.RunOnMainThread(() =>
                        {
                            try
                    {
                        musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
                        musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
@@ -316,8 +320,18 @@
                        {
                            musicView.collectIconBtn.IsSelected = false;
                        }
                            }
                            catch (Exception e)
                            {
                                string ee = e.Message;
                            }
                    });
                }
                }
                catch (Exception e)
                {
                    string ee = e.Message;
                }
            })
            { IsBackground = true, Name = "A31" };
            musicThread.Start();

 NunitTest-Android/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
    public partial class Resource
    {