Библ. готова

MilkRen · May 31, 2024 · fa45c32 · fa45c32
1 parent c1add29
commit fa45c32
Show file tree

Hide file tree

Showing 22 changed files with 686 additions and 43 deletions.
diff --git a/LauncherDM/Properties/Resources.Designer.cs b/LauncherDM/Properties/Resources.Designer.cs
diff --git a/LauncherDM/Properties/Resources.en.resx b/LauncherDM/Properties/Resources.en.resx
@@ -164,4 +164,16 @@
 	<data name="InTheLibrary" xml:space="preserve">
 		<value>In the library</value>
 	</data>
+	<data name="Game" xml:space="preserve">
+		<value>Game</value>
+	</data>
+	<data name="Program" xml:space="preserve">
+		<value>Program</value>
+	</data>
+	<data name="Download" xml:space="preserve">
+		<value>DOWNLOAD</value>
+	</data>
+	<data name="Run" xml:space="preserve">
+		<value>RUN</value>
+	</data>
 </root>
diff --git a/LauncherDM/Properties/Resources.resx b/LauncherDM/Properties/Resources.resx
@@ -286,4 +286,16 @@
   <data name="InTheLibrary" xml:space="preserve">
 	  <value>В библиотеке</value>
   </data>
+  <data name="Game" xml:space="preserve">
+	  <value>Игра</value>
+  </data>
+  <data name="Program" xml:space="preserve">
+	  <value>Программа </value>
+  </data>
+  <data name="Download" xml:space="preserve">
+	  <value>СКАЧАТЬ</value>
+  </data>
+  <data name="Run" xml:space="preserve">
+	  <value>ЗАПУСТИТЬ</value>
+  </data>
 </root>
diff --git a/LauncherDM/Services/DialogWindowService.cs b/LauncherDM/Services/DialogWindowService.cs
@@ -102,9 +102,11 @@ public void OpenAccountRecovery()
         public void OpenMainWindow()
         {
             var mainWindow = new MainWindow();
-            mainWindow.DataContext = new MainWindowViewModel(mainWindow.Close, mainWindow.DragMove,
+            var MainWindowVM = new MainWindowViewModel(mainWindow.Close, mainWindow.DragMove,
                 new ToolbarToWindowViewModel(new WindowService(mainWindow), mainWindow.Hide, widthMax: 30),
                 ResourcesHelper, ServerRequest);
+            mainWindow.DataContext = MainWindowVM;
+            UpdateUI.PullUi.Subscribe(MainWindowVM);
             mainWindow.Owner = Application.Current.MainWindow;
             mainWindow.Show();
         }

diff --git a/LauncherDM/Services/Interfaces/ILibraryUserControlService.cs b/LauncherDM/Services/Interfaces/ILibraryUserControlService.cs
@@ -1,4 +1,5 @@
-using System;
+using ServerTCP.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,6 +9,8 @@ namespace LauncherDM.Services.Interfaces
 {
     interface ILibraryUserControlService
     {
-        string GetAllItems();
+        SaleGamesForXml GetGamesItem();
+
+        SaleProgramsForXml GetProgramItem();
     }
 }
diff --git a/LauncherDM/Services/LibraryUserControlService.cs b/LauncherDM/Services/LibraryUserControlService.cs
@@ -1,5 +1,8 @@
 using LauncherDM.Services.Interfaces;
 using ServerTCP;
+using ServerTCP.Models;
+using System.IO;
+using System.Xml.Serialization;
 
 namespace LauncherDM.Services
 {
@@ -12,10 +15,41 @@ public LibraryUserControlService(ServerRequestService serverRequest)
             _serverRequest = serverRequest;
         }
 
-        public string GetAllItems()
+        public SaleGamesForXml GetGamesItem()
         {
-            var requestMessageServer = _serverRequest.SendMessageRequest(MessageHeader.MessageType.AllGamesOrPrograms, true);
-            return requestMessageServer.Message.ToString();
+            var requestMessageServer = _serverRequest.SendMessageRequest(MessageHeader.MessageType.GamesItemUser, true);
+            var xml = new XmlSerializer(typeof(SaleGamesForXml));
+            var programsForXml = new SaleGamesForXml();
+            using (StringReader textReader = new StringReader(requestMessageServer.Message.ToString()))
+            {
+                try
+                {
+                    programsForXml = (SaleGamesForXml)xml.Deserialize(textReader);
+                }
+                catch
+                { }
+            }
+            return programsForXml;
         }
+
+        SaleProgramsForXml ILibraryUserControlService.GetProgramItem()
+        {
+            var requestMessageServer = _serverRequest.SendMessageRequest(MessageHeader.MessageType.ProgramsItemUser, true);
+
+            var xml = new XmlSerializer(typeof(SaleProgramsForXml));
+            var programsForXml = new SaleProgramsForXml();
+            using (StringReader textReader = new StringReader(requestMessageServer.Message.ToString()))
+            {
+                try
+                {
+                    programsForXml = (SaleProgramsForXml)xml.Deserialize(textReader);
+                }
+                catch
+                { }
+            }
+            return programsForXml;
+        }
+
+
     }
 }
