up 修正问题

Author: Coloryr

src/ColorDesktop.Api/Enums.cs

@@ -64,4 +64,48 @@ public enum PluginState
     /// 未加载
     /// </summary>
     Unload
+}
+
+public enum ManagerState
+{
+    /// <summary>
+    /// 组件未找到
+    /// </summary>
+    PluginNotFound,
+    /// <summary>
+    /// 实例未找到
+    /// </summary>
+    InstanceNotFound,
+    /// <summary>
+    /// 没有请求过权限
+    /// </summary>
+    NoTestPermission,
+    /// <summary>
+    /// 没有权限
+    /// </summary>
+    NoPermission,
+    /// <summary>
+    /// 组件已经启用了
+    /// </summary>
+    PluginIsEnabled,
+    /// <summary>
+    /// 实例已经启用了
+    /// </summary>
+    InstanceIsEnabled,
+    /// <summary>
+    /// 组件已经禁用了
+    /// </summary>
+    PluginIsDisabled,
+    /// <summary>
+    /// 实例已经禁用了
+    /// </summary>
+    InstanceIsDisabled,
+    /// <summary>
+    /// 操作成功
+    /// </summary>
+    Success,
+    /// <summary>
+    /// 操作失败
+    /// </summary>
+    Fail
 }

src/ColorDesktop.Api/IInstance.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Api;
 

src/ColorDesktop.Api/IInstanceHandel.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Api;
 

src/ColorDesktop.Api/IInstanceManager.cs

