Browse Source

修改目录地址和解压方式

master
feng 4 years ago
parent
commit
74a5729895
  1. 1
      JdShopListener/JdShopListener/JdShopListener.csproj
  2. 2
      JdShopListener/JdShopListener/JdShopListener.csproj.user
  3. 2
      JdShopListener/JdShopListener/MainWindow.xaml
  4. 23
      JdShopListener/JdShopListener/MainWindowViewModel.cs
  5. 2
      JdShopListener/JdShopListener/Properties/PublishProfiles/FolderProfile.pubxml.user

1
JdShopListener/JdShopListener/JdShopListener.csproj

@ -18,7 +18,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.15.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.5">
<PrivateAssets>all</PrivateAssets>

2
JdShopListener/JdShopListener/JdShopListener.csproj.user

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>D:\2019\齐论项目\跟屁虫\JdShopListener\JdShopListener\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
<_LastSelectedProfileId>E:\2019\齐论项目\跟屁虫\JdShopListener\JdShopListener\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup>
<ItemGroup>
<ApplicationDefinition Update="App.xaml">

2
JdShopListener/JdShopListener/MainWindow.xaml

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:JdShopListener"
mc:Ignorable="d"
DataContext="{x:Static local:MainWindowViewModel.MainViewModel}"
Title="MainWindow" Height="450" Width="800" >
Title="跟屁虫" Height="450" Width="800" >
<Window.Resources>
<Style
TargetType="{x:Type TabItem}">

23
JdShopListener/JdShopListener/MainWindowViewModel.cs

