Skip to content

Commit

Permalink
Merge pull request #204 from Crequency/KitX/dev=main
Browse files Browse the repository at this point in the history
[Pull Request] 六项新增

新增:
1. 局域网通信 (自组网之后的主控网络)
2. 更多语言的 KitX Contracts 实现
3. Cpp 的 KitX Loader 相关尝试
4. MAUI 框架的 KitX Mobile 尝试
5. 网络相关调试命令
6. KitX.Web.Rules Command 抽象
  • Loading branch information
Dynesshely authored Jan 2, 2023
2 parents b9f95a8 + 2c50b8c commit 1e2c726
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 9 deletions.
13 changes: 12 additions & 1 deletion .github/CONTRIBUTING.md
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
2 changes: 1 addition & 1 deletion KitX File Format Helper
2 changes: 1 addition & 1 deletion KitX Mobile
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
2 changes: 1 addition & 1 deletion KitX Test
29 changes: 29 additions & 0 deletions KitX.sln
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

0 comments on commit 1e2c726

Please sign in to comment.