stable version

Syaoran036 · Mar 22, 2023 · 2975605 · 2975605
1 parent 8fdfffa
commit 2975605
Show file tree

Hide file tree

Showing 28 changed files with 221 additions and 52 deletions.
diff --git a/iLS_terminal.sln → FreezePunch/FreezePunch.sln b/iLS_terminal.sln → FreezePunch/FreezePunch.sln
@@ -3,7 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iLS", "..\FreezePunch\FreezePunch\iLS.csproj", "{D5C1A0C9-E92C-4707-8B72-A9EC7A749108}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreezePunch", "FreezePunch\FreezePunch.csproj", "{D5C1A0C9-E92C-4707-8B72-A9EC7A749108}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EF2EE736-6E42-43B8-80DE-2315E71FE504}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HslCommunication", "..\HslCommunication\HslCommunication_Net45\HslCommunication.csproj", "{7F8029DA-1B94-4B1D-B91F-5B21DBF2F3A2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +19,10 @@ Global
 		{D5C1A0C9-E92C-4707-8B72-A9EC7A749108}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D5C1A0C9-E92C-4707-8B72-A9EC7A749108}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5C1A0C9-E92C-4707-8B72-A9EC7A749108}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F8029DA-1B94-4B1D-B91F-5B21DBF2F3A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F8029DA-1B94-4B1D-B91F-5B21DBF2F3A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F8029DA-1B94-4B1D-B91F-5B21DBF2F3A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F8029DA-1B94-4B1D-B91F-5B21DBF2F3A2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/iLS_terminal/App.config → FreezePunch/FreezePunch/App.config b/iLS_terminal/App.config → FreezePunch/FreezePunch/App.config
diff --git a/iLS_terminal/App.xaml → FreezePunch/FreezePunch/App.xaml b/iLS_terminal/App.xaml → FreezePunch/FreezePunch/App.xaml
@@ -1,5 +1,12 @@
-<Application x:Class="ISFM_Terminal.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:ISFM_Terminal" StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
-  <Application.Resources>
+<Application x:Class="FreezePunch.App" 
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+             xmlns:local="clr-namespace:FreezePunch" 
+             StartupUri="MainWindow.xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             d1p1:Ignorable="d" 
+             xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
+    <Application.Resources>
         <Style x:Key="MyButton" TargetType="Button">
             <Setter Property="OverridesDefaultStyle" Value="True" />
             <Setter Property="Cursor" Value="Hand" />

diff --git a/iLS_terminal/App.xaml.cs → FreezePunch/FreezePunch/App.xaml.cs b/iLS_terminal/App.xaml.cs → FreezePunch/FreezePunch/App.xaml.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace ISFM_Terminal
+namespace FreezePunch
 {
     /// <summary>
     /// App.xaml 的交互逻辑

diff --git a/iLS_terminal/FreezePunch.csproj → FreezePunch/FreezePunch/FreezePunch.csproj b/iLS_terminal/FreezePunch.csproj → FreezePunch/FreezePunch/FreezePunch.csproj
@@ -73,6 +73,10 @@
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
       <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net47\CommonServiceLocator.dll</HintPath>
@@ -147,6 +151,8 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\ViewModelLocator.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -203,7 +209,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="refresh-normal.png" />
+    <Resource Include="Resources\refresh-normal.png" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
@@ -218,23 +224,26 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="TextTemplate.ico" />
-    <Resource Include="exit.png" />
+    <Resource Include="Resources\TextTemplate.ico" />
+    <Resource Include="Resources\exit.png" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="30.png" />
+    <Resource Include="Resources\30.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\cemps_logo.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="cemps_logo.png" />
+    <Resource Include="Resources\ILSA.png" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Resources\" />
+    <Resource Include="Resources\40x40 %281%29.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="40x40 %281%29.png" />
+    <Resource Include="Resources\favicon.ico" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="favicon.ico" />