取消模块分发

huoyaoyuan · Dec 13, 2017 · da4b0c7 · da4b0c7
1 parent de96c99
commit da4b0c7
Show file tree

Hide file tree

Showing 31 changed files with 81 additions and 619 deletions.
diff --git a/AdmiralRoom.sln b/AdmiralRoom.sln
@@ -1,20 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2003
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdmiralRoom", "AdmiralRoom\AdmiralRoom.csproj", "{501AD96A-9AAE-4232-98E6-1ED41067C1FB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akashi", "Modules\Akashi\Akashi.csproj", "{F0245DDE-EF28-4E72-8493-E1FCAF380E8B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasterDataViewer", "Modules\MasterDataViewer\MasterDataViewer.csproj", "{BCCF344F-69B8-443C-9173-0DC640735871}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ranking", "Modules\Ranking\Ranking.csproj", "{0394F232-C474-4F4F-9F0C-9865C92902DA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawApiViewer", "Modules\RawApiViewer\RawApiViewer.csproj", "{57FA364A-4801-406C-909A-D1AEAC7AFA2C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,34 +15,13 @@ Global
 		{501AD96A-9AAE-4232-98E6-1ED41067C1FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{501AD96A-9AAE-4232-98E6-1ED41067C1FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{501AD96A-9AAE-4232-98E6-1ED41067C1FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0245DDE-EF28-4E72-8493-E1FCAF380E8B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCCF344F-69B8-443C-9173-0DC640735871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCCF344F-69B8-443C-9173-0DC640735871}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCCF344F-69B8-443C-9173-0DC640735871}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCCF344F-69B8-443C-9173-0DC640735871}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0394F232-C474-4F4F-9F0C-9865C92902DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0394F232-C474-4F4F-9F0C-9865C92902DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0394F232-C474-4F4F-9F0C-9865C92902DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0394F232-C474-4F4F-9F0C-9865C92902DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57FA364A-4801-406C-909A-D1AEAC7AFA2C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F0245DDE-EF28-4E72-8493-E1FCAF380E8B} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D}
-		{BCCF344F-69B8-443C-9173-0DC640735871} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D}
-		{0394F232-C474-4F4F-9F0C-9865C92902DA} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D}
-		{57FA364A-4801-406C-909A-D1AEAC7AFA2C} = {430ECE0C-AFBA-47EB-98DD-3F2D0186AF4D}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_SortFileContentOnSave = True
 		RESX_ResXSortingComparison = InvariantCulture
+		RESX_SortFileContentOnSave = True
+		SolutionGuid = {BD1C1326-C931-40E1-860A-758FE3E95081}
 	EndGlobalSection
 EndGlobal
diff --git a/Modules/Ranking/ranking_getlist.cs → AdmiralRoom/API/ranking_getlist.cs b/Modules/Ranking/ranking_getlist.cs → AdmiralRoom/API/ranking_getlist.cs
diff --git a/AdmiralRoom/AdmiralRoom.csproj b/AdmiralRoom/AdmiralRoom.csproj
@@ -142,6 +142,7 @@
     <Compile Include="API\map_start_next.cs" />
     <Compile Include="API\mission_result.cs" />
     <Compile Include="API\port_port.cs" />
+    <Compile Include="API\ranking_getlist.cs" />
     <Compile Include="API\req_getship.cs" />
     <Compile Include="API\sortie_battle.old.cs" />
     <Compile Include="API\sortie_battle.cs" />
@@ -160,13 +161,17 @@
     <Compile Include="Logger\BattleDetail.old.cs" />
     <Compile Include="Logger\BattleDetail.cs" />
     <Compile Include="Logger\IBattleDetail.cs" />
+    <Compile Include="Models\ApiModel.cs" />
     <Compile Include="Notifier\MessageBoxNotifierFactory.cs" />
     <Compile Include="Notifier\NotifierFactory.cs" />
