diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index ef1ec58..6e34cce 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -95,8 +95,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding AddSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding AddSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -111,8 +110,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding EditSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding EditSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -127,6 +125,7 @@
             </Grid>
 
             <ListView
+                x:Name="TargetListView"
                 Grid.Row="1"
                 Margin="10"
                 FontSize="16"
@@ -134,7 +133,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="SelectionChanged">
-                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}" />
+                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetListView, Path=SelectedItem}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index ef1ec58..6e34cce 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -95,8 +95,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding AddSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding AddSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -111,8 +110,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding EditSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding EditSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -127,6 +125,7 @@
             </Grid>
 
             <ListView
+                x:Name="TargetListView"
                 Grid.Row="1"
                 Margin="10"
                 FontSize="16"
@@ -134,7 +133,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="SelectionChanged">
-                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}" />
+                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetListView, Path=SelectedItem}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs
index 092fe64..d205083 100644
--- a/Correlator/ViewModels/AudioFileViewModel.cs
+++ b/Correlator/ViewModels/AudioFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows.Threading;
 using Correlator.DataService;
 using Correlator.Model;
@@ -100,7 +99,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<AudioFile> ItemSelectedCommand { get; set; }
         public DelegateCommand PlayAudioCommand { get; set; }
         public DelegateCommand DeleteAudioCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -146,9 +145,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<AudioFile>(delegate(AudioFile selectedItem)
             {
-                _selectedFile = (AudioFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             PlayAudioCommand = new DelegateCommand(delegate

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index ef1ec58..6e34cce 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -95,8 +95,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding AddSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding AddSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -111,8 +110,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding EditSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding EditSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -127,6 +125,7 @@
             </Grid>
 
             <ListView
+                x:Name="TargetListView"
                 Grid.Row="1"
                 Margin="10"
                 FontSize="16"
@@ -134,7 +133,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="SelectionChanged">
-                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}" />
+                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetListView, Path=SelectedItem}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs
index 092fe64..d205083 100644
--- a/Correlator/ViewModels/AudioFileViewModel.cs
+++ b/Correlator/ViewModels/AudioFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows.Threading;
 using Correlator.DataService;
 using Correlator.Model;
@@ -100,7 +99,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<AudioFile> ItemSelectedCommand { get; set; }
         public DelegateCommand PlayAudioCommand { get; set; }
         public DelegateCommand DeleteAudioCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -146,9 +145,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<AudioFile>(delegate(AudioFile selectedItem)
             {
-                _selectedFile = (AudioFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             PlayAudioCommand = new DelegateCommand(delegate
diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
index a8a2b66..ccbadd8 100644
--- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs
+++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
-using Correlator.DataService;
 using Correlator.Events;
 using Correlator.Model;
 using Correlator.SensorHubTag;
@@ -23,7 +22,6 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand SaveWavCommand { get; set; }
         public DelegateCommand<StepBar> StepChangedCommand { get; set; }
         public DelegateCommand SelectParamConfigFileCommand { get; set; }
         public DelegateCommand SelectRedSensorFileCommand { get; set; }
@@ -142,8 +140,7 @@
 
         #endregion
 
-        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService,
-            IAudioService audioService)
+        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService)
         {
             _eventAggregator = eventAggregator;
             _dialogService = dialogService;
@@ -162,67 +159,6 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            //TODO 测试水听器采集的数据转WAV文件
-            SaveWavCommand = new DelegateCommand(delegate
-            {
-                const string locateDataDir = "C:\\Users\\Administrator\\Desktop\\相关仪测试数据目录\\Locate";
-                var redDataFromFile = RedSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < redDataFromFile.Count; i++)
-                {
-                    RuntimeCache.RedSensorOriginalResp.Add(i, redDataFromFile[i]);
-                }
-
-                var redTags = redDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var redPcmArray = new List<byte[]>();
-                foreach (var tag in redTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    redPcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_红", redPcmArray);
-
-                var blueDataFromFile = BlueSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < blueDataFromFile.Count; i++)
-                {
-                    RuntimeCache.BlueSensorOriginalResp.Add(i, blueDataFromFile[i]);
-                }
-
-                var blueTags = blueDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var bluePcmArray = new List<byte[]>();
-                foreach (var tag in blueTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    bluePcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_蓝", bluePcmArray);
-
-                Growl.Success("音频已保存");
-            });
-
             StepChangedCommand = new DelegateCommand<StepBar>(delegate(StepBar stepBar)
             {
                 switch (stepBar.StepIndex)

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index ef1ec58..6e34cce 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -95,8 +95,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding AddSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding AddSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -111,8 +110,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding EditSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding EditSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -127,6 +125,7 @@
             </Grid>
 
             <ListView
+                x:Name="TargetListView"
                 Grid.Row="1"
                 Margin="10"
                 FontSize="16"
@@ -134,7 +133,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="SelectionChanged">
-                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}" />
+                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetListView, Path=SelectedItem}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs
index 092fe64..d205083 100644
--- a/Correlator/ViewModels/AudioFileViewModel.cs
+++ b/Correlator/ViewModels/AudioFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows.Threading;
 using Correlator.DataService;
 using Correlator.Model;
@@ -100,7 +99,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<AudioFile> ItemSelectedCommand { get; set; }
         public DelegateCommand PlayAudioCommand { get; set; }
         public DelegateCommand DeleteAudioCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -146,9 +145,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<AudioFile>(delegate(AudioFile selectedItem)
             {
-                _selectedFile = (AudioFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             PlayAudioCommand = new DelegateCommand(delegate
diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
index a8a2b66..ccbadd8 100644
--- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs
+++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
-using Correlator.DataService;
 using Correlator.Events;
 using Correlator.Model;
 using Correlator.SensorHubTag;
@@ -23,7 +22,6 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand SaveWavCommand { get; set; }
         public DelegateCommand<StepBar> StepChangedCommand { get; set; }
         public DelegateCommand SelectParamConfigFileCommand { get; set; }
         public DelegateCommand SelectRedSensorFileCommand { get; set; }
@@ -142,8 +140,7 @@
 
         #endregion
 
-        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService,
-            IAudioService audioService)
+        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService)
         {
             _eventAggregator = eventAggregator;
             _dialogService = dialogService;
@@ -162,67 +159,6 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            //TODO 测试水听器采集的数据转WAV文件
-            SaveWavCommand = new DelegateCommand(delegate
-            {
-                const string locateDataDir = "C:\\Users\\Administrator\\Desktop\\相关仪测试数据目录\\Locate";
-                var redDataFromFile = RedSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < redDataFromFile.Count; i++)
-                {
-                    RuntimeCache.RedSensorOriginalResp.Add(i, redDataFromFile[i]);
-                }
-
-                var redTags = redDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var redPcmArray = new List<byte[]>();
-                foreach (var tag in redTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    redPcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_红", redPcmArray);
-
-                var blueDataFromFile = BlueSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < blueDataFromFile.Count; i++)
-                {
-                    RuntimeCache.BlueSensorOriginalResp.Add(i, blueDataFromFile[i]);
-                }
-
-                var blueTags = blueDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var bluePcmArray = new List<byte[]>();
-                foreach (var tag in blueTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    bluePcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_蓝", bluePcmArray);
-
-                Growl.Success("音频已保存");
-            });
-
             StepChangedCommand = new DelegateCommand<StepBar>(delegate(StepBar stepBar)
             {
                 switch (stepBar.StepIndex)
diff --git a/Correlator/ViewModels/PictureFileViewModel.cs b/Correlator/ViewModels/PictureFileViewModel.cs
index f1c7e1f..015ae45 100644
--- a/Correlator/ViewModels/PictureFileViewModel.cs
+++ b/Correlator/ViewModels/PictureFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using Correlator.Model;
 using Correlator.Util;
 using HandyControl.Controls;
@@ -60,7 +59,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<ImageFile> ItemSelectedCommand { get; set; }
         public DelegateCommand ShowPictureCommand { get; set; }
         public DelegateCommand DeletePictureCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -76,9 +75,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<ImageFile>(delegate(ImageFile selectedItem)
             {
-                _selectedFile = (ImageFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             ShowPictureCommand = new DelegateCommand(delegate
@@ -88,7 +87,7 @@
                     dialogService.ShowDialog("AlertMessageDialog", new DialogParameters
                         {
                             { "AlertType", AlertType.Error }, { "Title", "温馨提示" }, { "Message", "图片文件路径错误，无法查看" }
-                        }, 
+                        },
                         delegate { }
                     );
                     return;

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index ef1ec58..6e34cce 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -95,8 +95,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding AddSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding AddSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -111,8 +110,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding EditSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding EditSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -127,6 +125,7 @@
             </Grid>
 
             <ListView
+                x:Name="TargetListView"
                 Grid.Row="1"
                 Margin="10"
                 FontSize="16"
@@ -134,7 +133,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="SelectionChanged">
-                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}" />
+                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetListView, Path=SelectedItem}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs
index 092fe64..d205083 100644
--- a/Correlator/ViewModels/AudioFileViewModel.cs
+++ b/Correlator/ViewModels/AudioFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows.Threading;
 using Correlator.DataService;
 using Correlator.Model;
@@ -100,7 +99,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<AudioFile> ItemSelectedCommand { get; set; }
         public DelegateCommand PlayAudioCommand { get; set; }
         public DelegateCommand DeleteAudioCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -146,9 +145,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<AudioFile>(delegate(AudioFile selectedItem)
             {
-                _selectedFile = (AudioFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             PlayAudioCommand = new DelegateCommand(delegate
diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
index a8a2b66..ccbadd8 100644
--- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs
+++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
-using Correlator.DataService;
 using Correlator.Events;
 using Correlator.Model;
 using Correlator.SensorHubTag;
@@ -23,7 +22,6 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand SaveWavCommand { get; set; }
         public DelegateCommand<StepBar> StepChangedCommand { get; set; }
         public DelegateCommand SelectParamConfigFileCommand { get; set; }
         public DelegateCommand SelectRedSensorFileCommand { get; set; }
@@ -142,8 +140,7 @@
 
         #endregion
 
-        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService,
-            IAudioService audioService)
+        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService)
         {
             _eventAggregator = eventAggregator;
             _dialogService = dialogService;
@@ -162,67 +159,6 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            //TODO 测试水听器采集的数据转WAV文件
-            SaveWavCommand = new DelegateCommand(delegate
-            {
-                const string locateDataDir = "C:\\Users\\Administrator\\Desktop\\相关仪测试数据目录\\Locate";
-                var redDataFromFile = RedSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < redDataFromFile.Count; i++)
-                {
-                    RuntimeCache.RedSensorOriginalResp.Add(i, redDataFromFile[i]);
-                }
-
-                var redTags = redDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var redPcmArray = new List<byte[]>();
-                foreach (var tag in redTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    redPcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_红", redPcmArray);
-
-                var blueDataFromFile = BlueSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < blueDataFromFile.Count; i++)
-                {
-                    RuntimeCache.BlueSensorOriginalResp.Add(i, blueDataFromFile[i]);
-                }
-
-                var blueTags = blueDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var bluePcmArray = new List<byte[]>();
-                foreach (var tag in blueTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    bluePcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_蓝", bluePcmArray);
-
-                Growl.Success("音频已保存");
-            });
-
             StepChangedCommand = new DelegateCommand<StepBar>(delegate(StepBar stepBar)
             {
                 switch (stepBar.StepIndex)
diff --git a/Correlator/ViewModels/PictureFileViewModel.cs b/Correlator/ViewModels/PictureFileViewModel.cs
index f1c7e1f..015ae45 100644
--- a/Correlator/ViewModels/PictureFileViewModel.cs
+++ b/Correlator/ViewModels/PictureFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using Correlator.Model;
 using Correlator.Util;
 using HandyControl.Controls;
@@ -60,7 +59,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<ImageFile> ItemSelectedCommand { get; set; }
         public DelegateCommand ShowPictureCommand { get; set; }
         public DelegateCommand DeletePictureCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -76,9 +75,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<ImageFile>(delegate(ImageFile selectedItem)
             {
-                _selectedFile = (ImageFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             ShowPictureCommand = new DelegateCommand(delegate
@@ -88,7 +87,7 @@
                     dialogService.ShowDialog("AlertMessageDialog", new DialogParameters
                         {
                             { "AlertType", AlertType.Error }, { "Title", "温馨提示" }, { "Message", "图片文件路径错误，无法查看" }
-                        }, 
+                        },
                         delegate { }
                     );
                     return;
diff --git a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
index f927081..beca269 100644
--- a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
+++ b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Windows.Controls;
 using Correlator.DataService;
 using Correlator.Model;
 using Correlator.Util;
@@ -51,7 +50,7 @@
         public DelegateCommand DeleteSpeedCommand { get; set; }
         public DelegateCommand AddSpeedCommand { get; set; }
         public DelegateCommand EditSpeedCommand { get; set; }
-        public DelegateCommand<ListView> ItemSelectedCommand { get; set; }
+        public DelegateCommand<MaterialVelocity> ItemSelectedCommand { get; set; }
 
         #endregion
 
@@ -64,9 +63,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<ListView>(delegate(ListView view)
+            ItemSelectedCommand = new DelegateCommand<MaterialVelocity>(delegate(MaterialVelocity selectedItem)
             {
-                _materialVelocity = (MaterialVelocity)view.SelectedItem;
+                _materialVelocity = selectedItem;
             });
 
             DeleteSpeedCommand = new DelegateCommand(delegate

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index ef1ec58..6e34cce 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -95,8 +95,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding AddSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding AddSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -111,8 +110,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding EditSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding EditSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -127,6 +125,7 @@
             </Grid>
 
             <ListView
+                x:Name="TargetListView"
                 Grid.Row="1"
                 Margin="10"
                 FontSize="16"
@@ -134,7 +133,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="SelectionChanged">
-                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}" />
+                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetListView, Path=SelectedItem}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs
index 092fe64..d205083 100644
--- a/Correlator/ViewModels/AudioFileViewModel.cs
+++ b/Correlator/ViewModels/AudioFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows.Threading;
 using Correlator.DataService;
 using Correlator.Model;
@@ -100,7 +99,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<AudioFile> ItemSelectedCommand { get; set; }
         public DelegateCommand PlayAudioCommand { get; set; }
         public DelegateCommand DeleteAudioCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -146,9 +145,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<AudioFile>(delegate(AudioFile selectedItem)
             {
-                _selectedFile = (AudioFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             PlayAudioCommand = new DelegateCommand(delegate
diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
index a8a2b66..ccbadd8 100644
--- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs
+++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
-using Correlator.DataService;
 using Correlator.Events;
 using Correlator.Model;
 using Correlator.SensorHubTag;
@@ -23,7 +22,6 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand SaveWavCommand { get; set; }
         public DelegateCommand<StepBar> StepChangedCommand { get; set; }
         public DelegateCommand SelectParamConfigFileCommand { get; set; }
         public DelegateCommand SelectRedSensorFileCommand { get; set; }
@@ -142,8 +140,7 @@
 
         #endregion
 
-        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService,
-            IAudioService audioService)
+        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService)
         {
             _eventAggregator = eventAggregator;
             _dialogService = dialogService;
@@ -162,67 +159,6 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            //TODO 测试水听器采集的数据转WAV文件
-            SaveWavCommand = new DelegateCommand(delegate
-            {
-                const string locateDataDir = "C:\\Users\\Administrator\\Desktop\\相关仪测试数据目录\\Locate";
-                var redDataFromFile = RedSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < redDataFromFile.Count; i++)
-                {
-                    RuntimeCache.RedSensorOriginalResp.Add(i, redDataFromFile[i]);
-                }
-
-                var redTags = redDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var redPcmArray = new List<byte[]>();
-                foreach (var tag in redTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    redPcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_红", redPcmArray);
-
-                var blueDataFromFile = BlueSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < blueDataFromFile.Count; i++)
-                {
-                    RuntimeCache.BlueSensorOriginalResp.Add(i, blueDataFromFile[i]);
-                }
-
-                var blueTags = blueDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var bluePcmArray = new List<byte[]>();
-                foreach (var tag in blueTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    bluePcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_蓝", bluePcmArray);
-
-                Growl.Success("音频已保存");
-            });
-
             StepChangedCommand = new DelegateCommand<StepBar>(delegate(StepBar stepBar)
             {
                 switch (stepBar.StepIndex)
diff --git a/Correlator/ViewModels/PictureFileViewModel.cs b/Correlator/ViewModels/PictureFileViewModel.cs
index f1c7e1f..015ae45 100644
--- a/Correlator/ViewModels/PictureFileViewModel.cs
+++ b/Correlator/ViewModels/PictureFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using Correlator.Model;
 using Correlator.Util;
 using HandyControl.Controls;
@@ -60,7 +59,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<ImageFile> ItemSelectedCommand { get; set; }
         public DelegateCommand ShowPictureCommand { get; set; }
         public DelegateCommand DeletePictureCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -76,9 +75,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<ImageFile>(delegate(ImageFile selectedItem)
             {
-                _selectedFile = (ImageFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             ShowPictureCommand = new DelegateCommand(delegate
@@ -88,7 +87,7 @@
                     dialogService.ShowDialog("AlertMessageDialog", new DialogParameters
                         {
                             { "AlertType", AlertType.Error }, { "Title", "温馨提示" }, { "Message", "图片文件路径错误，无法查看" }
-                        }, 
+                        },
                         delegate { }
                     );
                     return;
diff --git a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
index f927081..beca269 100644
--- a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
+++ b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Windows.Controls;
 using Correlator.DataService;
 using Correlator.Model;
 using Correlator.Util;
@@ -51,7 +50,7 @@
         public DelegateCommand DeleteSpeedCommand { get; set; }
         public DelegateCommand AddSpeedCommand { get; set; }
         public DelegateCommand EditSpeedCommand { get; set; }
-        public DelegateCommand<ListView> ItemSelectedCommand { get; set; }
+        public DelegateCommand<MaterialVelocity> ItemSelectedCommand { get; set; }
 
         #endregion
 
@@ -64,9 +63,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<ListView>(delegate(ListView view)
+            ItemSelectedCommand = new DelegateCommand<MaterialVelocity>(delegate(MaterialVelocity selectedItem)
             {
-                _materialVelocity = (MaterialVelocity)view.SelectedItem;
+                _materialVelocity = selectedItem;
             });
 
             DeleteSpeedCommand = new DelegateCommand(delegate
diff --git a/Correlator/Views/AudioFileView.xaml b/Correlator/Views/AudioFileView.xaml
index 37a5929..1949d78 100644
--- a/Correlator/Views/AudioFileView.xaml
+++ b/Correlator/Views/AudioFileView.xaml
@@ -88,6 +88,7 @@
         </Grid>
 
         <DataGrid
+            x:Name="TargetDataGrid"
             Grid.Row="1"
             Margin="30,0"
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
@@ -100,7 +101,7 @@
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
-                    <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid}}" />
+                    <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetDataGrid, Path=SelectedItem}" />
                 </b:EventTrigger>
             </b:Interaction.Triggers>
 

diff --git a/Correlator/Dialog/ApplicationInfoDialog.xaml b/Correlator/Dialog/ApplicationInfoDialog.xaml
index 2a98b32..8f72801 100644
--- a/Correlator/Dialog/ApplicationInfoDialog.xaml
+++ b/Correlator/Dialog/ApplicationInfoDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
     Width="420"
-    Height="300"
+    Height="275"
     d:DataContext="{d:DesignInstance Type=vm:ApplicationInfoDialogViewModel}"
     mc:Ignorable="d">
     <prism:Dialog.WindowStyle>
diff --git a/Correlator/Dialog/ImportResponseDialog.xaml b/Correlator/Dialog/ImportResponseDialog.xaml
index f987cca..05bd534 100644
--- a/Correlator/Dialog/ImportResponseDialog.xaml
+++ b/Correlator/Dialog/ImportResponseDialog.xaml
@@ -51,39 +51,50 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid Grid.Row="0" Margin="10">
-                <StackPanel Orientation="Horizontal">
-                    <Button Height="40" Command="{Binding GoBackCommand}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="0,0,5,0"
-                                VerticalAlignment="Center"
-                                FontFamily="/Correlator;component/Fonts/#iconfont"
-                                FontSize="20"
-                                Text="&#xe60f;" />
-                            <TextBlock FontSize="18" Text="返回" />
-                        </StackPanel>
-                    </Button>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
 
-                    <StackPanel
-                        Margin="10,0,0,0"
-                        VerticalAlignment="Center"
-                        Orientation="Vertical">
-                        <TextBlock FontSize="18" Text="原始数据导入向导" />
+                <Button
+                    Grid.Column="0"
+                    Height="40"
+                    Command="{Binding GoBackCommand}">
+                    <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            FontSize="14"
-                            Foreground="#cecece"
-                            Text="Raw Data Import Wizard" />
+                            Margin="0,0,5,0"
+                            VerticalAlignment="Center"
+                            FontFamily="/Correlator;component/Fonts/#iconfont"
+                            FontSize="20"
+                            Text="&#xe60f;" />
+                        <TextBlock FontSize="18" Text="返回" />
                     </StackPanel>
+                </Button>
 
-                    <Button
-                        Command="{Binding SaveWavCommand}"
-                        Content="保存音频"
-                        Visibility="Collapsed" />
+                <StackPanel
+                    Grid.Column="1"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <TextBlock FontSize="18" Text="原始数据导入向导" />
+                    <TextBlock
+                        FontSize="14"
+                        Foreground="#cecece"
+                        Text="Raw Data Import Wizard" />
                 </StackPanel>
+
+                <Button
+                    Grid.Column="2"
+                    Width="100"
+                    HorizontalAlignment="Right"
+                    Command="{Binding DetermineParamCommand}"
+                    Content="完成"
+                    IsEnabled="{Binding IsDetermineButtonEnabled}"
+                    Style="{StaticResource FunctionButtonStyle}" />
             </Grid>
 
             <hc:StepBar
@@ -93,7 +104,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="StepChanged">
-                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=hc:StepBar}}" />
+                        <b:InvokeCommandAction Command="{Binding StepChangedCommand}" CommandParameter="{Binding ElementName=ImportDataStepBar}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
@@ -264,15 +275,6 @@
                     </StackPanel>
                 </Grid>
             </Grid>
-
-            <Button
-                Grid.Row="3"
-                Width="200"
-                Margin="0,20"
-                Command="{Binding DetermineParamCommand}"
-                Content="完成"
-                IsEnabled="{Binding IsDetermineButtonEnabled}"
-                Style="{StaticResource FunctionButtonStyle}" />
         </Grid>
     </Border>
 </UserControl>
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index ef1ec58..6e34cce 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -95,8 +95,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding AddSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding AddSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -111,8 +110,7 @@
                         Height="40"
                         Margin="10,0"
                         HorizontalAlignment="Right"
-                        Command="{Binding EditSpeedCommand}"
-                        CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                        Command="{Binding EditSpeedCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 Margin="0,0,5,0"
@@ -127,6 +125,7 @@
             </Grid>
 
             <ListView
+                x:Name="TargetListView"
                 Grid.Row="1"
                 Margin="10"
                 FontSize="16"
@@ -134,7 +133,7 @@
 
                 <b:Interaction.Triggers>
                     <b:EventTrigger EventName="SelectionChanged">
-                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListView}}" />
+                        <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetListView, Path=SelectedItem}" />
                     </b:EventTrigger>
                 </b:Interaction.Triggers>
 
diff --git a/Correlator/ViewModels/AudioFileViewModel.cs b/Correlator/ViewModels/AudioFileViewModel.cs
index 092fe64..d205083 100644
--- a/Correlator/ViewModels/AudioFileViewModel.cs
+++ b/Correlator/ViewModels/AudioFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows.Threading;
 using Correlator.DataService;
 using Correlator.Model;
@@ -100,7 +99,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<AudioFile> ItemSelectedCommand { get; set; }
         public DelegateCommand PlayAudioCommand { get; set; }
         public DelegateCommand DeleteAudioCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -146,9 +145,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<AudioFile>(delegate(AudioFile selectedItem)
             {
-                _selectedFile = (AudioFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             PlayAudioCommand = new DelegateCommand(delegate
diff --git a/Correlator/ViewModels/ImportResponseDialogViewModel.cs b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
index a8a2b66..ccbadd8 100644
--- a/Correlator/ViewModels/ImportResponseDialogViewModel.cs
+++ b/Correlator/ViewModels/ImportResponseDialogViewModel.cs
@@ -3,7 +3,6 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Threading;
-using Correlator.DataService;
 using Correlator.Events;
 using Correlator.Model;
 using Correlator.SensorHubTag;
@@ -23,7 +22,6 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand SaveWavCommand { get; set; }
         public DelegateCommand<StepBar> StepChangedCommand { get; set; }
         public DelegateCommand SelectParamConfigFileCommand { get; set; }
         public DelegateCommand SelectRedSensorFileCommand { get; set; }
@@ -142,8 +140,7 @@
 
         #endregion
 
-        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService,
-            IAudioService audioService)
+        public ImportResponseDialogViewModel(IEventAggregator eventAggregator, IDialogService dialogService)
         {
             _eventAggregator = eventAggregator;
             _dialogService = dialogService;
@@ -162,67 +159,6 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            //TODO 测试水听器采集的数据转WAV文件
-            SaveWavCommand = new DelegateCommand(delegate
-            {
-                const string locateDataDir = "C:\\Users\\Administrator\\Desktop\\相关仪测试数据目录\\Locate";
-                var redDataFromFile = RedSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < redDataFromFile.Count; i++)
-                {
-                    RuntimeCache.RedSensorOriginalResp.Add(i, redDataFromFile[i]);
-                }
-
-                var redTags = redDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var redPcmArray = new List<byte[]>();
-                foreach (var tag in redTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    redPcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_红", redPcmArray);
-
-                var blueDataFromFile = BlueSensorFilePath.ReadFromFile();
-                //方便直接测试保存wav文件
-                for (var i = 0; i < blueDataFromFile.Count; i++)
-                {
-                    RuntimeCache.BlueSensorOriginalResp.Add(i, blueDataFromFile[i]);
-                }
-
-                var blueTags = blueDataFromFile.Select(data => data.HandleLocalData()).ToList();
-                var bluePcmArray = new List<byte[]>();
-                foreach (var tag in blueTags)
-                {
-                    var dataValue = tag.DataValue;
-                    //PCM数据
-                    var pcm = new byte[7500 * 3]; //每个采样点2字节
-
-                    for (var i = 0; i < 7500; i++)
-                    {
-                        pcm[i * 3 + 2] = dataValue[i * 2 + 0];
-                        pcm[i * 3 + 1] = dataValue[i * 2 + 1];
-                        pcm[i * 3 + 0] = 0x00;
-                    }
-
-                    bluePcmArray.Add(pcm);
-                }
-
-                audioService.Write(locateDataDir, "音频_蓝", bluePcmArray);
-
-                Growl.Success("音频已保存");
-            });
-
             StepChangedCommand = new DelegateCommand<StepBar>(delegate(StepBar stepBar)
             {
                 switch (stepBar.StepIndex)
diff --git a/Correlator/ViewModels/PictureFileViewModel.cs b/Correlator/ViewModels/PictureFileViewModel.cs
index f1c7e1f..015ae45 100644
--- a/Correlator/ViewModels/PictureFileViewModel.cs
+++ b/Correlator/ViewModels/PictureFileViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Controls;
 using Correlator.Model;
 using Correlator.Util;
 using HandyControl.Controls;
@@ -60,7 +59,7 @@
         #region DelegateCommand
 
         public DelegateCommand GoBackCommand { get; set; }
-        public DelegateCommand<DataGrid> ItemSelectedCommand { get; set; }
+        public DelegateCommand<ImageFile> ItemSelectedCommand { get; set; }
         public DelegateCommand ShowPictureCommand { get; set; }
         public DelegateCommand DeletePictureCommand { get; set; }
         public DelegateCommand<FunctionEventArgs<int>> PageUpdatedCmd { get; set; }
@@ -76,9 +75,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
+            ItemSelectedCommand = new DelegateCommand<ImageFile>(delegate(ImageFile selectedItem)
             {
-                _selectedFile = (ImageFile)dataGrid.SelectedItem;
+                _selectedFile = selectedItem;
             });
 
             ShowPictureCommand = new DelegateCommand(delegate
@@ -88,7 +87,7 @@
                     dialogService.ShowDialog("AlertMessageDialog", new DialogParameters
                         {
                             { "AlertType", AlertType.Error }, { "Title", "温馨提示" }, { "Message", "图片文件路径错误，无法查看" }
-                        }, 
+                        },
                         delegate { }
                     );
                     return;
diff --git a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
index f927081..beca269 100644
--- a/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
+++ b/Correlator/ViewModels/SoundSpeedDialogViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Windows.Controls;
 using Correlator.DataService;
 using Correlator.Model;
 using Correlator.Util;
@@ -51,7 +50,7 @@
         public DelegateCommand DeleteSpeedCommand { get; set; }
         public DelegateCommand AddSpeedCommand { get; set; }
         public DelegateCommand EditSpeedCommand { get; set; }
-        public DelegateCommand<ListView> ItemSelectedCommand { get; set; }
+        public DelegateCommand<MaterialVelocity> ItemSelectedCommand { get; set; }
 
         #endregion
 
@@ -64,9 +63,9 @@
                 RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
             });
 
-            ItemSelectedCommand = new DelegateCommand<ListView>(delegate(ListView view)
+            ItemSelectedCommand = new DelegateCommand<MaterialVelocity>(delegate(MaterialVelocity selectedItem)
             {
-                _materialVelocity = (MaterialVelocity)view.SelectedItem;
+                _materialVelocity = selectedItem;
             });
 
             DeleteSpeedCommand = new DelegateCommand(delegate
diff --git a/Correlator/Views/AudioFileView.xaml b/Correlator/Views/AudioFileView.xaml
index 37a5929..1949d78 100644
--- a/Correlator/Views/AudioFileView.xaml
+++ b/Correlator/Views/AudioFileView.xaml
@@ -88,6 +88,7 @@
         </Grid>
 
         <DataGrid
+            x:Name="TargetDataGrid"
             Grid.Row="1"
             Margin="30,0"
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
@@ -100,7 +101,7 @@
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
-                    <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid}}" />
+                    <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetDataGrid, Path=SelectedItem}" />
                 </b:EventTrigger>
             </b:Interaction.Triggers>
 
diff --git a/Correlator/Views/PictureFileView.xaml b/Correlator/Views/PictureFileView.xaml
index 2112f87..d787f5b 100644
--- a/Correlator/Views/PictureFileView.xaml
+++ b/Correlator/Views/PictureFileView.xaml
@@ -58,6 +58,7 @@
         </Grid>
 
         <DataGrid
+            x:Name="TargetDataGrid"
             Grid.Row="1"
             Margin="30,0"
             hc:DataGridAttach.CanUnselectAllWithBlankArea="True"
@@ -70,7 +71,7 @@
 
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="SelectionChanged">
-                    <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid}}" />
+                    <b:InvokeCommandAction Command="{Binding ItemSelectedCommand}" CommandParameter="{Binding ElementName=TargetDataGrid, Path=SelectedItem}" />
                 </b:EventTrigger>
             </b:Interaction.Triggers>