支持本地源

Author: cnbluefire

HotLyric/HotLyric.Package/Package.appxmanifest

@@ -13,7 +13,7 @@
 	<Identity
 	  Name="306200B4771A6.217957860C1A5"
 	  Publisher="CN=148E23EA-3EA2-4733-8A82-49C463DC3722"
-	  Version="1.3.45.0" />
+	  Version="1.3.46.0" />
 
 	<Properties>
 		<DisplayName>热词</DisplayName>

HotLyric/HotLyric.Win32/App.xaml.cs

@@ -44,7 +44,14 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
 
             _ = ViewModelLocator.Instance.AppConfigurationSettingsViewModel.UpdateConfigurationAsync();
 
-            ViewModelLocator.Instance.SettingsWindowViewModel.TryShowReadMeOnStartup();
+            DispatcherQueue.TryEnqueue(async () =>
+            {
+                await Task.Delay(TimeSpan.FromSeconds(10));
+                if (!Exiting)
+                {
+                    ViewModelLocator.Instance.SettingsWindowViewModel.TryShowReadMeOnStartup();
+                }
+            });
 
             HotKeyManager.HotKeyInvoked += HotKeyManager_HotKeyInvoked;
         }

HotLyric/HotLyric.Win32/Assets/MSEdgeCanaryIcon.png

@@ -49,19 +49,17 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="configuration.json">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Update="Assets\defaultTheme.json">
+		<None Update="configuration.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="Assets\**\*">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 		<None Update="NLog.config">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-	</ItemGroup>
+	
+</ItemGroup>
 
 	<ItemGroup Condition="'$(HotLyricExtensionLibraryEnabled)' != 'false'">
 		<ContentWithTargetPath Include="Extensions\$(Platform)\$(Configuration)\HotLyric.Extensions.dll">

HotLyric/HotLyric.Win32/Assets/MSEdgeDevIcon.png

@@ -140,15 +140,16 @@ public async Task<bool> UpdateConfigurationAsync()
                             {
                                 "http" => true,
                                 "https" => true,
+                                "file" => true,
                                 _ => false
                             })
                         {
-                            return c.Uri;
+                            return uri;
                         }
                         return null;
                     })
-                    .Where(c => !string.IsNullOrEmpty(c))
-                    .OfType<string>()
+                    .Where(c => c != null)
+                    .OfType<Uri>()
                     .ToArray();
 
                 if (enabledSources.Length > 0)
@@ -159,16 +160,28 @@ public async Task<bool> UpdateConfigurationAsync()
                     {
                         try
                         {
-                            var _json = await client.GetStringAsync(c, cancellationSource.Token);
+                            string? _json = null;
+                            if (c.Scheme.Equals("file", StringComparison.OrdinalIgnoreCase))
+                            {
+                                if (System.IO.File.Exists(c.AbsolutePath))
+                                {
+                                    _json = await System.IO.File.ReadAllTextAsync(c.AbsolutePath, cancellationSource.Token);
+                                }
+                            }
+                            else
+                            {
+                                _json = await client.GetStringAsync(c, cancellationSource.Token);
+                            }
+
                             if (!string.IsNullOrEmpty(_json))
                             {
-                                var _model = AppConfigurationModel.CreateFromJson(c, _json);
+                                var _model = AppConfigurationModel.CreateFromJson(c.OriginalString, _json);
                                 if (_model != null)
                                 {
                                     return new AppConfigurationModelResult(
                                         _model,
                                         DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
-                                        c,
+                                        c.OriginalString,
                                         _json);
                                 }
                             }

HotLyric/HotLyric.Win32/Assets/MSEdgeIcon.png

@@ -29,11 +29,10 @@ private SMTCManager(MediaSessionAppFactory mediaSessionAppFactory, GlobalSystemM
 
         private async void Manager_SessionsChanged(GlobalSystemMediaTransportControlsSessionManager sender, SessionsChangedEventArgs args)
         {
-            await UpdateSessionAsync();
-            SessionsChanged?.Invoke(this, EventArgs.Empty);
+            await UpdateSessionAsync(true);
         }
 
-        public async Task UpdateSessionAsync()
+        public async Task UpdateSessionAsync(bool raiseSessionsChanged)
         {
             var oldTask = lastUpdateSessionTask;
             if (oldTask != null)
@@ -48,6 +47,11 @@ public async Task UpdateSessionAsync()
             var task = lastUpdateSessionTask = UpdateSessionsAsyncCore();
             await task;
             lastUpdateSessionTask = null;
+
+            if (raiseSessionsChanged)
+            {
+                SessionsChanged?.Invoke(this, EventArgs.Empty);
+            }
         }
 
         private async Task UpdateSessionsAsyncCore(CancellationToken cancellationToken = default)

HotLyric/HotLyric.Win32/HotLyric.Win32.csproj

@@ -345,9 +345,26 @@ private void UpdateControls()
 
         public async Task<ImageSource?> GetSessionIconAsync()
         {
-            if (App.AppInfo?.Icon != null)
+            var iconUri = App.AppInfo?.Icon;
+            if (iconUri != null)
             {
-                return new BitmapImage(App.AppInfo.Icon);
+                if (iconUri.Scheme.Equals("file", StringComparison.OrdinalIgnoreCase))
+                {
+                    try
+                    {
+                        if (File.Exists(iconUri.AbsolutePath))
+                        {
+                            var bitmap = new BitmapImage();
+                            await bitmap.SetSourceAsync(File.OpenRead(iconUri.AbsolutePath).AsRandomAccessStream());
+                            return bitmap;
+                        }
+                    }
+                    catch { }
+                }
+                else
+                {
+                    return new BitmapImage(iconUri);
+                }
             }
 
             var package = await GetAppPackageAsync();

HotLyric/HotLyric.Win32/Utils/AppConfigurations/AppConfigurationManager.cs

@@ -48,7 +48,7 @@ public LyricWindowViewModel(
                 {
                     if (smtcManager != null)
                     {
-                        await smtcManager.UpdateSessionAsync();
+                        await smtcManager.UpdateSessionAsync(true);
                     }
                 });
             };