Доработка сервера и добавление культуры

MilkRen · May 3, 2024 · 75eec07 · 75eec07
1 parent c90c9f1
commit 75eec07
Show file tree

Hide file tree

Showing 15 changed files with 158 additions and 329 deletions.
diff --git a/LauncherDM/LauncherDM.csproj b/LauncherDM/LauncherDM.csproj
@@ -86,15 +86,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Source\Resources\Resource.Designer.cs">
+    <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>Resource.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Source\Resources\ResourceEng.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ResourceEng.resx</DependentUpon>
+      <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Update="Source\Settings\SettingsApp.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
@@ -104,13 +99,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Source\Resources\Resource.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    <EmbeddedResource Update="Properties\Resources.en.resx">
+      <DependentUpon>Resources.resx</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Update="Source\Resources\ResourceEng.resx">
+    <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>ResourceEng.Designer.cs</LastGenOutput>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
 

diff --git a/ServerTCP/Resources/Resource.rus.Designer.cs → LauncherDM/Properties/Resources.Designer.cs b/ServerTCP/Resources/Resource.rus.Designer.cs → LauncherDM/Properties/Resources.Designer.cs
diff --git a/LauncherDM/Properties/Resources.en.resx b/LauncherDM/Properties/Resources.en.resx
@@ -0,0 +1,17 @@
+<root>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="Reconnection" xml:space="preserve">
+		<value>Reconnect after {0} ms</value>
+	</data>
+</root>
diff --git a/LauncherDM/Source/Resources/Resource.resx → LauncherDM/Properties/Resources.resx b/LauncherDM/Source/Resources/Resource.resx → LauncherDM/Properties/Resources.resx
@@ -98,4 +98,7 @@
 	<resheader name="writer">
 		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</resheader>
+	<data name="Reconnection" xml:space="preserve">
+		<value>Повторное подключение через {0} мс</value>
+	</data>
 </root>
diff --git a/LauncherDM/Services/Interfaces/ILoadingWindowService.cs b/LauncherDM/Services/Interfaces/ILoadingWindowService.cs
@@ -6,6 +6,8 @@ interface ILoadingWindowService
 
         string GetTitle();
 
+        bool CheckUpdate();
+
         string DescInfoConnect();
     }
 }
diff --git a/LauncherDM/Services/LoadingWindowService.cs b/LauncherDM/Services/LoadingWindowService.cs
@@ -13,11 +13,8 @@ public bool CheckRequestServer()
             if (serverRequest is null)
                 serverRequest = new ServerRequestService();
 
-            //var requestMessageServer = serverRequest.SendMessageRequest(MessageHeader.MessageType.Check);
-            //return requestMessageServer.Message == "1";
-
-            var a = serverRequest.SendMessageRequest(MessageHeader.MessageType.Token);
-            return false;
+            var requestMessageServer = serverRequest.SendMessageRequest(MessageHeader.MessageType.Check);
+            return requestMessageServer.Message.ToString() == "1";
         }
 
         public string GetTitle()
@@ -29,6 +26,11 @@ public string GetTitle()
             return requestMessageServer.Message.ToString();
         }
 
+        public bool CheckUpdate()
+        {
+            throw new NotImplementedException();
+        }
+
         public string DescInfoConnect()
         {
             if (serverRequest is null)

diff --git a/LauncherDM/Source/Resources/ResourceEng.Designer.cs b/LauncherDM/Source/Resources/ResourceEng.Designer.cs
diff --git a/LauncherDM/Source/Resources/ResourceEng.resx b/LauncherDM/Source/Resources/ResourceEng.resx
diff --git a/LauncherDM/ViewModels/LoadingWindowViewModel.cs b/LauncherDM/ViewModels/LoadingWindowViewModel.cs
@@ -83,29 +83,35 @@ private void Load()
             { 
                 if (checkNetwork.CheckingNetworkConnection())
                 {
-                    if (Server.CheckRequestServer())
+                    int countMs = 1000;
+                    while (true)
                     {
-                        DescInfoConnect = Server.GetTitle();
-
-                        Thread.Sleep(5000);
-                        _loadingWindow.Dispatcher.Invoke(() =>
+                        if (Server.CheckRequestServer())
                         {
-                            IDialogWindowService windowService = new DialogWindowService();
-                            windowService.OpenWindow(this);
-                            _loadingWindow.Hide();
-                        });
-                    }
-                    else
-                    {
-                        IDialogMessageBoxService dialogMessageBox = new DialogMessageBoxService();
-                        dialogMessageBox.DialogShow("s","s");
+                            DescInfoConnect = Server.GetTitle();
+
+                            Thread.Sleep(5000);
+                            _loadingWindow.Dispatcher.Invoke(() =>
+                            {
+                                IDialogWindowService windowService = new DialogWindowService();
+                                windowService.OpenWindow(this);
+                                _loadingWindow.Hide();
+                            });
+                        }
+                        else
+                        {
+                            IDialogMessageBoxService dialogMessageBox = new DialogMessageBoxService();
+                            dialogMessageBox.DialogShow("s", "s");
+                        }
                     }
                 }
                 else
+                {
                     _loadingWindow.Dispatcher.Invoke(() =>
                     {
                         Environment.Exit(0);
                     });
+                }
             });
         }
     }