diff --git a/.gitignore b/.gitignore index dc32f32..9840d7a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,11 @@ KitX\ Publish/ ## Ignore for refernces Reference/ +## Ignore local runtime configs +Config/AppConfig.json +Config/PluginsConfig.json +Config/SecurityConfig.json + ## Ignore for IDE settings .idea/ .vscode/ diff --git a/Config/AppConfig.json b/Config/AppConfig.json deleted file mode 100644 index 87b0dc6..0000000 --- a/Config/AppConfig.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "$type": "AppConfig", - "App": { - "IconFileName": "KitX-Icon-1920x-margin-2x.png", - "CoverIconFileName": "KitX-Icon-Background.png", - "AppLanguage": "zh-cn", - "Theme": "Follow", - "ThemeColor": "#FF3873D9", - "SurpportLanguages": { - "zh-cn": "\u4E2D\u6587 (\u7B80\u4F53)", - "zh-tw": "\u4E2D\u6587 (\u7E41\u9AD4)", - "ru-ru": "\u0420\u0443\u0441\u0441\u043A\u0438\u0439", - "en-us": "English (US)", - "fr-fr": "Fran\u00E7ais", - "ja-jp": "\u65E5\u672C\u8A9E", - "ko-kr": "\uD55C\uAD6D\uC5B4" - }, - "LocalPluginsFileFolder": "./Plugins/", - "LocalPluginsDataFolder": "./PluginsDatas/", - "DeveloperSetting": false, - "ShowAnnouncementWhenStart": true, - "RanTime": 0, - "LastBreakAfterExit": 2000 - }, - "Windows": { - "MainWindow": { - "Size": { - "Width": 1280, - "Height": 720, - "FramePerSecond": null, - "Area": 921600, - "AspectRatio": 1.7777777777777777, - "Description": null - }, - "Location": { - "Left": -1, - "Right": 0, - "Top": -1, - "Bottom": 0, - "Over": 0, - "Under": 0 - }, - "WindowState": 0, - "IsHidden": false, - "Tags": { - "SelectedPage": "Page_Home" - }, - "EnabledMica": true, - "GreetingTextCount_Morning": 5, - "GreetingTextCount_Noon": 3, - "GreetingTextCount_AfterNoon": 3, - "GreetingTextCount_Evening": 2, - "GreetingTextCount_Night": 4, - "GreetingUpdateInterval": 10 - }, - "AnnouncementWindow": { - "Size": { - "Width": 1280, - "Height": 720, - "FramePerSecond": null, - "Area": 921600, - "AspectRatio": 1.7777777777777777, - "Description": null - }, - "Location": { - "Left": -1, - "Right": 0, - "Top": -1, - "Bottom": 0, - "Over": 0, - "Under": 0 - } - } - }, - "Pages": { - "Home": { - "NavigationViewPaneDisplayMode": 0, - "SelectedViewName": "View_Recent", - "IsNavigationViewPaneOpened": true, - "UseAreaExpanded": true - }, - "Device": {}, - "Market": {}, - "Settings": { - "NavigationViewPaneDisplayMode": 0, - "SelectedViewName": "View_General", - "PaletteAreaExpanded": false, - "WebRelatedAreaExpanded": true, - "WebRelatedAreaOfNetworkInterfacesExpanded": false, - "LogRelatedAreaExpanded": true, - "UpdateRelatedAreaExpanded": true, - "AboutAreaExpanded": false, - "AuthorsAreaExpanded": false, - "LinksAreaExpanded": false, - "ThirdPartyLicensesAreaExpanded": false, - "IsNavigationViewPaneOpened": true - } - }, - "Web": { - "DelayStartSeconds": 0.5, - "ApiServer": "api.catrol.cn", - "ApiPath": "/apps/kitx/", - "DevicesViewRefreshDelay": 1000, - "AcceptedNetworkInterfaces": null, - "UserSpecifiedDevicesServerPort": null, - "UserSpecifiedPluginsServerPort": null, - "UdpPortSend": 23404, - "UdpPortReceive": 24040, - "UdpSendFrequency": 1000, - "UdpBroadcastAddress": "224.0.0.0", - "IPFilter": "192.168", - "SocketBufferSize": 102400, - "DeviceInfoTTLSeconds": 7, - "DisableRemovingOfflineDeviceCard": false, - "UpdateServer": "api.catrol.cn", - "UpdatePath": "/apps/kitx/%platform%/", - "UpdateDownloadPath": "/apps/kitx/update/%platform%/", - "UpdateChannel": "stable", - "UpdateSource": "latest-components.json", - "DebugServicesServerPort": 7777 - }, - "Log": { - "LogFileSingleMaxSize": 10485760, - "LogFilePath": "./Log/", - "LogTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] {Message:lj}{NewLine}{Exception}", - "LogFileMaxCount": 50, - "LogFileFlushInterval": 30, - "LogLevel": 2 - }, - "IO": { - "UpdatingCheckPerThreadFilesCount": 20, - "OperatingSystemVersionUpdateInterval": 60 - }, - "Activity": { - "TotalRecorded": 0 - }, - "Loaders": { - "InstallPath": "./Loaders/" - }, - "ConfigFileLocation": "G:\\Dev\\KitX\\Config\\AppConfig.json", - "ConfigFileWatcherName": null, - "ConfigGeneratedTime": "2024-09-15T15:03:50.4380847+03:00" -} \ No newline at end of file diff --git a/Config/PluginsConfig.json b/Config/PluginsConfig.json deleted file mode 100644 index 3ae98ef..0000000 --- a/Config/PluginsConfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$type": "PluginsConfig", - "Plugins": [], - "ConfigFileLocation": "G:\\Dev\\KitX\\Config\\PluginsConfig.json", - "ConfigFileWatcherName": null, - "ConfigGeneratedTime": "2024-09-15T15:03:50.5186505+03:00" -} \ No newline at end of file diff --git a/Config/SecurityConfig.json b/Config/SecurityConfig.json deleted file mode 100644 index 23d3698..0000000 --- a/Config/SecurityConfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$type": "SecurityConfig", - "DeviceKeys": [], - "ConfigFileLocation": "G:\\Dev\\KitX\\Config\\SecurityConfig.json", - "ConfigFileWatcherName": null, - "ConfigGeneratedTime": "2024-09-15T15:03:50.5276407+03:00" -} \ No newline at end of file diff --git a/KitX Clients/KitX Core/KitX.Core/KitX.Core.csproj b/KitX Clients/KitX Core/KitX.Core/KitX.Core.csproj index 5dc6010..b7a641e 100644 --- a/KitX Clients/KitX Core/KitX.Core/KitX.Core.csproj +++ b/KitX Clients/KitX Core/KitX.Core/KitX.Core.csproj @@ -45,8 +45,8 @@ - - + + diff --git a/KitX Clients/KitX Dashboard b/KitX Clients/KitX Dashboard index 53497dd..075cfd7 160000 --- a/KitX Clients/KitX Dashboard +++ b/KitX Clients/KitX Dashboard @@ -1 +1 @@ -Subproject commit 53497dd15bef1ccce407064ff191c3feef83e709 +Subproject commit 075cfd7556e5208e7b0404cdf0828fab9b468958 diff --git a/KitX.sln b/KitX.sln index 4eca371..1ce73a4 100644 --- a/KitX.sln +++ b/KitX.sln @@ -26,8 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Update.Manual", "Ref EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Update.Replacer", "Reference\Common.Update\Common.Update.Replacer\Common.Update.Replacer.csproj", "{00E4BCFB-9FBC-44BC-8AA5-3A24E790B23F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Algorithm.Interop", "Reference\Common.Algorithm\Common.Algorithm.Interop\Common.Algorithm.Interop.csproj", "{9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Activity", "Reference\Common.Activity\Common.Activity\Common.Activity.csproj", "{C2489F7B-49C0-418C-8A63-0A6C134A3E08}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Clients", "KitX Clients", "{673CF32C-65BF-4EB3-83D3-47FEC77B47A0}" @@ -111,9 +109,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.Winform.Core", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestPlugin.WPF.Core", "KitX SDK\KitX Plugins\TestPlugin.WPF.Core\TestPlugin.WPF.Core.csproj", "{73C9C918-2222-4425-9214-887BED47C77F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell", "Reference\CSharpell\Csharpell\Csharpell.csproj", "{657F7502-43A9-4FC0-8026-1C8F2D103DBA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell", "Reference\Csharpell\Csharpell\Csharpell.csproj", "{657F7502-43A9-4FC0-8026-1C8F2D103DBA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell.Core", "Reference\CSharpell\Csharpell.Core\Csharpell.Core.csproj", "{C161612B-8AE2-4F1C-A29E-875C411F31D1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Csharpell.Core", "Reference\Csharpell\Csharpell.Core\Csharpell.Core.csproj", "{C161612B-8AE2-4F1C-A29E-875C411F31D1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX File Formats", "KitX File Formats", "{A0152BF5-A875-40C0-BD57-D99DDCDB5D4C}" EndProject @@ -249,26 +247,6 @@ Global {00E4BCFB-9FBC-44BC-8AA5-3A24E790B23F}.Release|x64.Build.0 = Release|Any CPU {00E4BCFB-9FBC-44BC-8AA5-3A24E790B23F}.Release|x86.ActiveCfg = Release|Any CPU {00E4BCFB-9FBC-44BC-8AA5-3A24E790B23F}.Release|x86.Build.0 = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|ARM.Build.0 = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|ARM64.Build.0 = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|x64.ActiveCfg = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|x64.Build.0 = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|x86.ActiveCfg = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Debug|x86.Build.0 = Debug|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|Any CPU.Build.0 = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|ARM.ActiveCfg = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|ARM.Build.0 = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|ARM64.ActiveCfg = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|ARM64.Build.0 = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|x64.ActiveCfg = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|x64.Build.0 = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|x86.ActiveCfg = Release|Any CPU - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1}.Release|x86.Build.0 = Release|Any CPU {C2489F7B-49C0-418C-8A63-0A6C134A3E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C2489F7B-49C0-418C-8A63-0A6C134A3E08}.Debug|Any CPU.Build.0 = Debug|Any CPU {C2489F7B-49C0-418C-8A63-0A6C134A3E08}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -918,7 +896,6 @@ Global {F926585B-E9EC-4158-857E-E6310C70DCEE} = {F021B1E7-44AC-469B-AB4D-36541902C694} {80C5352A-5ECD-4CC1-B6B2-033E624524DA} = {F021B1E7-44AC-469B-AB4D-36541902C694} {00E4BCFB-9FBC-44BC-8AA5-3A24E790B23F} = {F021B1E7-44AC-469B-AB4D-36541902C694} - {9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1} = {F021B1E7-44AC-469B-AB4D-36541902C694} {C2489F7B-49C0-418C-8A63-0A6C134A3E08} = {F021B1E7-44AC-469B-AB4D-36541902C694} {0194E969-1457-4C16-AFAB-D2753DFA07F0} = {673CF32C-65BF-4EB3-83D3-47FEC77B47A0} {42654B2B-4B5A-4B78-BC0A-8D3B3D82EC9A} = {37E33B90-88B7-4404-9D42-D672A2916E6C}