up 完成音乐控制组件

Author: Coloryr

.github/workflows/plugin-build.yml

@@ -30,24 +30,6 @@ jobs:
       run: |
         chmod a+x ./build/build-plugin.sh
         ./build/build-plugin.sh
-    
-    - name: 打包
-      working-directory: ./src/build_out/Debug/net8.0/plugins/
-      run: |
-          zip -r ../AnalogClockPlugin.zip AnalogClockPlugin
-          zip -r ../CalendarPlugin.zip CalendarPlugin
-          zip -r ../WeatherPlugin.zip WeatherPlugin
-          zip -r ../ClockPlugin.zip ClockPlugin
-          zip -r ../CoreLib.zip CoreLib
-          zip -r ../PGLauncherPlugin.zip PGLauncherPlugin
-          zip -r ../PGColorMCPlugin.zip PGColorMCPlugin
-          zip -r ../OneWordPlugin.zip OneWordPlugin
-          zip -r ../BmPlugin.zip BmPlugin
-          zip -r ../MonitorPlugin.zip MonitorPlugin
-          zip -r ../Live2DPlugin.zip Live2DPlugin
-          zip -r ../MinecraftSkinPlugin.zip MinecraftSkinPlugin
-          zip -r ../MinecraftMotdPlugin.zip MinecraftMotdPlugin
-          zip -r ../ToDoPlugin.zip ToDoPlugin
 
     - name: 上传 colordesktop-plugin-AnalogClockPlugin
       uses: actions/upload-artifact@v4
@@ -133,6 +115,12 @@ jobs:
         name: "colordesktop-plugin-ToDoPlugin"
         path: src/build_out/Debug/net8.0/ToDoPlugin.zip
 
+    - name: 上传 colordesktop-plugin-MusicControlPlugin
+      uses: actions/upload-artifact@v4
+      with:
+        name: "colordesktop-plugin-MusicControlPlugin"
+        path: src/build_out/Debug/net8.0/MusicControlPlugin.zip
+
     - name: 上传 colordesktop-plugin
       uses: actions/upload-artifact@v4
       with:

build/build-plugin.sh

@@ -26,4 +26,23 @@ build ColorDesktop.MonitorPlugin MonitorPlugin
 build ColorDesktop.Live2DPlugin Live2DPlugin
 build ColorDesktop.MinecraftSkinPlugin MinecraftSkinPlugin
 build ColorDesktop.MinecraftMotdPlugin MinecraftMotdPlugin
-build ColorDesktop.ToDoPlugin ToDoPlugin
+build ColorDesktop.ToDoPlugin ToDoPlugin
+build ColorDesktop.MusicControlPlugin MusicControlPlugin
+
+cd ./src/build_out/Debug/net8.0/plugins/
+
+zip -r ../AnalogClockPlugin.zip AnalogClockPlugin
+zip -r ../CalendarPlugin.zip CalendarPlugin
+zip -r ../WeatherPlugin.zip WeatherPlugin
+zip -r ../ClockPlugin.zip ClockPlugin
+zip -r ../CoreLib.zip CoreLib
+zip -r ../PGLauncherPlugin.zip PGLauncherPlugin
+zip -r ../PGColorMCPlugin.zip PGColorMCPlugin
+zip -r ../OneWordPlugin.zip OneWordPlugin
+zip -r ../BmPlugin.zip BmPlugin
+zip -r ../MonitorPlugin.zip MonitorPlugin
+zip -r ../Live2DPlugin.zip Live2DPlugin
+zip -r ../MinecraftSkinPlugin.zip MinecraftSkinPlugin
+zip -r ../MinecraftMotdPlugin.zip MinecraftMotdPlugin
+zip -r ../ToDoPlugin.zip ToDoPlugin
+zip -r ../MusicControlPlugin.zip MusicControlPlugin

src/ColorDesktop.Launcher/Program.cs

@@ -16,7 +16,7 @@ namespace ColorDesktop.Launcher;
 
 public class Program
 {
-    public const string Version = "A2.2024.10.24";
+    public const string Version = "A2.20241104";
     public const string ApiVersion = "2";
 
     private static FileStream s_lock;

src/Plugins/ColorDesktop.MusicControlPlugin/ColorDesktop.MusicControlPlugin.csproj

@@ -9,6 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <None Remove="icon.png" />
       <None Remove="Resource\icon1.svg" />
       <None Remove="Resource\icon2.svg" />
       <None Remove="Resource\icon3.svg" />
@@ -23,6 +24,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <EmbeddedResource Include="icon.png" />
         <EmbeddedResource Include="Resource\Lang\en-us.json" />
         <EmbeddedResource Include="Resource\Lang\zh-cn.json" />
     </ItemGroup>
@@ -33,7 +35,14 @@
         </None>
     </ItemGroup>
 
-    <ItemGroup>
+	<Target Name="CopySpecificNuGetDll_1" AfterTargets="Build">
+		<Copy SourceFiles="$(NuGetPackageRoot)tmds.dbus.protocol\0.20.0\lib\net8.0\Tmds.DBus.Protocol.dll" DestinationFolder="$(OutputPath)" />
+	</Target>
+	<Target Name="CopySpecificNuGetDll_2" AfterTargets="Build">
+		<Copy SourceFiles="$(NuGetPackageRoot)system.io.pipelines\8.0.0\lib\net8.0\System.IO.Pipelines.dll" DestinationFolder="$(OutputPath)" />
+	</Target>
+
+	<ItemGroup>
         <ProjectReference Include="..\..\ColorDesktop.Api\ColorDesktop.Api.csproj">
             <Private>False</Private>
         </ProjectReference>

src/Plugins/ColorDesktop.MusicControlPlugin/MusicControlPlugin.cs

@@ -54,7 +54,9 @@ public void Enable()
 
     public Stream? GetIcon()
     {
-        return null;
+        var assm = Assembly.GetExecutingAssembly();
+        var item = assm.GetManifestResourceStream("ColorDesktop.MusicControlPlugin.icon.png")!;
+        return item;
     }
 
     public async void Init(string local, string local1)

src/Plugins/ColorDesktop.MusicControlPlugin/icon.png

@@ -3,7 +3,7 @@
   "Name": "音乐控制",
   "Describe": "获取电脑音乐播放器信息并控制",
   "Auther": "Coloryr",
-  "Dlls": [ "ColorDesktop.MusicControlPlugin", "Microsoft.Windows.SDK.NET", "WinRT.Runtime" ],
+  "Dlls": [ "ColorDesktop.MusicControlPlugin", "Microsoft.Windows.SDK.NET", "WinRT.Runtime", "Tmds.DBus.Protocol", "System.IO.Pipelines" ],
   "Dependents": [
     {
       "Type": "Share",