|
|
@ -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() |
|
|
|