Skip to content

Commit

Permalink
删减无用代码。导入配置时去掉配置文件中无用的换行符。
Browse files Browse the repository at this point in the history
  • Loading branch information
@SIXiaolong1117
SIXiaolong1117 committed Sep 21, 2023
1 parent e3cff51 commit 5a0a8fa
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 90 deletions.
31 changes: 15 additions & 16 deletions NetworkSelector/NetSetting.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

<GridView.ItemTemplate>
<DataTemplate x:DataType="local:Item">
<StackPanel Orientation="Vertical" Margin="8" Width="252">
<StackPanel Orientation="Vertical" Width="252">
<TextBlock Text="{x:Bind ConfigName}"/>
<TextBlock Text="{x:Bind NetInterface}"/>
<TextBlock Text="{x:Bind IPAddr}"/>
Expand All @@ -95,33 +95,32 @@
</GridView.ItemsPanel>

</GridView>
</StackPanel>


<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,8">
<Button x:Name="addConfigButton" HorizontalAlignment="Center" Content="添加配置" Click="addConfigButton_Click" Width="84" Margin="0,0,8,0"/>
<Button
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,8">
<Button x:Name="addConfigButton" HorizontalAlignment="Center" Content="添加配置" Click="addConfigButton_Click" Width="84" Margin="0,0,8,0"/>
<Button
x:Name="delConfigButton"
Content="删除配置"
HorizontalAlignment="Center" VerticalAlignment="Bottom"
Width="84"
Margin="0,0,8,0">
<Button.Flyout>
<Flyout>
<StackPanel>
<TextBlock
<Button.Flyout>
<Flyout>
<StackPanel>
<TextBlock
Style="{ThemeResource BaseTextBlockStyle}"
Text="您确定要删除此配置文件吗？"
Margin="0,0,0,12" />
<Button
<Button
Click="delConfigButton_Click"
Content="确定" />
</StackPanel>
</Flyout>
</Button.Flyout>
</Button>
<Button x:Name="applyConfigButton" HorizontalAlignment="Center" Content="应用配置" Click="applyConfigButton_Click" Width="84"/>
</StackPanel>
<TextBox x:Name="netshCMD" Header="CMD：" Visibility="Collapsed" Width="268"/>
</StackPanel>
</Flyout>
</Button.Flyout>
</Button>
<Button x:Name="applyConfigButton" HorizontalAlignment="Center" Content="应用配置" Click="applyConfigButton_Click" Width="84"/>
</StackPanel>
</StackPanel>
</StackPanel>
Expand Down
26 changes: 3 additions & 23 deletions NetworkSelector/NetSetting.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using System.IO;
using System.Text;
using Windows.Storage.Provider;
using System.Text.RegularExpressions;

namespace NetworkSelector
{
Expand All @@ -41,9 +42,6 @@ public NetSetting()
configName.SelectedItem = localSettings.Values["configName"];
refreshContent(localSettings.Values["configName"].ToString());
}

