Skip to content

[Pull Request] 六项新增 #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dynesshely merged 21 commits into from
Jan 2, 2023
Merged

[Pull Request] 六项新增 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0ba9b9f
💾 📝 Feat, Chore: Simpe Test Files
Dynesshely Dec 23, 2022
8874002
💾 📝 Feat, Chore: Simpe Test Files
Dynesshely Dec 23, 2022
427e8db
📝 Chore: Tried using aardio to develop KitX Installer for Windows
Dynesshely Dec 24, 2022
868d7d9
📦 Struct: Useless path
Dynesshely Dec 24, 2022
f405ec6
💾 ✅ Feat, Test(Devices Connection): 新增并验证了局域网通信的可行性, 自组网之后将拥有局域网互传消息的能力
Dynesshely Dec 27, 2022
62b160d
💾 Feat(Contracts.Java): IIdentityInterface,IController, IMarketPlugin…
Dynesshely Dec 29, 2022
723426d
📝 Chore: ...
Dynesshely Dec 29, 2022
1b1f0dc
💾 Feat: port of KitX.Web.Rules in Java
Dynesshely Dec 29, 2022
58a523d
💾 📝 Feat, Chore: 尝试了 MAUI, 移动端不考虑迁移到 MAUI 框架, 继续使用 Flutter
Dynesshely Jan 1, 2023
17c84a2
💾 Feat: 其他语言的 Contracts 实现, Cpp 的 Loader 相关实现
Dynesshely Jan 1, 2023
d0383d8
💾 📝 Feat, Chore: 语言文件去掉空行, 测试最新的语言项编辑器
Dynesshely Jan 1, 2023
3b66222
💾 Feat: 抽象 Command 类
Dynesshely Jan 1, 2023
ee27519
🎇 Style(KitX.Web.Rules): 清理 using
Dynesshely Jan 1, 2023
fa7fa02
💾 Feat(KitX.Test): 关于 JsonSerializer 对 byte[] 的序列化支持测试
Dynesshely Jan 1, 2023
ad57c54
💾 Feat(KitX Dashboard): 增加调试命令; 网络相关功能新增及调整
Dynesshely Jan 1, 2023
8595aad
💾 Feat(KitX.Web.Rules): Command 新增命令类型, Call = 1, CallBack = 2
Dynesshely Jan 1, 2023
03ae50d
📄 Docs(KitX.Web.Rules): Command 的注释
Dynesshely Jan 2, 2023
c899753
📝 Chore: 更新版本号, 目标: 23.04
Dynesshely Jan 2, 2023
6c4c785
✔️ Test(KitX.Web.Rules): About KitX.Web.Rules/Command
Dynesshely Jan 2, 2023
a0fa9f4
Merge branch 'main' into dev=main
Dynesshely Jan 2, 2023
2c50b8c
📄 Docs: About Pull Request Title Template
Dynesshely Jan 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@

# Contributing Rules

## Rules About Commt Message
**View This**: https://docs.catrol.cn/rules/team/git/#%E6%8F%90%E4%BA%A4%E6%B6%88%E6%81%AF%E8%A7%84%E8%8C%83
And we provide commit.template.txt in root of KitX source codes folder.

## Pull Request Title

### About Modify
修改类别 (使用时 "几项`<修改类别>`"):

- 功能新增 (新增)
- 功能移除 (移除)
- 逻辑重构 (重构)
- 问题修复 (修复)