@ -15,7 +15,7 @@ using PuppeteerSharp;
using Utils;
using System.Threading.Tasks;
using System.IO;
using Ionic.Zip;
using System.IO.Compression;
namespace JdShopListener
{
@ -24,7 +24,7 @@ namespace JdShopListener
private static MainWindowViewModel _mainWindowViewModel = new MainWindowViewModel();
public MainWindow Window;
string ddFileName = $"{System.Environment.CurrentDirectory}\\ddset.ini";
string ddFileName = $"{ AppDomain.CurrentDomain.SetupInformation.ApplicationBase}ddset.ini";
public static MainWindowViewModel MainViewModel
{
get
@ -115,7 +115,7 @@ namespace JdShopListener
/// </summary>
public void InitWeb()
{
string floader= System.Environment.CurrentDirectory + "\\.local-chromium";
string floader= AppDomain.CurrentDomain.SetupInformation.ApplicationBase + ".local-chromium";
if (System.IO.Directory.Exists(floader))
{
@ -127,7 +127,7 @@ namespace JdShopListener
WebClient webClient = new WebClient();
webClient.DownloadFileCompleted += WebClient_DownloadFileCompleted;
webClient.DownloadProgressChanged += WebClient_DownloadProgressChanged;
webClient.DownloadFileTaskAsync("https://qymds.oss-cn-hangzhou.aliyuncs.com/chromium/.local-chromium.zip", System.Environment.CurrentDirectory+"\\tempZip.zip").Wait();
webClient.DownloadFileTaskAsync("https://qymds.oss-cn-hangzhou.aliyuncs.com/chromium/.local-chromium.zip", AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "tempZip.zip").Wait();
}
private void WebClient_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
@ -142,15 +142,20 @@ namespace JdShopListener
//进行解压
IsInitLoding = false;
UnZip(System.Environment.CurrentDirectory + "\\tempZip.zip", System.Environment.CurrentDirectory);
UnZip( AppDomain.CurrentDomain.SetupInformation.ApplicationBase+ "tempZip.zip", AppDomain.CurrentDomain.SetupInformation.ApplicationBase);
}
private void UnZip(string fileToUnZip, string DstFile)
{
using (ZipFile zip = new ZipFile(fileToUnZip, Encoding.Default))
{
zip.ExtractAll(DstFile, ExtractExistingFileAction.OverwriteSilently);
}
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
ZipFile.ExtractToDirectory(fileToUnZip, DstFile, Encoding.GetEncoding("gb2312"), true);
//using (ZipFile zip = new ZipFile(fileToUnZip, Encoding.Default))
//{
// zip.ExtractAll(DstFile, ExtractExistingFileAction.OverwriteSilently);
//}
}
public void LoadHYItems()

2
JdShopListener/JdShopListener/Properties/PublishProfiles/FolderProfile.pubxml.user

@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<History>True|2021-11-13T06:54:09.0591524Z;True|2021-11-13T14:52:48.4056995+08:00;True|2021-11-13T14:51:49.0309726+08:00;True|2021-11-13T14:48:43.2272103+08:00;True|2021-11-13T14:47:27.9721804+08:00;True|2021-11-13T14:45:09.2474573+08:00;True|2021-11-13T14:41:32.7950744+08:00;True|2021-11-13T14:36:57.1688384+08:00;True|2021-11-13T14:34:06.7538906+08:00;True|2021-11-13T11:23:58.1124027+08:00;False|2021-11-13T11:23:39.3148111+08:00;False|2021-11-13T11:22:51.2298917+08:00;True|2021-11-13T10:44:44.3567647+08:00;True|2021-11-13T10:42:01.8636514+08:00;True|2021-11-13T10:38:36.0623458+08:00;True|2021-11-13T10:20:29.4761762+08:00;True|2021-11-13T10:08:51.4924474+08:00;True|2021-11-12T15:27:50.0418057+08:00;True|2021-11-12T15:06:23.1220477+08:00;True|2021-11-11T18:06:38.5161322+08:00;True|2021-11-11T17:53:13.2835443+08:00;True|2021-11-11T17:52:00.9170918+08:00;True|2021-11-11T17:51:37.4852682+08:00;True|2021-11-11T17:49:30.9386192+08:00;True|2021-11-11T17:44:28.5146341+08:00;True|2021-11-11T17:42:26.8480671+08:00;True|2021-11-11T17:37:14.4108790+08:00;True|2021-11-11T17:30:25.4460722+08:00;</History>
<History>True|2022-01-03T09:04:13.2257910Z;True|2022-01-03T16:54:29.6063209+08:00;True|2022-01-02T11:31:19.6646883+08:00;True|2021-11-13T14:54:09.0591524+08:00;True|2021-11-13T14:52:48.4056995+08:00;True|2021-11-13T14:51:49.0309726+08:00;True|2021-11-13T14:48:43.2272103+08:00;True|2021-11-13T14:47:27.9721804+08:00;True|2021-11-13T14:45:09.2474573+08:00;True|2021-11-13T14:41:32.7950744+08:00;True|2021-11-13T14:36:57.1688384+08:00;True|2021-11-13T14:34:06.7538906+08:00;True|2021-11-13T11:23:58.1124027+08:00;False|2021-11-13T11:23:39.3148111+08:00;False|2021-11-13T11:22:51.2298917+08:00;True|2021-11-13T10:44:44.3567647+08:00;True|2021-11-13T10:42:01.8636514+08:00;True|2021-11-13T10:38:36.0623458+08:00;True|2021-11-13T10:20:29.4761762+08:00;True|2021-11-13T10:08:51.4924474+08:00;True|2021-11-12T15:27:50.0418057+08:00;True|2021-11-12T15:06:23.1220477+08:00;True|2021-11-11T18:06:38.5161322+08:00;True|2021-11-11T17:53:13.2835443+08:00;True|2021-11-11T17:52:00.9170918+08:00;True|2021-11-11T17:51:37.4852682+08:00;True|2021-11-11T17:49:30.9386192+08:00;True|2021-11-11T17:44:28.5146341+08:00;True|2021-11-11T17:42:26.8480671+08:00;True|2021-11-11T17:37:14.4108790+08:00;True|2021-11-11T17:30:25.4460722+08:00;</History>
</PropertyGroup>
</Project>
Loading…
Cancel
Save