diff --git a/LauncherDM/Services/ServerRequestService.cs b/LauncherDM/Services/ServerRequestService.cs
@@ -73,7 +73,11 @@ public MessageHeader SendMessageRequest(MessageHeader.MessageType messageType, b
                     tcpClient = new TcpClient();
                     tcpClient.Connect(_endPoint);
 
-                    var messageHeader = new MessageHeader(messageType, MessageLanguages.Language);
+                    MessageHeader messageHeader = null;
+                    if (loadToken)
+                        messageHeader = new MessageHeader(messageType, MessageLanguages.Language, SettingsApp.Default.Token);
+                    else
+                        messageHeader = new MessageHeader(messageType, MessageLanguages.Language);
                     byte[] headerBytes = messageHeader.MessageToArray(loadToken);
                     NetworkStream tcpStream = tcpClient.GetStream();
                     tcpStream.Write(headerBytes);

diff --git a/LauncherDM/Styles/Other/ButtonStyle.xaml b/LauncherDM/Styles/Other/ButtonStyle.xaml
@@ -568,4 +568,71 @@
         </Style.Triggers>-->
     </Style>
 
+
+    <Style x:Key="ButtonDownload" TargetType="Button">
+        <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
+        <Setter Property="Background" Value="#FF2BA9FF" />
+        <Setter Property="Template" >
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border CornerRadius="3" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetProperty="Background.(SolidColorBrush.Color)" To="#33c02b" Duration="0:0:0.3"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetProperty="Background.(SolidColorBrush.Color)" To="#FF2BA9FF" Duration="0:0:0.3"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.ExitActions>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="ButtonRun" TargetType="Button">
+        <Setter Property="FontFamily" Value="#Cascadia Mono SemiLight"/>
+        <Setter Property="Background" Value="#33c02b" />
+        <Setter Property="Template" >
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border CornerRadius="3" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetProperty="Background.(SolidColorBrush.Color)" To="#FF2BA9FF" Duration="0:0:0.3"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetProperty="Background.(SolidColorBrush.Color)" To="#33c02b" Duration="0:0:0.3"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.ExitActions>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
 </ResourceDictionary>
diff --git a/LauncherDM/Styles/Other/TextBlockStyle.xaml b/LauncherDM/Styles/Other/TextBlockStyle.xaml
@@ -20,4 +20,9 @@
         <Setter Property="Foreground" Value="White"/>
     </Style>
 
+    <Style x:Key="TitleLibItemTextBlock" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="Cascadia Code SemiBold"/>
+        <Setter Property="Foreground" Value="White"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/LauncherDM/ViewModels/ItemsViewModel.cs b/LauncherDM/ViewModels/ItemsViewModel.cs
@@ -1,11 +1,12 @@
 using LauncherDM.Infastructure.Commands;
 using LauncherDM.Infastructure.Commands.Base;
+using LauncherDM.Infrastructure.ReactiveUI;
 using ServerTCP;
 using ServerTCP.Models;
 
 namespace LauncherDM.ViewModels
 {
-    internal class ItemsViewModel : ViewModel.Base.ViewModel
+    internal class ItemsViewModel : ViewModel.Base.ViewModel, Infrastructure.ReactiveUI.Base.IObserver<LoadUI>
     {
 
         #region Binding
@@ -98,5 +99,13 @@ public ItemsViewModel(Games games, string progPath, LambdaCommand lambdaCommand
             ToolTipProgramsText = string.Concat(Description.Substring(0, Description.Length / 4), "...");
             ClickProgramCommand = lambdaCommand;
         }
+
+        public void Update(LoadUI data)
+        {
+            if (data.UpdateUI)
+            {
+                AllPropertyChanged();
+            }
+        }
     }
 }
diff --git a/LauncherDM/ViewModels/LibrarySelectItemViewModel.cs b/LauncherDM/ViewModels/LibrarySelectItemViewModel.cs
@@ -1,5 +1,6 @@
 using LauncherDM.Infastructure.Commands;
 using LauncherDM.Infastructure.Commands.Base;
+using LauncherDM.Infrastructure.ReactiveUI;
 
 namespace LauncherDM.ViewModels
 {