|
@@ -50,17 +50,19 @@ public partial class MainWindow : Window
|
|
|
AdapterComboBox.ItemsSource = _adapters;
|
|
AdapterComboBox.ItemsSource = _adapters;
|
|
|
|
|
|
|
|
var selected = selectedAdapterId is null
|
|
var selected = selectedAdapterId is null
|
|
|
- ? _networkAdapterService.GetRecommendedAdapter(_adapters)
|
|
|
|
|
- : _adapters.FirstOrDefault(adapter => adapter.Id == selectedAdapterId) ?? _networkAdapterService.GetRecommendedAdapter(_adapters);
|
|
|
|
|
|
|
+ ? null
|
|
|
|
|
+ : _adapters.FirstOrDefault(adapter => adapter.Id == selectedAdapterId);
|
|
|
|
|
|
|
|
if (selected is not null)
|
|
if (selected is not null)
|
|
|
{
|
|
{
|
|
|
AdapterComboBox.SelectedItem = selected;
|
|
AdapterComboBox.SelectedItem = selected;
|
|
|
}
|
|
}
|
|
|
- else if (_adapters.Count > 0)
|
|
|
|
|
|
|
+ else
|
|
|
{
|
|
{
|
|
|
- AdapterComboBox.SelectedIndex = 0;
|
|
|
|
|
|
|
+ AdapterComboBox.SelectedIndex = -1;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ UpdateAdapterPlaceholder();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private static bool IsUsableAdapter(AdapterInfo adapter)
|
|
private static bool IsUsableAdapter(AdapterInfo adapter)
|
|
@@ -73,11 +75,13 @@ public partial class MainWindow : Window
|
|
|
if (AdapterComboBox.SelectedItem is not AdapterInfo adapter)
|
|
if (AdapterComboBox.SelectedItem is not AdapterInfo adapter)
|
|
|
{
|
|
{
|
|
|
ClearDiscoveredDevices();
|
|
ClearDiscoveredDevices();
|
|
|
|
|
+ UpdateAdapterPlaceholder();
|
|
|
SetStatus("请选择一块网卡。", StatusMessageType.Warning, false);
|
|
SetStatus("请选择一块网卡。", StatusMessageType.Warning, false);
|
|
|
UpdateButtonStates();
|
|
UpdateButtonStates();
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ UpdateAdapterPlaceholder();
|
|
|
if (!adapter.HasLink)
|
|
if (!adapter.HasLink)
|
|
|
{
|
|
{
|
|
|
ClearDiscoveredDevices();
|
|
ClearDiscoveredDevices();
|
|
@@ -90,12 +94,18 @@ public partial class MainWindow : Window
|
|
|
_ = SearchDevicesAsync(adapter);
|
|
_ = SearchDevicesAsync(adapter);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void UpdateAdapterPlaceholder()
|
|
|
|
|
+ {
|
|
|
|
|
+ AdapterPlaceholderTextBlock.Visibility = AdapterComboBox.SelectedItem is null ? Visibility.Visible : Visibility.Collapsed;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private async void RefreshAdaptersButton_OnClick(object sender, RoutedEventArgs e)
|
|
private async void RefreshAdaptersButton_OnClick(object sender, RoutedEventArgs e)
|
|
|
{
|
|
{
|
|
|
SetBusyState(true, "正在刷新本机网卡...");
|
|
SetBusyState(true, "正在刷新本机网卡...");
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- RefreshAdapters();
|
|
|
|
|
|
|
+ var selectedAdapterId = (AdapterComboBox.SelectedItem as AdapterInfo)?.Id;
|
|
|
|
|
+ RefreshAdapters(selectedAdapterId);
|
|
|
SetStatus("已刷新本机网卡。", StatusMessageType.Success, true);
|
|
SetStatus("已刷新本机网卡。", StatusMessageType.Success, true);
|
|
|
}
|
|
}
|
|
|
catch (Exception ex)
|
|
catch (Exception ex)
|