修复随机图片无法读取的问题（绝对相对路径检测） (b6891e64) · Commits · shRabbit / CountdownList · GitLab

CountDownList/AssemblyInfo.cs

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ using System.Windows;
		//
		// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
		// 方法是按如下所示使用“*”:
		[assembly: AssemblyVersion("1.2.2.*")]
		[assembly: AssemblyVersion("1.2.3.*")]

		/// <summary>
		/// 使用此类前需要把[assembly: ComVisible(false)]改为true

CountDownList/Class/ListCore.cs

+10 −10

Original line number	Diff line number	Diff line
		@@ -900,13 +900,13 @@ namespace CountDownList.Class
		{
		case ExtraMode.MinecraftOnly:
		ImageBrush mcO = new();
		mcO.ImageSource = new BitmapImage(new Uri($@"UI\test.png", UriKind.RelativeOrAbsolute));
		mcO.ImageSource = new BitmapImage(new Uri($@"UI\test.png", UriKind.Relative));
		mcO.Stretch = Stretch.UniformToFill;

		return mcO;
		case ExtraMode.Minecraft:
		//获取文件列表
		string imageSourceDirMc = $"{AppDomain.CurrentDomain.BaseDirectory}Data\\RandomImg\\Minecraft";
		string imageSourceDirMc = $"Data\\RandomImg\\Minecraft";
		System.IO.DirectoryInfo directory = new System.IO.DirectoryInfo(imageSourceDirMc);
		var files = directory.GetFiles(".", System.IO.SearchOption.TopDirectoryOnly);
		List<string> ImgList = files.Select(s => s.FullName).ToList();
		@@ -917,13 +917,13 @@ namespace CountDownList.Class

		//创建ImageBrush实例
		ImageBrush mc = new();
		mc.ImageSource = new BitmapImage(new Uri(file, UriKind.RelativeOrAbsolute));
		mc.ImageSource = new BitmapImage(new Uri(file, UriKind.Relative));
		mc.Stretch = Stretch.UniformToFill;

		return mc;
		case ExtraMode.GenshinExtra:
		//获取文件列表
		string imageSourceDirYsE = $"{AppDomain.CurrentDomain.BaseDirectory}Data\\RandomImg\\GenshinExtra";
		string imageSourceDirYsE = $"Data\\RandomImg\\GenshinExtra";
		System.IO.DirectoryInfo directoryYsE = new System.IO.DirectoryInfo(imageSourceDirYsE);
		var filesYsE = directoryYsE.GetFiles(".", System.IO.SearchOption.TopDirectoryOnly);
		List<string> ImgListYsE = filesYsE.Select(s => s.FullName).ToList();
		@@ -934,13 +934,13 @@ namespace CountDownList.Class

		//创建ImageBrush实例
		ImageBrush mcYsE = new();
		mcYsE.ImageSource = new BitmapImage(new Uri(fileYsE, UriKind.RelativeOrAbsolute));
		mcYsE.ImageSource = new BitmapImage(new Uri(fileYsE, UriKind.Relative));
		mcYsE.Stretch = Stretch.UniformToFill;

		return mcYsE;
		case ExtraMode.GenshinNormal:
		//获取文件列表
		string imageSourceDirYs = $"{AppDomain.CurrentDomain.BaseDirectory}Data\\RandomImg\\GenshinNormal";
		string imageSourceDirYs = $"Data\\RandomImg\\GenshinNormal";
		System.IO.DirectoryInfo directoryYs = new System.IO.DirectoryInfo(imageSourceDirYs);
		var filesYs = directoryYs.GetFiles(".", System.IO.SearchOption.TopDirectoryOnly);
		List<string> ImgListYs = filesYs.Select(s => s.FullName).ToList();
		@@ -951,13 +951,13 @@ namespace CountDownList.Class

		//创建ImageBrush实例
		ImageBrush mcYs = new();
		mcYs.ImageSource = new BitmapImage(new Uri(fileYs, UriKind.RelativeOrAbsolute));
		mcYs.ImageSource = new BitmapImage(new Uri(fileYs, UriKind.Relative));
		mcYs.Stretch = Stretch.UniformToFill;

		return mcYs;
		case ExtraMode.Custom:
		//获取文件列表
		string imageSourceDir = $"{AppDomain.CurrentDomain.BaseDirectory}Data\\RandomImg\\GenshinExtra";
		string imageSourceDir = $"Data\\RandomImg\\GenshinExtra";
		System.IO.DirectoryInfo directoryc = new System.IO.DirectoryInfo(imageSourceDir);
		var filesc = directoryc.GetFiles(".", System.IO.SearchOption.TopDirectoryOnly);
		List<string> ImgListc = filesc.Select(s => s.FullName).ToList();
		@@ -968,13 +968,13 @@ namespace CountDownList.Class

		//创建ImageBrush实例
		ImageBrush mcc = new();
		mcc.ImageSource = new BitmapImage(new Uri(filec, UriKind.RelativeOrAbsolute));
		mcc.ImageSource = new BitmapImage(new Uri(filec, UriKind.Relative));
		mcc.Stretch = Stretch.UniformToFill;

		return mcc;
		default:
		ImageBrush mcO2 = new();
		mcO2.ImageSource = new BitmapImage(new Uri($@"UI\test.png", UriKind.RelativeOrAbsolute));
		mcO2.ImageSource = new BitmapImage(new Uri($@"UI\test.png", UriKind.Relative));
		mcO2.Stretch = Stretch.UniformToFill;

		return mcO2;

CountDownList/Class/XML.cs

+2 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,8 @@ namespace CountDownList.Class

		try
		{
		if (File.Exists($@"{AppDomain.CurrentDomain.BaseDirectory}{backgroundRaw}"))
		//检测文件是否存在，检测绝对路径和相对路径
		if (File.Exists($@"{AppDomain.CurrentDomain.BaseDirectory}{backgroundRaw}") \|\| File.Exists(backgroundRaw))
		{
		ib.ImageSource = new BitmapImage(new Uri(backgroundRaw, UriKind.RelativeOrAbsolute));
		ib.Stretch = Stretch.UniformToFill;

CountDownList/MainWindow.xaml.cs

+7 −7

Original line number	Diff line number	Diff line
		@@ -166,13 +166,6 @@ namespace CountDownList
		if(MiscSetting.Default.GaussianBlurMode)
		EnableBlur();

		if (MiscSetting.Default.UpdateTip)
		{
		MainHelpFramework mainHelp = new();
		mainHelp.ShowDialog();
		MiscSetting.Default.UpdateTip = false;
		}

		DateTime time = DateTime.Now;
		Core = new(doingList, wancheng, count, DoingE, wcE, countE, sv);
		bool initShowed = false;
		@@ -221,6 +214,13 @@ namespace CountDownList
		//设置窗口背景为透明，为了命中检测
		if (MiscSetting.Default.AutoOpen)
		Background = (SolidColorBrush)FindResource("Auto");

		if (MiscSetting.Default.UpdateTip)
		{
		MainHelpFramework mainHelp = new();
		mainHelp.ShowDialog();
		MiscSetting.Default.UpdateTip = false;
		}
		}

		/// <summary>

CountDownList/UI/WindowFrame/MainHelpFramework.xaml

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,11 @@

		<local:MyScrollViewer Grid.Row="1" Margin="4" Style="{DynamicResource ScrollViewerBaseStyle}">
		<StackPanel>
		<TextBlock FontSize="18">CountDownList1.2.2更新内容</TextBlock>
		<TextBlock Margin="20,8,0,64">
		修复随机图片重启后读取失败的问题
		</TextBlock>

		<TextBlock FontSize="18">CountDownList1.2.1更新内容</TextBlock>
		<TextBlock Margin="20,8,0,64">
		新增设置随机背景图片选项

Admin message

Admin message