충돌 Commit

Dev/OHV/OHV.Module.Interactivity/PopUp/BatteryConfigView.xaml

@@ -205,7 +205,7 @@
                                 HorizontalAlignment="Center">
                         <Button Margin="5" HorizontalAlignment="Center" Height="Auto" BorderBrush="Gray" BorderThickness="1">
                             <StackPanel Orientation="Horizontal">
-                                <Ellipse Margin="5" Fill="{Binding ConnectStatus, FallbackValue=Gray}" Width="30" Height="30"/>
+                                <Ellipse Margin="5" Fill="{Binding BatteryConnectBrush, FallbackValue=Gray}" Width="30" Height="30"/>
                                 <TextBlock Margin="15" Text="{Binding BatteryConnect, FallbackValue=DisConnecting}" VerticalAlignment="Center" HorizontalAlignment="Center" />
                             </StackPanel>
                         </Button>

Dev/OHV/OHV.Module.Interactivity/PopUp/BatteryConfigViewModel.cs

@@ -108,11 +108,11 @@ namespace OHV.Module.Interactivity.PopUp
             get { return this.batteryConnect; }
             set { this.SetProperty( ref this.batteryConnect , value ); }
         }
-        Brush connectStatus = Brushes.Gray;
-        public Brush ConnectStatus 
+        Brush batteryConnectBrush = Brushes.Gray;
+        public Brush BatteryConnectBrush 
         {
-            get { return this.connectStatus; }
-            set { this.SetProperty( ref this.connectStatus , value ); }
+            get { return this.batteryConnectBrush; }
+            set { this.SetProperty( ref this.batteryConnectBrush , value ); }
         }
 
         public event Action<IDialogResult> RequestClose;
@@ -188,12 +188,12 @@ namespace OHV.Module.Interactivity.PopUp
             this.Temperature = d.Temperature;
             if ( d.BatteryIsConnect )
             {
-                this.ConnectStatus = Brushes.LimeGreen;
+                this.BatteryConnectBrush = Brushes.LimeGreen;
                 this.BatteryConnect = "Connecting";
             }
             else
             {
-                this.ConnectStatus = Brushes.Gray;
+                this.BatteryConnectBrush = Brushes.Gray;
                 this.BatteryConnect = "DisConnecting";
             }
         }
@@ -240,12 +240,12 @@ namespace OHV.Module.Interactivity.PopUp
                             var connected = CastTo<bool>.From<object>( obj.Args );
                             if ( connected )
                             {
-                                this.ConnectStatus = Brushes.LimeGreen;
+                                this.BatteryConnectBrush = Brushes.LimeGreen;
                                 this.BatteryConnect = "Connecting";
                             }
                             else
                             {
-                                this.ConnectStatus = Brushes.Gray;
+                                this.BatteryConnectBrush = Brushes.Gray;
                                 this.BatteryConnect = "DisConnecting";
                             }
                             break;