bug 修复

VIZ.H2V.Module/NDIMainView/Controller/Hotkey/HotkeyController.cs

@@ -47,21 +47,6 @@ namespace VIZ.H2V.Module
 
             this.focusNDIViewModel.IsFocus = true;
 
-            // 先将出自身外手动模式的视图切换为自动模式
-            ApplicationDomainEx.ServiceManager.GetServiceList<INDIViewService>()
-                .Where(p => p.StrategyMode == AlgorithmStrategyMode.manual_mode && p != this.focusNDIViewModel)
-                .ToList()
-                .ForEach(p =>
-                {
-                    ChangeStrategyContext cxt = new ChangeStrategyContext();
-                    cxt.IsUseClip = p.IsUseClip;
-                    cxt.Mode = AlgorithmStrategyMode.auto_mode;
-                    cxt.IsNeedRestart = false;
-                    cxt.TriggerScene = NDIViewScene.Hotkey;
-
-                    p.ChangeStrategyMode(cxt);
-                });
-
             // 切换为手动模式
             ChangeStrategyContext context = new ChangeStrategyContext();
             context.IsUseClip = this.focusNDIViewModel.IsUseClip;

VIZ.H2V.Module/NDIView/View/NDIView.xaml

@@ -150,26 +150,23 @@
                             <RowDefinition Height="60"></RowDefinition>
                             <RowDefinition Height="60"></RowDefinition>
                         </Grid.RowDefinitions>
-                        <Border ToolTip="{Binding Path=StrategyDisplayName,Mode=OneWay}" Background="Transparent">
                         <RadioButton FontSize="16" Foreground="White" 
+                                     ToolTip="{Binding Path=StrategyDisplayName,Mode=OneWay}"
                                      Style="{StaticResource RadioButton_NdiView}"
                                      IsChecked="{Binding IsAutoModeChecked,Mode=TwoWay}">
                             <TextBlock Text="{Binding Path=StrategyDisplayName,Mode=OneWay}" Margin="0,0,10,0" TextWrapping="NoWrap" 
                                            TextTrimming="CharacterEllipsis"></TextBlock>
                         </RadioButton>
-                        </Border>
-                        <Border ToolTip="居中" Grid.Row="1"  Background="Transparent">
                         <RadioButton Content="居中" FontSize="16" Foreground="White"
+                                     ToolTip="居中" Grid.Row="1"
                                      Style="{StaticResource RadioButton_NdiView}" 
                                      IsChecked="{Binding IsCenterModeChecked,Mode=TwoWay}">
                         </RadioButton>
-                        </Border>
-                        <Border ToolTip="手动" Grid.Row="2" Background="Transparent">
                         <RadioButton Content="手动" FontSize="16" Foreground="White" 
+                                         ToolTip="手动" Grid.Row="2"
                                          IsChecked="{Binding Path=IsManualModeChecked,Mode=TwoWay}"
                                          Style="{StaticResource RadioButton_NdiView}">
                         </RadioButton>
-                        </Border>
                     </Grid>
                 </Border>
             </Grid>

VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Manual_NDI.cs

@@ -91,11 +91,11 @@ namespace VIZ.H2V.Module
             ClipBoxInfo clipBox = new ClipBoxInfo();
             clipBox.DrawingBorderWidth = this.CLIP_BOX_BORDER_WIDTH;
             clipBox.SrcRect = new RawRectangleF((float)(this.ClipBoxX), 0, (float)(this.ClipBoxX) + (float)this.CLIP_BOX_WIDTH, renderInfo.Frame.Height);
-            clipBox.DrawingBorderColor = this.StrategyMode == AlgorithmStrategyMode.manual_mode ? this.ClipBoxStrokeColor_Manual : this.ClipBoxStrokeColor_Normal;
+            clipBox.DrawingBorderColor = (this.StrategyMode == AlgorithmStrategyMode.manual_mode && this.IsActive) ? this.ClipBoxStrokeColor_Manual : this.ClipBoxStrokeColor_Normal;
             clipBox.MaskColor = this.CLIP_BOX_MASK_COLOR;
             clipBox.CenterAxisWidth = (float)this.CLIP_BOX_CENTER_AXIS_WIDTH;
             clipBox.CenterAxisColor = this.ClipBoxCenterAxisColor;
-            clipBox.IsCenterAxisEnabled = this.AlgorithmConfig.IsShowCenterAxis;
+            clipBox.IsCenterAxisEnabled = (this.StrategyMode == AlgorithmStrategyMode.manual_mode && this.IsActive) ? this.AlgorithmConfig.IsShowCenterAxis : false;
 
             view.video.UpdateClipBox(clipBox);
         }

VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Property.cs

@@ -352,7 +352,7 @@ namespace VIZ.H2V.Module
                     // CODE: SYSTEM_LOG | 记录日志
                     //====================================================================
                     // 记录日志： 视图激活
-                    string system_log = string.Format(SystemLogStringFormats.VIEW_ACTIVE);
+                    string system_log = string.Format(SystemLogStringFormats.VIEW_ACTIVE, this.ViewKey);
                     ApplicationDomainEx.CsvContext.AppendSystemLog(this.ViewKey, this.DisplayName, system_log);
                     //====================================================================
                 }

VIZ.H2V.Storage/CSV/Log/SystemLogStringFormats.cs

@@ -24,7 +24,7 @@ namespace VIZ.H2V.Storage
         /// <summary>
         /// 视图激活
         /// </summary>
-        public const string VIEW_ACTIVE = "视图激活";
+        public const string VIEW_ACTIVE = "视图激活, [视图 {0}]";
 
         /// <summary>
         /// 发送算法停止消息