例如: `[Pull Request] 三项新增, 一项修复`
2 changes: 1 addition & 1 deletion KitX Contracts
Open in desktop
Submodule KitX Contracts updated from 666ac3 to 8b52d2
2 changes: 1 addition & 1 deletion KitX Dashboard
Open in desktop
Submodule KitX Dashboard updated 19 files
+7 −1 Data/AppConfig.cs
+1 −1 KitX Dashboard.csproj
+3 −22 Languages/en-us.axaml
+2 −21 Languages/fr-fr.axaml
+2 −21 Languages/ja-jp.axaml
+2 −21 Languages/ko-kr.axaml
+2 −21 Languages/ru-ru.axaml
+2 −21 Languages/zh-cn.axaml
+2 −21 Languages/zh-tw.axaml
+24 −0 Properties/PublishProfiles/win-x64-single-desktop-notification.pubxml
+197 −50 Services/DebugService.cs
+144 −56 Services/DevicesServer.cs
+15 −8 Services/StatisticsManager.cs
+13 −2 Services/WebManager.cs
+1 −1 ViewModels/Pages/Controls/DevelopingViewModel.cs
+4 −2 ViewModels/Pages/Controls/Settings_GeneralViewModel.cs
+29 −3 ViewModels/Pages/Controls/Settings_PerformenceViewModel.cs
+28 −6 Views/MainWindow.axaml.cs
+96 −69 Views/Pages/Controls/Settings_Performence.axaml
2 changes: 1 addition & 1 deletion KitX File Format Helper
Open in desktop
Submodule KitX File Format Helper updated from 4aea2b to 645951
2 changes: 1 addition & 1 deletion KitX Installer
Open in desktop
Submodule KitX Installer updated 5 files
+5 −4 Installer for Windows/KitX Installer for Windows in .NET Framework/Properties/AssemblyInfo.cs
+8 −0 Installer for Windows/KitX Installer for Windows in aardio/default.aproj
+17 −0 Installer for Windows/KitX Installer for Windows in aardio/dlg/languageSelectDialog.aardio
+17 −0 Installer for Windows/KitX Installer for Windows in aardio/lib/config.aardio
+8 −0 Installer for Windows/KitX Installer for Windows in aardio/main.aardio
2 changes: 1 addition & 1 deletion KitX Loaders
Open in desktop
Submodule KitX Loaders updated 23 files
+154 −0 KitX.Loader.CPP/KitX.Loader.CPP.vcxproj
+69 −0 KitX.Loader.CPP/KitX.Loader.CPP.vcxproj.filters
+16 −0 KitX.Loader.CPP/LoaderStruct.json
+50 −0 KitX.Loader.CPP/PluginStruct.json
+69 −0 KitX.Loader.CPP/configor/configor.hpp
+834 −0 KitX.Loader.CPP/configor/configor_conversion.hpp
+242 −0 KitX.Loader.CPP/configor/configor_declare.hpp
+388 −0 KitX.Loader.CPP/configor/configor_encoding.hpp
+158 −0 KitX.Loader.CPP/configor/configor_exception.hpp
+546 −0 KitX.Loader.CPP/configor/configor_iterator.hpp
+319 −0 KitX.Loader.CPP/configor/configor_parser.hpp
+326 −0 KitX.Loader.CPP/configor/configor_serializer.hpp
+465 −0 KitX.Loader.CPP/configor/configor_stream.hpp
+86 −0 KitX.Loader.CPP/configor/configor_token.hpp
+1,181 −0 KitX.Loader.CPP/configor/configor_value.hpp
+172 −0 KitX.Loader.CPP/configor/configor_wrapper.hpp
+1,010 −0 KitX.Loader.CPP/configor/json.hpp
+53 −0 KitX.Loader.CPP/loader.h
+22 −0 KitX.Loader.CPP/plugin.cpp
+17 −0 KitX.Loader.Cpp.Self/.gitignore
+6 −0 KitX.Loader.Cpp.Self/CMakeLists.txt
+5 −0 KitX.Loader.Cpp.Self/loader.cpp
+8 −0 KitX.Loader.Cpp.Self/loader.h
2 changes: 1 addition & 1 deletion KitX Mobile
Open in desktop
Submodule KitX Mobile updated 62 files
+0 −36 .github/ISSUE_TEMPLATE/---bug-report.md
+0 −20 .github/ISSUE_TEMPLATE/---feature-request.md
+52 −0 .github/ISSUE_TEMPLATE/bug_report.yml
+1 −0 .github/ISSUE_TEMPLATE/config.yml
+29 −0 .github/ISSUE_TEMPLATE/feature_request.yml
+350 −0 KitX Mobile MAUI/.gitignore
+14 −0 KitX Mobile MAUI/App.xaml
+12 −0 KitX Mobile MAUI/App.xaml.cs
+14 −0 KitX Mobile MAUI/AppShell.xaml
+10 −0 KitX Mobile MAUI/AppShell.xaml.cs
+55 −0 KitX Mobile MAUI/KitX Mobile MAUI.csproj
+41 −0 KitX Mobile MAUI/MainPage.xaml
+24 −0 KitX Mobile MAUI/MainPage.xaml.cs
+25 −0 KitX Mobile MAUI/MauiProgram.cs
+6 −0 KitX Mobile MAUI/Platforms/Android/AndroidManifest.xml
+11 −0 KitX Mobile MAUI/Platforms/Android/MainActivity.cs
+16 −0 KitX Mobile MAUI/Platforms/Android/MainApplication.cs
+6 −0 KitX Mobile MAUI/Platforms/Android/Resources/values/colors.xml
+10 −0 KitX Mobile MAUI/Platforms/MacCatalyst/AppDelegate.cs
+30 −0 KitX Mobile MAUI/Platforms/MacCatalyst/Info.plist
+16 −0 KitX Mobile MAUI/Platforms/MacCatalyst/Program.cs
+17 −0 KitX Mobile MAUI/Platforms/Tizen/Main.cs
+15 −0 KitX Mobile MAUI/Platforms/Tizen/tizen-manifest.xml
+8 −0 KitX Mobile MAUI/Platforms/Windows/App.xaml
+24 −0 KitX Mobile MAUI/Platforms/Windows/App.xaml.cs
+46 −0 KitX Mobile MAUI/Platforms/Windows/Package.appxmanifest
+15 −0 KitX Mobile MAUI/Platforms/Windows/app.manifest
+10 −0 KitX Mobile MAUI/Platforms/iOS/AppDelegate.cs
+32 −0 KitX Mobile MAUI/Platforms/iOS/Info.plist
+16 −0 KitX Mobile MAUI/Platforms/iOS/Program.cs
+8 −0 KitX Mobile MAUI/Properties/launchSettings.json
+4 −0 KitX Mobile MAUI/Resources/AppIcon/appicon.svg
+8 −0 KitX Mobile MAUI/Resources/AppIcon/appiconfg.svg
+ − KitX Mobile MAUI/Resources/Fonts/OpenSans-Regular.ttf
+ − KitX Mobile MAUI/Resources/Fonts/OpenSans-Semibold.ttf
+93 −0 KitX Mobile MAUI/Resources/Images/dotnet_bot.svg
+15 −0 KitX Mobile MAUI/Resources/Raw/AboutAssets.txt
+8 −0 KitX Mobile MAUI/Resources/Splash/splash.svg
+44 −0 KitX Mobile MAUI/Resources/Styles/Colors.xaml
+405 −0 KitX Mobile MAUI/Resources/Styles/Styles.xaml
+7 −2 README.md
+6 −3 kitx_mobile/android/app/build.gradle
+144 −129 kitx_mobile/lib/main.dart
+32 −0 kitx_mobile/lib/pages/about_page.dart
+32 −0 kitx_mobile/lib/pages/account_page.dart
+138 −139 kitx_mobile/lib/pages/device_page.dart
+0 −53 kitx_mobile/lib/pages/home_page.dart
+32 −0 kitx_mobile/lib/pages/setting_page.dart
+50 −50 kitx_mobile/lib/pages/test_page.dart
+223 −223 kitx_mobile/lib/pages/test_pages/device_test.dart
+128 −128 kitx_mobile/lib/pages/test_pages/network_info_test.dart
+56 −56 kitx_mobile/lib/rules/device_info_struct.dart
+41 −41 kitx_mobile/lib/services/devices.dart
+0 −129 kitx_mobile/lib/services/web_server.dart
+126 −0 kitx_mobile/lib/services/web_service.dart
+25 −24 kitx_mobile/lib/utils/config.dart
+37 −37 kitx_mobile/lib/utils/datetime_format.dart
+6 −0 kitx_mobile/lib/utils/global.dart
+9 −0 kitx_mobile/lib/utils/intent.dart
+34 −31 kitx_mobile/lib/utils/translation.dart
+13 −13 kitx_mobile/test/widget_test.dart
+349 −279 代码开发规范.md
2 changes: 1 addition & 1 deletion KitX Rules
Open in desktop
Submodule KitX Rules updated from 5ff58b to b2585e
2 changes: 1 addition & 1 deletion KitX Test
Open in desktop
Submodule KitX Test updated from d52653 to 17a39d
29 changes: 29 additions & 0 deletions KitX.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ToolKits", "ToolKits", "{C2
ToolKits\publish.cs = ToolKits\publish.cs
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Simple Test", "KitX Simple Test", "{44633942-8DFC-4A3C-A474-E8AB8E8622B8}"
ProjectSection(SolutionItems) = preProject
KitX Test\KitX Simple Test\Test-Dashboard-DebugService-ReplaceQuotes(string).linq = KitX Test\KitX Simple Test\Test-Dashboard-DebugService-ReplaceQuotes(string).linq
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KitX Mobile", "KitX Mobile", "{0E21D0F4-FD04-454A-B395-E55F5861416D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KitX Mobile MAUI", "KitX Mobile\KitX Mobile MAUI\KitX Mobile MAUI.csproj", "{46EAC701-CFA5-4384-8FBA-A325A94D842D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -689,6 +698,24 @@ Global
{D6E2CBAA-B03E-4190-86A8-6FC5B092B6F0}.Release|x64.Build.0 = Release|Any CPU
{D6E2CBAA-B03E-4190-86A8-6FC5B092B6F0}.Release|x86.ActiveCfg = Release|Any CPU
{D6E2CBAA-B03E-4190-86A8-6FC5B092B6F0}.Release|x86.Build.0 = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|x64.ActiveCfg = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|x64.Build.0 = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|x64.Deploy.0 = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|x86.ActiveCfg = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|x86.Build.0 = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Debug|x86.Deploy.0 = Debug|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|Any CPU.Build.0 = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|Any CPU.Deploy.0 = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|x64.ActiveCfg = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|x64.Build.0 = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|x64.Deploy.0 = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|x86.ActiveCfg = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|x86.Build.0 = Release|Any CPU
{46EAC701-CFA5-4384-8FBA-A325A94D842D}.Release|x86.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -749,6 +776,8 @@ Global
{9EC8B0AF-3AD8-49FB-A9DA-154E6EA617C1} = {F021B1E7-44AC-469B-AB4D-36541902C694}
{D6E2CBAA-B03E-4190-86A8-6FC5B092B6F0} = {F021B1E7-44AC-469B-AB4D-36541902C694}
{C2B042C4-453F-4494-86AF-D1513DC5E9AA} = {F9F655A9-54A3-4E3C-853F-EFA24615ED67}
{44633942-8DFC-4A3C-A474-E8AB8E8622B8} = {F8379F09-5E41-48AA-9643-047BD17B1CA7}
{46EAC701-CFA5-4384-8FBA-A325A94D842D} = {0E21D0F4-FD04-454A-B395-E55F5861416D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {09BBC227-F41B-4D10-9E38-0EEE07ED17BC}
Expand Down