Часть логики светофора вынесена в реализацию интерфейса

Author: Khwost

TrafficLights/.vs/ProjectEvaluation/trafficlights.metadata.v5.1

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TrafficLights.Enums
+{
+    /// <summary>
+    /// Перечисление цветов огней
+    /// </summary>
+    public enum LightEnum
+    {
+        Red,
+
+        Yellow,
+
+        Green
+    }
+}

TrafficLights/.vs/ProjectEvaluation/trafficlights.projects.v5.1

@@ -0,0 +1,40 @@
+using System;
+using TrafficLights.Enums;
+using TrafficLights.Interfaces;
+using TrafficLights.Models;
+
+namespace TrafficLights.Implementations
+{
+    public class TrafficLights : ITrafficLights
+    {
+        private TrafficLightsModel _model;
+
+        public void Setup(TrafficLightsModel model)
+        {
+            _model = model;
+        }
+
+        public void ChangeLightState(LightEnum light, LightStateEnum state)
+        {
+            switch(light)
+            {
+                case LightEnum.Red:
+                    _model.RedLightState = state;
+                    break;
+
+                case LightEnum.Yellow:
+                    _model.YellowLightState = state;
+                    break;
+
+                case LightEnum.Green:
+                    _model.GreenLightState = state;
+                    break;
+
+                default:
+                    throw new ArgumentException(nameof(light));
+            }
+        }
+
+        
+    }
+}

TrafficLights/.vs/TrafficLights/FileContentIndex/06ba8ed5-d6cd-40f5-aead-3006d3802cc4.vsidx

@@ -0,0 +1,23 @@
+using TrafficLights.Enums;
+using TrafficLights.Models;
+
+namespace TrafficLights.Interfaces
+{
+    /// <summary>
+    /// Интерфейс для управления светофором
+    /// </summary>
+    public interface ITrafficLights
+    {
+        /// <summary>
+        /// Связать реализацию интерфейса с реальным светофором
+        /// </summary>
+        void Setup(TrafficLightsModel model);
+
+        /// <summary>
+        /// Изменить состояние огня
+        /// </summary>
+        /// <param name="light">С каким огнём работаем</param>
+        /// <param name="state">В какое состояние его переводим</param>
+        void ChangeLightState(LightEnum light, LightStateEnum state);
+    }
+}

TrafficLights/.vs/TrafficLights/FileContentIndex/11751318-fd82-4b7f-9af9-29b813c8ca9d.vsidx

@@ -4,17 +4,44 @@
 using System;
 using ReactiveUI;
 using Avalonia.ReactiveUI;