+    <Compile Include="Officer\Akashi\AkashiViewModel.cs" />
     <Compile Include="Officer\Battle\InBattle.cs" />
     <Compile Include="Officer\Battle\Old\Battle.cs" />
     <Compile Include="Officer\Battle\Old\Stage.cs" />
     <Compile Include="Officer\Battle\Stage.cs" />
     <Compile Include="Officer\General\IdentifiableEqualityComparer.cs" />
+    <Compile Include="Officer\RankingViewModel.cs" />
+    <Compile Include="Officer\RawApi.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="Composition\IModuleMetadata.cs" />
     <Compile Include="Composition\ISubView.cs" />
@@ -275,6 +280,9 @@
     <Compile Include="Views\AdmiralView.xaml.cs">
       <DependentUpon>AdmiralView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Standalone\AkashiWindow.xaml.cs">
+      <DependentUpon>AkashiWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\BattleView.xaml.cs">
       <DependentUpon>BattleView.xaml</DependentUpon>
     </Compile>
@@ -287,6 +295,7 @@
     <Compile Include="Views\Converter\CondColorConverter.cs" />
     <Compile Include="Views\Converter\DateTimeOffsetConverter.cs" />
     <Compile Include="Views\Converter\EnumVisibilityConverter.cs" />
+    <Compile Include="Views\Converter\JsonConverter.cs" />
     <Compile Include="Views\Converter\LVColorConverter.cs" />
     <Compile Include="Views\Converter\NullToVisibilityConverter.cs" />
     <Compile Include="Views\Converter\RadioButtonConverter.cs" />
@@ -310,6 +319,12 @@
     <Compile Include="Views\QuestOverview.xaml.cs">
       <DependentUpon>QuestOverview.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\RankingView.xaml.cs">
+      <DependentUpon>RankingView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\RawApiView.xaml.cs">
+      <DependentUpon>RawApiView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\RepairView.xaml.cs">
       <DependentUpon>RepairView.xaml</DependentUpon>
     </Compile>
@@ -330,6 +345,9 @@
     <Compile Include="Views\Standalone\LogView.xaml.cs">
       <DependentUpon>LogView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Standalone\MasterDataWindow.xaml.cs">
+      <DependentUpon>MasterDataWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Standalone\MaterialCatalog.xaml.cs">
       <DependentUpon>MaterialCatalog.xaml</DependentUpon>
     </Compile>
@@ -385,6 +403,13 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Officer\Akashi\AkashiData.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <DependentUpon>AkashiData.tt</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <SubType>Designer</SubType>
+      <DesignTime>True</DesignTime>
+    </Page>
     <Page Include="Resources\DefaultTheme.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -409,6 +434,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Standalone\AkashiWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\BattleView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -441,6 +470,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\RankingView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\RawApiView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\RepairView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -465,6 +502,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Standalone\MasterDataWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\Standalone\MaterialCatalog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -586,6 +627,11 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>StringTable.xaml</LastGenOutput>
     </Content>
+    <Resource Include="Officer\Akashi\AkashiData.txt" />
+    <Content Include="Officer\Akashi\AkashiData.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>AkashiData.xaml</LastGenOutput>
+    </Content>
     <Content Include="Officer\StaticCounters.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>StaticCounters.cs</LastGenOutput>