//netName.Text = localSettings.Values[localSettings.Values["configName"].ToString() + "netName"] as string;
refreshStatus();
}
public List<string> ConfigSelector { get; } = new List<string>()
{
Expand Down Expand Up @@ -120,7 +118,6 @@ private void refreshCMD(string netInterface, string IPAddr, string Mask, string
+ "netsh interface ip set dns name='" + netInterface + "' source=static addr='" + DNS1 + "' register=primary;"
+ "netsh interface ip add dns name='" + netInterface + "' addr='" + DNS2 + "' index=2;";
}
netshCMD.Text = localSettings.Values["netshCMD"] as string;
}
// 刷新Content 调取localSettings存储内容
public void refreshContent(string ConfigNameStr)
Expand Down Expand Up @@ -204,7 +201,6 @@ public void refreshContent(string ConfigNameStr)
addConfigButton.Content = "添加配置";
delConfigButton.IsEnabled = false;
applyConfigButton.IsEnabled = false;
netshCMD.Text = "";
refreshCMD("", "", "", "", "", "");
}
else
Expand All @@ -226,23 +222,6 @@ public void refreshContent(string ConfigNameStr)
}
MyGridView.ItemsSource = items;
}
// 刷新Status 调用localSettings存储状态
public void refreshStatus()
{
if (localSettings.Values["CMDDisplay"] as string == "是")
{
netshCMD.Visibility = Visibility.Visible;
}
else if (localSettings.Values["CMDDisplay"] as string == "否")
{
netshCMD.Visibility = Visibility.Collapsed;
}
else
{
localSettings.Values["CMDDisplay"] = "否";
netshCMD.Visibility = Visibility.Collapsed;
}
}
// 自动或预设切换
private void configName_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
Expand All @@ -255,7 +234,6 @@ private void configName_SelectionChanged(object sender, SelectionChangedEventArg
localSettings.Values["DHCPStatus"] = "False";
}
refreshContent(configName.SelectedItem.ToString());
refreshStatus();
}
private async void addConfigButton_Click(object sender, RoutedEventArgs e)
{
Expand Down Expand Up @@ -379,6 +357,8 @@ private async void ImportConfig_Click(object sender, RoutedEventArgs e)
{
var path = file.Path;
localSettings.Values["ConfigID" + ConfigIDNum] = File.ReadAllText(path, Encoding.UTF8);
// 处理掉一些非法字符
localSettings.Values["ConfigID" + ConfigIDNum] = Regex.Replace(localSettings.Values["ConfigID" + ConfigIDNum] as string, @"\r\n?|\n", "");
// 刷新UI
refreshContent(ConfigIDNum);
}
Expand Down
7 changes: 0 additions & 7 deletions NetworkSelector/SettingsPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@
Width="268"
Margin="0,8,0,0">
</ComboBox>
<ComboBox x:Name="CMDDisplay"
ItemsSource="{x:Bind CMDDisplays}"
SelectionChanged="CMDDisplay_SelectionChanged"
Header="是否显示 CMD 文本框："
Width="268"
Margin="0,8,0,0">
</ComboBox>
</StackPanel>
</Grid>
</Page>
44 changes: 0 additions & 44 deletions NetworkSelector/SettingsPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,6 @@ public SettingsPage()
// 非法输入，设置默认材料为Mica Alt
localSettings.Values["materialStatus"] = "Mica Alt";
backgroundMaterial.SelectedItem = material[1];
// 非法输入，扔出警报
//throw new Exception($"Wrong material type: {localSettings.Values["materialStatus"]}");
}

if (localSettings.Values["CMDDisplay"] as string == "是")
{
CMDDisplay.SelectedItem = CMDDisplays[0];
}
else if (localSettings.Values["CMDDisplay"] as string == "否")
{
CMDDisplay.SelectedItem = CMDDisplays[1];
}
else
{
localSettings.Values["CMDDisplay"] = "否";
CMDDisplay.SelectedItem = CMDDisplays[1];
}
}

Expand Down Expand Up @@ -125,33 +109,5 @@ private void backgroundMaterial_SelectionChanged(object sender, SelectionChanged
throw new Exception($"Invalid argument: {materialStatus}");
}
}

private void CMDDisplay_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
string CMDDisplay = e.AddedItems[0].ToString();
switch (CMDDisplay)
{
case "是":
if (localSettings.Values["CMDDisplay"] as string != "是")
{
localSettings.Values["CMDDisplay"] = "是";
}
else
{
localSettings.Values["CMDDisplay"] = "是";
}
break;
case "否":
if (localSettings.Values["CMDDisplay"] as string != "否")
{
localSettings.Values["CMDDisplay"] = "否";
}
else
{
localSettings.Values["CMDDisplay"] = "否";
}
break;
}
}
}
}

0 comments on commit 5a0a8fa

Please sign in to comment.