+using Microsoft.Extensions.DependencyInjection;
+using Avalonia.Logging;
+using Splat;
+using System.IO;
+using TrafficLights.Interfaces;
 
 namespace TrafficLights
 {
     internal class Program
     {
+        /// <summary>
+        /// Èíæåêòîð çàâèñèìîñòåé
+        /// </summary>
+        public static ServiceProvider Di { get; set; }
+
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
         [STAThread]
-        public static void Main(string[] args) => BuildAvaloniaApp()
+        public static void Main(string[] args)
+        {
+            // Íàñòðîéêà èíæåêòîðà çàâèñèìîñòåé
+            Di = ConfigureServices()
+                .BuildServiceProvider();
+
+            BuildAvaloniaApp()
             .StartWithClassicDesktopLifetime(args);
+        }
+
+        // Setting up DI
+        public static IServiceCollection ConfigureServices()
+        {
+            IServiceCollection services = new ServiceCollection();
+
+            services.AddSingleton<ITrafficLights, Implementations.TrafficLights>();
+
+            return services;
+        }
 
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()

TrafficLights/.vs/TrafficLights/FileContentIndex/596a44e8-31db-4ef1-8615-2075777a84bd.vsidx

@@ -29,6 +29,7 @@
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
   </ItemGroup>
 </Project>

TrafficLights/.vs/TrafficLights/FileContentIndex/6bf3707c-eb3a-4d8e-9c28-b84d1db994ed.vsidx

@@ -1,5 +1,7 @@
 using Avalonia.Media;
+using Microsoft.Extensions.DependencyInjection;
 using ReactiveUI;
+using Splat;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +11,7 @@
 using System.Threading.Tasks;
 using System.Timers;
 using TrafficLights.Enums;
+using TrafficLights.Interfaces;
 using TrafficLights.Models;
 
 namespace TrafficLights.ViewModels
@@ -121,12 +124,22 @@ public string ConsoleText
         /// </summary>
         private System.Timers.Timer _automatTimer;
 
+        /// <summary>
+        /// Интерфейс для управления огнями реального светофора
+        /// </summary>
+        private readonly ITrafficLights _trafficLights;
+
         /// <summary>
         /// Конструктор
         /// </summary>
         public MainWindowViewModel(TrafficLightsModel trafficLightsModel)
         {
             _model = trafficLightsModel;
+            
+            // Запоминаем конкретный светофор
+            _trafficLights = Program.Di.GetService<ITrafficLights>();
+            _trafficLights.Setup(_model);
+
 
             PressRedCommand = ReactiveCommand.Create(OnRedPressed); // Связывание метода с командой
             PressYellowCommand = ReactiveCommand.Create(OnYellowPressed);
@@ -213,9 +226,9 @@ private void OnCheckPressed()
         /// </summary>
         private void OnBlinkPressed()
         {
-            _model.RedLightState = LightStateEnum.Blinking;
-            _model.YellowLightState = LightStateEnum.Blinking;
-            _model.GreenLightState = LightStateEnum.Blinking;
+            _trafficLights.ChangeLightState(LightEnum.Red, LightStateEnum.Blinking);
+            _trafficLights.ChangeLightState(LightEnum.Yellow, LightStateEnum.Blinking);
+            _trafficLights.ChangeLightState(LightEnum.Green, LightStateEnum.Blinking);
         }
 
         /// <summary>
@@ -319,9 +332,9 @@ private void OnAutomatStep(Object source, ElapsedEventArgs e)
 
                     _model.CurrentState = TrafficLightState.BlinkingGreen;
 
-                    _model.GreenLightState = LightStateEnum.Blinking;
-                    _model.YellowLightState = LightStateEnum.Off;
-                    _model.RedLightState = LightStateEnum.Off;
+                    _trafficLights.ChangeLightState(LightEnum.Green, LightStateEnum.Blinking);
+                    _trafficLights.ChangeLightState(LightEnum.Yellow, LightStateEnum.Off);
+                    _trafficLights.ChangeLightState(LightEnum.Red, LightStateEnum.Off);
 
                     SetTimerInterval(TrafficLightsModel.BlinkingGreenDuration);
                     break;
@@ -331,9 +344,9 @@ private void OnAutomatStep(Object source, ElapsedEventArgs e)
 
                     _model.CurrentState = TrafficLightState.Yellow;
 
-                    _model.GreenLightState = LightStateEnum.Off;
-                    _model.YellowLightState = LightStateEnum.On;
-                    _model.RedLightState = LightStateEnum.Off;
+                    _trafficLights.ChangeLightState(LightEnum.Green, LightStateEnum.Off);
+                    _trafficLights.ChangeLightState(LightEnum.Yellow, LightStateEnum.On);
+                    _trafficLights.ChangeLightState(LightEnum.Red, LightStateEnum.Off);
 
                     SetTimerInterval(TrafficLightsModel.YellowDuration);
                     break;
@@ -343,9 +356,9 @@ private void OnAutomatStep(Object source, ElapsedEventArgs e)
 
                     _model.CurrentState = TrafficLightState.Red;
 
-                    _model.GreenLightState = LightStateEnum.Off;
-                    _model.YellowLightState = LightStateEnum.Off;
-                    _model.RedLightState = LightStateEnum.On;
+                    _trafficLights.ChangeLightState(LightEnum.Green, LightStateEnum.Off);
+                    _trafficLights.ChangeLightState(LightEnum.Yellow, LightStateEnum.Off);
+                    _trafficLights.ChangeLightState(LightEnum.Red, LightStateEnum.On);
 
                     SetTimerInterval(TrafficLightsModel.RedDuration);
                     break;
@@ -355,9 +368,9 @@ private void OnAutomatStep(Object source, ElapsedEventArgs e)
 
                     _model.CurrentState = TrafficLightState.RedAndYellow;
 
-                    _model.GreenLightState = LightStateEnum.Off;
-                    _model.YellowLightState = LightStateEnum.On;
-                    _model.RedLightState = LightStateEnum.On;
+                    _trafficLights.ChangeLightState(LightEnum.Green, LightStateEnum.Off);
+                    _trafficLights.ChangeLightState(LightEnum.Yellow, LightStateEnum.On);
+                    _trafficLights.ChangeLightState(LightEnum.Red, LightStateEnum.On);
 
                     SetTimerInterval(TrafficLightsModel.RedAndYellowDuration);
                     break;
@@ -367,9 +380,9 @@ private void OnAutomatStep(Object source, ElapsedEventArgs e)
 
                     _model.CurrentState = TrafficLightState.Green;
 
-                    _model.GreenLightState = LightStateEnum.On;
-                    _model.YellowLightState = LightStateEnum.Off;
-                    _model.RedLightState = LightStateEnum.Off;
+                    _trafficLights.ChangeLightState(LightEnum.Green, LightStateEnum.On);
+                    _trafficLights.ChangeLightState(LightEnum.Yellow, LightStateEnum.Off);
+                    _trafficLights.ChangeLightState(LightEnum.Red, LightStateEnum.Off);
 
                     SetTimerInterval(TrafficLightsModel.GreenDuration);
                     break;

TrafficLights/.vs/TrafficLights/FileContentIndex/70503bb8-e94d-40a4-af8f-8fb99a79fd0c.vsidx

@@ -0,0 +1,5 @@
+1. Проверка, каким светом горит светофор.
+2. Гашение одной лампы и включение другой через энумку состояния огня.
+3. Остановка таймера.
+4. Обращение к константе, где лежит время горения конкретного огня, задание таким образом времени горения модели.
+5. Старт таймера.

TrafficLights/.vs/TrafficLights/FileContentIndex/b9b9613a-762f-4d4e-bacb-8196bef5cfb7.vsidx

@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-09-21T12:28:00.006Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.3.0 Chrome/104.0.5112.114 Electron/20.1.3 Safari/537.36" etag="eS4_FSim4-sWDnYLaKgl" version="20.3.0" type="device"><diagram id="bvKWsWnQlB2reWRYtqZQ" name="Страница 1">7Vtbb6s4EP41PO4K25jLYy7trnRU6Uh92NOnFRvcBC0JEZAm6a9fGxswAwk0LZCVKlWRPR6MGX/feGxPDbLYnv5I/P3mKQ5YZGAzOBlkaWCMLIwN8WcGZynxTCoF6yQMlFIleA7fmRKaSnoIA5bWFLM4jrJwXxeu4t2OrbKazE+S+FhXe42j+lv3/po1BM8rP2pK/wqDbCOlLnYq+Z8sXG+KNyPbky1bv1BWX5Ju/CA+aiLyYJBFEseZLG1PCxYJ4xV2kc89XmgtB5awXdbngT368Zq9v/ygfz9Rd7Z/Wj/98n9Ts/PmRwf1wcbSNDwifucPxhIZrpmX3bwsdPOqk//S/HcumjyUl5e52jwvK0Ok2bkwJh8QnzdemR83Ycae9/5KtBw5dLhsk20jXkO8qEbFkoydLn4uKo3I0cfiLcuSM1dRD2Cq7K6Ah4p5OFbTWMo22hS6SuYr5KzLrivj8oKy7wdsTdpt3dOU0u6LYjL4r5wkM1eTU+VprdNa37o761vt1rc1i88Vxu8FwtSpGxFbUxuR3uguZlqTBOy9uQsCbE3sqW1tt9u6pymLJjUB12G+KNSw5mRo0blUziVTzhAi98YGtzlD0ECrQ/LGAmUEtgtmIiTh1VXkp2m4qhspiQ+7INc2c20+xl965UVUfqdFdXnSG5dnVZNjYEEjrgGG5oGUn6xZ1rViNSdEMzhtsXchS1jkZ+FbfRhtk6De8DMO+QAvMhLZYB7T+JCsmHpKD3xARxYGHSHQkbRDoyM+V/5ZU9sLhfTygC0TvIfWAjJekD1WgCttejsGvZEwWMHupYa6wTFoTYlBuALfjEF7JAzaCLzHMa+PCzpVcwTMFmMcCrSnMNMwy2svRT+8XCFWVM4GADoaytlKpHQHqJ2EoPdEiNK3fpYQpbf/akIAgBN3DICjcQCuwbsCewfAgSdH4wGc9gS4PSXAsQcAbt4IcGIB4NFhAA7fY5nXPX4ZDrcToqkPv8Meg0At51KDrxBmTwJNtkLYPQmEpyQQAgQq6x8lEAaeG1nDEOjSgIcFeMth4MArxPUAaAKYTurnEQiUya1+vtwSFBH0QH4eQT8Mj/uhPtiNEnRdH541diwLsPtimbiob7WbaViWtRz6DrKMmB6uxWLI6YjGeOUnS0L+gSzpiNC+bq/dyVz8f1hgGhc7kHC9IzR4XgNdwBcxF0ZQqCtCs1FNvytAA+vXKMtXy0XAvcRnaCLykJ7kmfRQlcKg6tb9OwXbiKGiM4qvobupTnFNveP4iwLudFANqiM0BtdaLoIG4Br6JNNGPEjoe1I26dGxA4Bbbmc+yjQHBnKQsl/ENAcGsh0RnQsjwA7yOPCGlYxBHmdY8rQeCnRRoY1yo+3O+p7CTXrMbIGQid589wc8Nh3q7g+ei3eQwQLrMO2ICeHdYlf/xHXr+qNst1ouxEXKwqOWsvCg5RlQTT5TCQ1YV5tpZZnf4BR5D1JSZpo8GirjAWsKXiOboUibgC4gY6esznM/Ctc74QQ4wcQWbS5yF8KVH81UwzYMAvH4PGFp+O7/k3cluKqgwvulc4MuRV+HLE5lZqPoOs2S+F+2iKNYbP128U708hpGERApY34qZ8KBMJNVPWXCa6ExXKu+LGWiWLu+IXIvEGl4yMkh0nJ59g2RKSFiE6ce6aHJMYK/MXInGLkfTFzIr/7GxFR+gxDaGuQOgRFerf6VQga01T+kkIf/AA==</diagram></mxfile>