hcjike/AdbTools
hcjike/AdbTools
1
1
Fork 0
mirror of https://ghfast.top/https://github.com/zsjy/AdbTools.git synced 2025-03-14 23:13:10 +08:00
Code Issues Packages Projects Releases 3 Wiki Activity

更新

Browse Source
This commit is contained in:
mjsoftware 2025-02-21 09:24:34 +08:00
parent f836c2e07b
commit e74a519b41
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AdbTools/App.xaml.cs
View File

@ -33,9 +33,7 @@ namespace AdbTools
if (createMeetingProcess.Count() > 1)
{
HandleRunningInstance(createMeetingProcess[0]);
///退出当前新开进程，不走OnExit方法
Environment.Exit(0);
//Application.Current.Shutdown();
Application.Current.Shutdown();
return;
}
}

6
AdbTools/MainWindow.xaml
View File

@ -52,7 +52,7 @@
<Popup x:Name="setup_popup" Placement="Bottom" PlacementTarget="{Binding ElementName=setup}" StaysOpen="False" HorizontalOffset="0" VerticalOffset="0" AllowsTransparency="True">
<Border Background="{Binding ElementName=menuHeader,Path=Background}" Padding="10" CornerRadius="0,0,5,5" BorderBrush="#FF06AB26" BorderThickness="1,0,1,1">
<StackPanel>
<CheckBox IsChecked="False" x:Name="topmastCB" Content="置顶显示" Cursor="Hand" Click="topmastCB_Click" VerticalContentAlignment="Center" HorizontalAlignment="Left" />
<CheckBox IsChecked="False" x:Name="topmastCB" Content="置顶显示" Cursor="Hand" Click="topmastCB_Click" VerticalContentAlignment="Center" HorizontalAlignment="Left" FontSize="14"/>
</StackPanel>
</Border>
</Popup>
@ -61,8 +61,8 @@
<Popup x:Name="about_popup" Placement="Bottom" PlacementTarget="{Binding ElementName=about}" StaysOpen="False" HorizontalOffset="0" VerticalOffset="0" AllowsTransparency="True">
<Border Background="{Binding ElementName=menuHeader,Path=Background}" Padding="10" CornerRadius="0,0,5,5" BorderBrush="#FF06AB26" BorderThickness="1,0,1,1">
<StackPanel Cursor="">
<Button x:Name="projectAddress" Content="项目地址" Background="{x:Null}" Click="projectAddress_Click" HorizontalAlignment="Left" Cursor="Hand"/>
<Button x:Name="cheackUpdate" Content="检查更新" Margin="0,10,0,0" Background="{x:Null}" Click="cheackUpdate_Click" HorizontalAlignment="Left" Cursor="Hand"/>
<Button x:Name="projectAddress" Content="项目地址" Background="{x:Null}" Click="projectAddress_Click" HorizontalAlignment="Left" Cursor="Hand" FontSize="14"/>
<Button x:Name="cheackUpdate" Content="检查更新" Margin="0,10,0,0" Background="{x:Null}" Click="cheackUpdate_Click" HorizontalAlignment="Left" Cursor="Hand" FontSize="14"/>
</StackPanel>
</Border>
</Popup>

3
AdbTools/MainWindow.xaml.cs
View File

@ -525,8 +525,7 @@ namespace AdbTools
if (CmdExecutor.StartExe($"{AppDomain.CurrentDomain.BaseDirectory}Update.exe", cmdArges))
{
///退出当前新开进程，不走OnExit方法
Environment.Exit(0);
Application.Current.Shutdown();
}
else
{

3
Update/MainWindow.xaml.cs
View File

@ -115,8 +115,7 @@ namespace Update
{
this.Dispatcher.Invoke(new Action(() =>
{
///退出当前新开进程，不走OnExit方法
Environment.Exit(0);
Application.Current.Shutdown();
}));
}