diff --git a/Modules/RawApiViewer/ApiModel.cs → AdmiralRoom/Models/ApiModel.cs b/Modules/RawApiViewer/ApiModel.cs → AdmiralRoom/Models/ApiModel.cs
@@ -1,7 +1,6 @@
-using Huoyaoyuan.AdmiralRoom;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
-namespace RawApiViewer
+namespace Huoyaoyuan.AdmiralRoom.Models
 {
     class ApiModel
     {

diff --git a/Modules/Akashi/AkashiData.tt → AdmiralRoom/Officer/Akashi/AkashiData.tt b/Modules/Akashi/AkashiData.tt → AdmiralRoom/Officer/Akashi/AkashiData.tt
@@ -5,7 +5,7 @@
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Collections.Generic" #>
 <#@ output extension=".xaml" #>
-<x:Array xmlns="clr-namespace:Huoyaoyuan.AdmiralRoom.Modules.Akashi"
+<x:Array xmlns="clr-namespace:Huoyaoyuan.AdmiralRoom.Officer.Akashi"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Type="{x:Type EnhancementInfo}">
 <#

diff --git a/Modules/Akashi/AkashiData.txt → AdmiralRoom/Officer/Akashi/AkashiData.txt b/Modules/Akashi/AkashiData.txt → AdmiralRoom/Officer/Akashi/AkashiData.txt
diff --git a/Modules/Akashi/AkashiData.xaml → AdmiralRoom/Officer/Akashi/AkashiData.xaml b/Modules/Akashi/AkashiData.xaml → AdmiralRoom/Officer/Akashi/AkashiData.xaml
@@ -1,4 +1,4 @@
-<x:Array xmlns="clr-namespace:Huoyaoyuan.AdmiralRoom.Modules.Akashi"
+<x:Array xmlns="clr-namespace:Huoyaoyuan.AdmiralRoom.Officer.Akashi"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Type="{x:Type EnhancementInfo}">
     <EnhancementInfo EquipId="2" CostItem1="10" CostItem2="30" CostItem3="60" CostItem4="0">

diff --git a/Modules/Akashi/AkashiViewModel.cs → ...ralRoom/Officer/Akashi/AkashiViewModel.cs b/Modules/Akashi/AkashiViewModel.cs → ...ralRoom/Officer/Akashi/AkashiViewModel.cs
@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using Huoyaoyuan.AdmiralRoom.Officer;
 using Meowtrix.ComponentModel;
 
-namespace Huoyaoyuan.AdmiralRoom.Modules.Akashi
+namespace Huoyaoyuan.AdmiralRoom.Officer.Akashi
 {
     class AkashiViewModel : NotificationObject
     {
@@ -28,7 +27,7 @@ public int WeekDay
 
         public IReadOnlyList<EnhancementInfo> TodayInfo => AllInfo.Select(x => x.CopyOfWeekDay(WeekDay)).Where(x => x.Secretaries.Any()).ToArray();
         private readonly IReadOnlyList<EnhancementInfo> AllInfo
-            = (IReadOnlyList<EnhancementInfo>)Application.LoadComponent(new Uri("Akashi;component/AkashiData.xaml", UriKind.Relative));
+            = (IReadOnlyList<EnhancementInfo>)Application.LoadComponent(new Uri("AdmiralRoom;component/Officer/Akashi/AkashiData.xaml", UriKind.Relative));
     }
     class EnhancementInfo
     {

diff --git a/Modules/Ranking/RankingViewModel.cs → AdmiralRoom/Officer/RankingViewModel.cs b/Modules/Ranking/RankingViewModel.cs → AdmiralRoom/Officer/RankingViewModel.cs
@@ -2,10 +2,9 @@
 using System.ComponentModel;
 using System.IO;
 using Huoyaoyuan.AdmiralRoom.API;
-using Huoyaoyuan.AdmiralRoom.Officer;
 using Meowtrix.ComponentModel;
 
-namespace Huoyaoyuan.AdmiralRoom.Modules.Ranking
+namespace Huoyaoyuan.AdmiralRoom.Officer
 {
     class RankingViewModel : NotificationObject
     {

diff --git a/Modules/RawApiViewer/RawApiViewModel.cs → AdmiralRoom/Officer/RawApi.cs b/Modules/RawApiViewer/RawApiViewModel.cs → AdmiralRoom/Officer/RawApi.cs
@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Huoyaoyuan.AdmiralRoom;
-using Huoyaoyuan.AdmiralRoom.Officer;
+using Huoyaoyuan.AdmiralRoom.Models;
 using Meowtrix.ComponentModel;
 using Newtonsoft.Json.Linq;
 
-namespace RawApiViewer
+namespace Huoyaoyuan.AdmiralRoom.Officer
 {
-    class RawApiViewModel : NotificationObject
+    class RawApi : NotificationObject
     {
-        public static RawApiViewModel Instance { get; } = new RawApiViewModel();
-        private RawApiViewModel()
+        public static RawApi Instance { get; } = new RawApi();
+        private RawApi()
         {
             Staff.API("").Subscribe(AddSession);
         }

diff --git a/Modules/RawApiViewer/JsonConverter.cs → AdmiralRoom/Views/Converter/JsonConverter.cs b/Modules/RawApiViewer/JsonConverter.cs → AdmiralRoom/Views/Converter/JsonConverter.cs
@@ -3,7 +3,7 @@
 using System.Windows.Data;
 using Newtonsoft.Json.Linq;
 
-namespace RawApiViewer
+namespace Huoyaoyuan.AdmiralRoom.Views.Converter
 {
     class JsonConverter : IValueConverter
     {

diff --git a/Modules/Ranking/RankingView.xaml → AdmiralRoom/Views/RankingView.xaml b/Modules/Ranking/RankingView.xaml → AdmiralRoom/Views/RankingView.xaml
@@ -1,10 +1,10 @@
-<UserControl x:Class="Huoyaoyuan.AdmiralRoom.Modules.Ranking.RankingView"
+<UserControl x:Class="Huoyaoyuan.AdmiralRoom.Views.RankingView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom.Modules.Ranking"
-             DataContext="{x:Static local:RankingViewModel.Instance}"
+             xmlns:officer="clr-namespace:Huoyaoyuan.AdmiralRoom.Officer"
+             DataContext="{x:Static officer:RankingViewModel.Instance}"
              mc:Ignorable="d">
     <Grid>
         <Grid.Resources>

diff --git a/Modules/Ranking/RankingView.xaml.cs → AdmiralRoom/Views/RankingView.xaml.cs b/Modules/Ranking/RankingView.xaml.cs → AdmiralRoom/Views/RankingView.xaml.cs
@@ -4,7 +4,7 @@
 using System.Windows.Controls;
 using Huoyaoyuan.AdmiralRoom.Composition;
 
-namespace Huoyaoyuan.AdmiralRoom.Modules.Ranking
+namespace Huoyaoyuan.AdmiralRoom.Views
 {
     /// <summary>
     /// RankingView.xaml 的交互逻辑

diff --git a/Modules/RawApiViewer/RawApiView.xaml → AdmiralRoom/Views/RawApiView.xaml b/Modules/RawApiViewer/RawApiView.xaml → AdmiralRoom/Views/RawApiView.xaml
@@ -1,15 +1,16 @@
-<UserControl x:Class="RawApiViewer.RawApiView"
+<UserControl x:Class="Huoyaoyuan.AdmiralRoom.Views.RawApiView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:RawApiViewer"
+             xmlns:officer="clr-namespace:Huoyaoyuan.AdmiralRoom.Officer"
+             xmlns:converters="clr-namespace:Huoyaoyuan.AdmiralRoom.Views.Converter"
              xmlns:ex="urn:controlzex"
              d:DesignHeight="300" d:DesignWidth="300"
-             DataContext="{x:Static local:RawApiViewModel.Instance}"
+             DataContext="{x:Static officer:RawApi.Instance}"
              mc:Ignorable="d">
     <UserControl.Resources>
-        <local:JsonConverter x:Key="JsonConverter"/>
+        <converters:JsonConverter x:Key="JsonConverter"/>
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>

diff --git a/Modules/RawApiViewer/RawApiView.xaml.cs → AdmiralRoom/Views/RawApiView.xaml.cs b/Modules/RawApiViewer/RawApiView.xaml.cs → AdmiralRoom/Views/RawApiView.xaml.cs
@@ -4,7 +4,7 @@
 using System.Windows.Controls;
 using Huoyaoyuan.AdmiralRoom.Composition;
 
-namespace RawApiViewer
+namespace Huoyaoyuan.AdmiralRoom.Views
 {
     /// <summary>
     /// RawApiView.xaml 的交互逻辑

diff --git a/Modules/Akashi/AkashiWindow.xaml → ...alRoom/Views/Standalone/AkashiWindow.xaml b/Modules/Akashi/AkashiWindow.xaml → ...alRoom/Views/Standalone/AkashiWindow.xaml
@@ -1,10 +1,10 @@
-<Window x:Class="Huoyaoyuan.AdmiralRoom.Modules.Akashi.AkashiWindow"
+<Window x:Class="Huoyaoyuan.AdmiralRoom.Views.Standalone.AkashiWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom.Modules.Akashi"
-        xmlns:main="clr-namespace:Huoyaoyuan.AdmiralRoom;assembly=AdmiralRoom"
+        xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom.Officer.Akashi"
+        xmlns:main="clr-namespace:Huoyaoyuan.AdmiralRoom"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=local:AkashiViewModel}"
         Icon="{x:Null}"

diff --git a/Modules/Akashi/AkashiWindow.xaml.cs → ...oom/Views/Standalone/AkashiWindow.xaml.cs b/Modules/Akashi/AkashiWindow.xaml.cs → ...oom/Views/Standalone/AkashiWindow.xaml.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using Huoyaoyuan.AdmiralRoom.Composition;
 
-namespace Huoyaoyuan.AdmiralRoom.Modules.Akashi
+namespace Huoyaoyuan.AdmiralRoom.Views.Standalone
 {
     /// <summary>
     /// AkashiWindow.xaml 的交互逻辑

diff --git a/...es/MasterDataViewer/MasterDataWindow.xaml → ...om/Views/Standalone/MasterDataWindow.xaml b/...es/MasterDataViewer/MasterDataWindow.xaml → ...om/Views/Standalone/MasterDataWindow.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="Huoyaoyuan.AdmiralRoom.Modules.MasterDataViewer.MasterDataWindow"
+<Window x:Class="Huoyaoyuan.AdmiralRoom.Views.MasterDataWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Huoyaoyuan.AdmiralRoom.Modules.MasterDataViewer"
         xmlns:ex="urn:controlzex"
-        xmlns:main="clr-namespace:Huoyaoyuan.AdmiralRoom;assembly=AdmiralRoom"
-        xmlns:officer="clr-namespace:Huoyaoyuan.AdmiralRoom.Officer;assembly=AdmiralRoom"
+        xmlns:main="clr-namespace:Huoyaoyuan.AdmiralRoom"
+        xmlns:officer="clr-namespace:Huoyaoyuan.AdmiralRoom.Officer"
         mc:Ignorable="d"
         DataContext="{Binding MasterData, Source={x:Static officer:Staff.Current}}"
         FontFamily="{Binding FontFamily, Source={x:Static main:Config.Current}}"

diff --git a/...MasterDataViewer/MasterDataWindow.xaml.cs → ...Views/Standalone/MasterDataWindow.xaml.cs b/...MasterDataViewer/MasterDataWindow.xaml.cs → ...Views/Standalone/MasterDataWindow.xaml.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using Huoyaoyuan.AdmiralRoom.Composition;
 
-namespace Huoyaoyuan.AdmiralRoom.Modules.MasterDataViewer
+namespace Huoyaoyuan.AdmiralRoom.Views
 {
     /// <summary>
     /// MasterDataWindow.xaml 的交互逻辑

diff --git a/Modules/Akashi/Akashi.cs b/Modules/Akashi/Akashi.cs