@@ -1,4 +1,6 @@
-namespace ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
+
+namespace ColorDesktop.Api;
 
 public interface IInstanceManager
 {

src/ColorDesktop.Api/IInstanceWindow.cs

@@ -1,4 +1,6 @@
-namespace ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
+
+namespace ColorDesktop.Api;
 
 public interface IInstanceWindow
 {

src/ColorDesktop.Api/IPlugin.cs

@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Api;
 

src/ColorDesktop.Api/LangApi.cs

@@ -94,6 +94,7 @@ public void Load(string item)
         {
             foreach (var item1 in json)
             {
+                _languageList.Remove(item1.Key);
                 _languageList.TryAdd(item1.Key, item1.Value!.ToString());
             }
         }

src/ColorDesktop.Api/LauncherApi.cs

@@ -16,7 +16,7 @@ public static class LauncherApi
     public static ILauncherHook Hook { get; private set; }
 
     private static readonly ConcurrentDictionary<string, object?> s_shareData = [];
-    private static readonly ConcurrentDictionary<string, List<Action<BaseEvent>>> s_pluginEvent;
+    private static readonly ConcurrentDictionary<string, List<Action<BaseEvent>>> s_pluginEvent = [];
 
     /// <summary>
     /// 公共数据获取，只能存基础类型

src/ColorDesktop.Api/ManagerState.cs

@@ -1,4 +1,4 @@
-namespace ColorDesktop.Api;
+namespace ColorDesktop.Api.Objs;
 
 public record MarginObj
 {

src/ColorDesktop.Api/InstanceDataObj.cs src/ColorDesktop.Api/Objs/InstanceDataObj.cs

@@ -1,4 +1,5 @@
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.Launcher.Hook;
 using ColorDesktop.Launcher.Objs;
 using ColorDesktop.Launcher.UI.Models.Items;

src/ColorDesktop.Api/PluginDataObj.cs src/ColorDesktop.Api/Objs/PluginDataObj.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.Launcher.Helper;
 using ColorDesktop.Launcher.Objs;
 using ColorDesktop.Launcher.UI.Models.Dialog;
@@ -90,17 +91,16 @@ public static void Init()
     /// </summary>
     public static void StartInstance()
     {
-        var remove = new List<string>();
         foreach (var item in ConfigHelper.Config.EnableInstance)
         {
             if (Instances.TryGetValue(item, out var obj))
             {
+                if (RunInstances.ContainsKey(item))
+                {
+                    continue;
+                }
                 StartInstance(obj);
             }
-            else
-            {
-                remove.Add(item);
-            }
         }
 
         App.ThisApp.UpdateMenu();
@@ -181,16 +181,6 @@ private static string GetLocal(InstanceDataObj obj)
         return Path.GetFullPath(WorkDir + "/" + obj.UUID);
     }
 
-    /// <summary>
-    /// 获取实例配置
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <returns></returns>
-    private static string GetDataLocal(InstanceDataObj obj)
-    {
-        return Path.GetFullPath(WorkDir + "/" + obj.UUID + "/" + FileName);
-    }
-
     /// <summary>
     /// 停止所有实例
     /// </summary>
@@ -202,15 +192,6 @@ public static void StopInstance()
         }
     }
 
-    /// <summary>
-    /// 停止该实例
-    /// </summary>
-    /// <param name="instance"></param>
-    private static void StopInstance(InstanceDataObj instance)
-    {
-        StopInstance(instance.UUID);
-    }
-
     /// <summary>
     /// 停止该实例
     /// </summary>
@@ -319,7 +300,7 @@ public static void DisableInstance(InstanceDataObj obj)
     {
         ConfigHelper.DisableInstance(obj.UUID);
 
-        StopInstance(obj);
+        StopInstance(obj.UUID);
 
         App.ThisApp.UpdateMenu();
     }

src/ColorDesktop.Launcher/Helper/ConfigHelper.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using ColorDesktop.Api;
 using ColorDesktop.Api.Events;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Launcher.Manager;
 

src/ColorDesktop.Launcher/Manager/InstanceManager.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Launcher.Objs;
 

src/ColorDesktop.Launcher/Manager/LauncherHook.cs

@@ -1,4 +1,5 @@
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Launcher.Objs;
 

src/ColorDesktop.Launcher/Objs/ConfigObj.cs

@@ -1,4 +1,5 @@
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.Launcher.Helper;
 using ColorDesktop.Launcher.UI.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;

src/ColorDesktop.Launcher/Objs/InstanceWindowObj.cs

@@ -1,4 +1,4 @@
-using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Launcher.UI.Models.Dialog;
 

src/ColorDesktop.Launcher/UI/Models/Dialog/CreateInstanceBaseModel.cs

@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.Launcher.UI.Models.Dialog;
 

src/ColorDesktop.Launcher/UI/Models/Dialog/CreateInstanceModel.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.Launcher.Manager;
 using ColorDesktop.Launcher.UI.Models.Dialog;
 using ColorDesktop.Launcher.UI.Models.Main;

src/ColorDesktop.Launcher/UI/Models/Dialog/CreateInstanceOtherModel.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.Launcher.Helper;
 using ColorDesktop.Launcher.Manager;
 using ColorDesktop.Launcher.UI.Models.Dialog;

src/ColorDesktop.Launcher/UI/Models/Items/InstanceItemModel.cs

@@ -6,6 +6,7 @@
 using Avalonia.Platform;
 using Avalonia.Threading;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.Launcher.Hook;
 using ColorDesktop.Launcher.Manager;
 using ColorDesktop.Launcher.Utils;

src/ColorDesktop.Launcher/UI/Models/Main/SettingModel.cs

@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.Launcher.Helper;
 using ColorDesktop.Launcher.Manager;
 using ColorDesktop.Launcher.UI.Controls;

src/ColorDesktop.Launcher/UI/Windows/InstanceWindow.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.AnalogClockPlugin;
 

src/ColorDesktop.Launcher/UI/Windows/MainWindow.axaml.cs

@@ -1,6 +1,7 @@
 using System.Reflection;
 using Avalonia.Controls;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.CoreLib;
 
 namespace ColorDesktop.AnalogClockPlugin;

src/Plugins/ColorDesktop.AnalogClockPlugin/AnalogClockControl.axaml.cs

@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.AnalogClockPlugin;
 

src/Plugins/ColorDesktop.AnalogClockPlugin/AnalogClockPlugin.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 using Avalonia.Media;
-using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.CoreLib.View.Model;
 using CommunityToolkit.Mvvm.ComponentModel;
 

src/Plugins/ColorDesktop.AnalogClockPlugin/AnalogClockSettingControl.axaml.cs

@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.BmPlugin.Skin1;
 using ColorDesktop.BmPlugin.Skin2;
 using ColorDesktop.BmPlugin.Skin3;

src/Plugins/ColorDesktop.AnalogClockPlugin/AnalogClockSettingModel.cs

@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.BmPlugin;
 

src/Plugins/ColorDesktop.BmPlugin/BmControl.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia.Media;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace ColorDesktop.BmPlugin;

src/Plugins/ColorDesktop.BmPlugin/BmInstanceSettingControl.axaml.cs

@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.CoreLib;
 
 namespace ColorDesktop.BmPlugin;

src/Plugins/ColorDesktop.BmPlugin/BmInstanceSettingModel.cs

@@ -1,6 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.CalendarPlugin.Skin1;
 using ColorDesktop.CalendarPlugin.Skin2;
 using ColorDesktop.CalendarPlugin.Skin3;

src/Plugins/ColorDesktop.BmPlugin/BmPlugin.cs

@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.CalendarPlugin;
 

src/Plugins/ColorDesktop.CalendarPlugin/CalendarControl.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia.Media;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace ColorDesktop.CalendarPlugin;

src/Plugins/ColorDesktop.CalendarPlugin/CalendarInstanceSettingControl.axaml.cs

@@ -1,6 +1,7 @@
 using System.Reflection;
 using Avalonia.Controls;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 using ColorDesktop.CoreLib;
 
 namespace ColorDesktop.CalendarPlugin;

src/Plugins/ColorDesktop.CalendarPlugin/CalendarInstanceSettingModel.cs

@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using ColorDesktop.Api;
+using ColorDesktop.Api.Objs;
 
 namespace ColorDesktop.ClockPlugin;