Skip to content

Commit 98c92a3

Browse files
committed
New Pre-Release
1 parent bab3a1c commit 98c92a3

File tree

3 files changed

+83
-67
lines changed

3 files changed

+83
-67
lines changed

README.md

+18-18
Original file line numberDiff line numberDiff line change
@@ -235,107 +235,107 @@
235235
<tr align="center">
236236
<td><a href="https://dotnet.microsoft.com/en-us/download/dotnet-framework/net48">.NET Framework 4.8</a></td>
237237
<td>
238-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8_x64_24.5.17.0.exe'>
238+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8_x64_24.6.6.0.exe'>
239239
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET Framework 4.8 x64' width='160' />
240240
</a>
241241
</td>
242242
<td>
243-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8_x86_24.5.17.0.exe'>
243+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8_x86_24.6.6.0.exe'>
244244
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET Framework 4.8 x86' width='160' />
245245
</a>
246246
</td>
247247
<td>
248-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8_ARM64_24.5.17.0.exe'>
248+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8_ARM64_24.6.6.0.exe'>
249249
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET Framework 4.8 ARM64' width='160' />
250250
</a>
251251
</td>
252252
</tr>
253253
<tr align="center">
254254
<td><a href="https://dotnet.microsoft.com/en-us/download/dotnet-framework/net481">.NET Framework 4.8.1</a></td>
255255
<td>
256-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8.1_x64_24.5.17.0.exe'>
256+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8.1_x64_24.6.6.0.exe'>
257257
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET Framework 4.8.1 x64' width='160' />
258258
</a>
259259
</td>
260260
<td>
261-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8.1_x86_24.5.17.0.exe'>
261+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8.1_x86_24.6.6.0.exe'>
262262
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET Framework 4.8.1 x86' width='160' />
263263
</a>
264264
</td>
265265
<td>
266-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8.1_ARM64_24.5.17.0.exe'>
266+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_Framework_4.8.1_ARM64_24.6.6.0.exe'>
267267
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET Framework 4.8.1 ARM64' width='160' />
268268
</a>
269269
</td>
270270
</tr>
271271
<tr align="center">
272272
<td><a href="https://dotnet.microsoft.com/en-us/download/dotnet/6.0">.NET 6.0</a></td>
273273
<td>
274-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_6.0_x64_24.5.17.0.exe'>
274+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_6.0_x64_24.6.6.0.exe'>
275275
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 6.0 x64' width='160' />
276276
</a>
277277
</td>
278278
<td>
279-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_6.0_x86_24.5.17.0.exe'>
279+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_6.0_x86_24.6.6.0.exe'>
280280
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 6.0 x86' width='160' />
281281
</a>
282282
</td>
283283
<td>
284-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_6.0_ARM64_24.5.17.0.exe'>
284+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_6.0_ARM64_24.6.6.0.exe'>
285285
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 6.0 ARM64' width='160' />
286286
</a>
287287
</td>
288288
</tr>
289289
<tr align="center">
290290
<td><a href="https://dotnet.microsoft.com/en-us/download/dotnet/7.0">.NET 7.0</a></td>
291291
<td>
292-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_7.0_x64_24.5.17.0.exe'>
292+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_7.0_x64_24.6.6.0.exe'>
293293
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 7.0 x64' width='160' />
294294
</a>
295295
</td>
296296
<td>
297-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_7.0_x86_24.5.17.0.exe'>
297+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_7.0_x86_24.6.6.0.exe'>
298298
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 7.0 x86' width='160' />
299299
</a>
300300
</td>
301301
<td>
302-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_7.0_ARM64_24.5.17.0.exe'>
302+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_7.0_ARM64_24.6.6.0.exe'>
303303
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 7.0 ARM64' width='160' />
304304
</a>
305305
</td>
306306
</tr>
307307
<tr align="center">
308308
<td><a href="https://dotnet.microsoft.com/en-us/download/dotnet/8.0">.NET 8.0</a></td>
309309
<td>
310-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_8.0_x64_24.5.17.0.exe'>
310+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_8.0_x64_24.6.6.0.exe'>
311311
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 8.0 x64' width='160' />
312312
</a>
313313
</td>
314314
<td>
315-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_8.0_x86_24.5.17.0.exe'>
315+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_8.0_x86_24.6.6.0.exe'>
316316
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 8.0 x86' width='160' />
317317
</a>
318318
</td>
319319
<td>
320-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_8.0_ARM64_24.5.17.0.exe'>
320+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_8.0_ARM64_24.6.6.0.exe'>
321321
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 8.0 ARM64' width='160' />
322322
</a>
323323
</td>
324324
</tr>
325325
<tr align="center">
326326
<td><a href="https://dotnet.microsoft.com/en-us/download/dotnet/9.0">.NET 9.0</a></td>
327327
<td>
328-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_9.0_x64_24.5.17.0.exe'>
328+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_9.0_x64_24.6.6.0.exe'>
329329
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 9.0 x64' width='160' />
330330
</a>
331331
</td>
332332
<td>
333-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_9.0_x86_24.5.17.0.exe'>
333+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_9.0_x86_24.6.6.0.exe'>
334334
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 9.0 x86' width='160' />
335335
</a>
336336
</td>
337337
<td>
338-
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_9.0_ARM64_24.5.17.0.exe'>
338+
<a href='https://github.com/Taiizor/Sucrose/releases/latest/download/Sucrose_Bundle_.NET_9.0_ARM64_24.6.6.0.exe'>
339339
<img src='.images/Badges/GitHub/English_get_it_from_GH_228X86.png' alt='Sucrose .NET 9.0 ARM64' width='160' />
340340
</a>
341341
</td>

src/Bundle/Sucrose.Bundle/Main.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Grid>
2323
<Image
2424
Opacity="0.5"
25-
Source="\Sucrose.Bundle;component\Assets\Background33.jpg"
25+
Source="\Sucrose.Bundle;component\Assets\Background1.jpg"
2626
Stretch="UniformToFill" />
2727

2828
<TextBlock

src/Project/Sucrose.Reportdog/Helper/Initialize.cs

+64-48
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using SSCHOS = Sucrose.Shared.Core.Helper.OperatingSystem;
1313
using SSCHV = Sucrose.Shared.Core.Helper.Version;
1414
using SSDMM = Sucrose.Shared.Dependency.Manage.Manager;
15+
using SSSHN = Sucrose.Shared.Space.Helper.Network;
1516
using SSSHU = Sucrose.Shared.Space.Helper.User;
1617
using SSSHW = Sucrose.Shared.Space.Helper.Watchdog;
1718
using SSSMAD = Sucrose.Shared.Space.Model.AnalyticsData;
@@ -44,7 +45,7 @@ public async void Start()
4445

4546
SRMI.Watcher = new()
4647
{
47-
NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.DirectoryName,
48+
NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.DirectoryName | NotifyFilters.CreationTime,
4849
Path = SRMI.Source,
4950
Filter = "*.*"
5051
};
@@ -67,19 +68,22 @@ private static async Task GetOnline()
6768
{
6869
try
6970
{
70-
using HttpClient Client = new();
71+
if (SSSHN.GetHostEntry())
72+
{
73+
using HttpClient Client = new();
7174

72-
HttpResponseMessage Response = new();
75+
HttpResponseMessage Response = new();
7376

74-
Client.DefaultRequestHeaders.Add("User-Agent", SMMM.UserAgent);
77+
Client.DefaultRequestHeaders.Add("User-Agent", SMMM.UserAgent);
7578

76-
try
77-
{
78-
Response = await Client.GetAsync($"{SMR.SoferityWebsite}/{SMR.SoferityReport}/{SMR.Online}/{SSSHU.GetGuid()}/{SRMI.InitializeTime / 1000}");
79-
}
80-
catch (Exception Exception)
81-
{
82-
await SSWW.Watch_CatchException(Exception);
79+
try
80+
{
81+
Response = await Client.GetAsync($"{SMR.SoferityWebsite}/{SMR.SoferityReport}/{SMR.Online}/{SSSHU.GetGuid()}/{SRMI.InitializeTime / 1000}");
82+
}
83+
catch (Exception Exception)
84+
{
85+
await SSWW.Watch_CatchException(Exception);
86+
}
8387
}
8488
}
8589
catch (Exception Exception)
@@ -92,32 +96,41 @@ private static async Task PostStatistic()
9296
{
9397
try
9498
{
95-
using HttpClient Client = new();
99+
if (SSSHN.GetHostEntry())
100+
{
101+
using HttpClient Client = new();
96102

97-
HttpResponseMessage Response = new();
103+
HttpResponseMessage Response = new();
98104

99-
Client.DefaultRequestHeaders.Add("User-Agent", SMMM.UserAgent);
105+
Client.DefaultRequestHeaders.Add("User-Agent", SMMM.UserAgent);
100106

101-
try
102-
{
103-
CultureInfo Culture = new(SWNM.GetUserDefaultUILanguage());
107+
try
108+
{
109+
CultureInfo Culture = new(SWNM.GetUserDefaultUILanguage());
104110

105-
SSSMAD AnalyticsData = new(SMMM.Adult, SSSHU.GetName(), SSSHU.GetModel(), $"{SSDMM.StoreType}", SMMM.Startup, SMMM.Culture.ToUpperInvariant(), SSCHV.GetText(), SSCHF.GetName(), SSSHU.GetProcessor(), SSCHM.GetTotalMemory(), Culture.Name, SSSHU.GetNumberOfCores(), SSCHA.GetText(), SSSHU.GetManufacturer(), $"{SMMM.DisplayScreenType}", Culture.NativeName, SSCHOS.GetText(), SSCHOS.GetProcessArchitectureText(), SSCHV.GetOSText(), SSCHOS.GetProcessorArchitecture(), SWHSI.GetSystemInfoArchitecture());
111+
SSSMAD AnalyticsData = new(SMMM.Adult, SSSHU.GetName(), SSSHU.GetModel(), $"{SSDMM.StoreType}", SMMM.Startup, SMMM.Culture.ToUpperInvariant(), SSCHV.GetText(), SSCHF.GetName(), SSSHU.GetProcessor(), SSCHM.GetTotalMemory(), Culture.Name, SSSHU.GetNumberOfCores(), SSCHA.GetText(), SSSHU.GetManufacturer(), $"{SMMM.DisplayScreenType}", Culture.NativeName, SSCHOS.GetText(), SSCHOS.GetProcessArchitectureText(), SSCHV.GetOSText(), SSCHOS.GetProcessorArchitecture(), SWHSI.GetSystemInfoArchitecture());
106112

107-
StringContent Content = new(JsonConvert.SerializeObject(AnalyticsData, Formatting.Indented), Encoding.UTF8, "application/json");
113+
StringContent Content = new(JsonConvert.SerializeObject(AnalyticsData, Formatting.Indented), Encoding.UTF8, "application/json");
108114

109-
Response = await Client.PostAsync($"{SMR.SoferityWebsite}/{SMR.SoferityReport}/{SMR.Statistic}/{SSSHU.GetGuid()}", Content);
110-
}
111-
catch (Exception Exception)
112-
{
113-
await SSWW.Watch_CatchException(Exception);
115+
Response = await Client.PostAsync($"{SMR.SoferityWebsite}/{SMR.SoferityReport}/{SMR.Statistic}/{SSSHU.GetGuid()}", Content);
116+
}
117+
catch (Exception Exception)
118+
{
119+
await SSWW.Watch_CatchException(Exception);
114120

115-
await Task.Delay(3000);
121+
await Task.Delay(3000);
116122

117-
await PostStatistic();
118-
}
123+
await PostStatistic();
124+
}
119125

120-
if (!Response.IsSuccessStatusCode)
126+
if (!Response.IsSuccessStatusCode)
127+
{
128+
await Task.Delay(3000);
129+
130+
await PostStatistic();
131+
}
132+
}
133+
else
121134
{
122135
await Task.Delay(3000);
123136

@@ -138,34 +151,37 @@ private static async Task PostError(string Path)
138151
{
139152
try
140153
{
141-
await Task.Delay(50);
142-
143-
if (File.Exists(Path))
154+
if (SSSHN.GetHostEntry())
144155
{
145-
using HttpClient Client = new();
156+
await Task.Delay(50);
146157

147-
HttpResponseMessage Response = new();
158+
if (File.Exists(Path))
159+
{
160+
using HttpClient Client = new();
148161

149-
Client.DefaultRequestHeaders.Add("User-Agent", SMMM.UserAgent);
162+
HttpResponseMessage Response = new();
150163

151-
try
152-
{
153-
SSSMDD DiagnosticsData = JsonConvert.DeserializeObject<SSSMDD>(SSSHW.Read(Path));
164+
Client.DefaultRequestHeaders.Add("User-Agent", SMMM.UserAgent);
154165

155-
StringContent Content = new(JsonConvert.SerializeObject(DiagnosticsData, Formatting.Indented), Encoding.UTF8, "application/json");
166+
try
167+
{
168+
SSSMDD DiagnosticsData = JsonConvert.DeserializeObject<SSSMDD>(SSSHW.Read(Path));
156169

157-
Response = await Client.PostAsync($"{SMR.SoferityWebsite}/{SMR.SoferityReport}/{SMR.Error}/{SSSHU.GetGuid()}", Content);
158-
}
159-
catch (Exception Exception)
160-
{
161-
await SSWW.Watch_CatchException(Exception);
162-
}
170+
StringContent Content = new(JsonConvert.SerializeObject(DiagnosticsData, Formatting.Indented), Encoding.UTF8, "application/json");
163171

164-
if (Response.IsSuccessStatusCode)
165-
{
166-
await Task.Delay(50);
172+
Response = await Client.PostAsync($"{SMR.SoferityWebsite}/{SMR.SoferityReport}/{SMR.Error}/{SSSHU.GetGuid()}", Content);
173+
}
174+
catch (Exception Exception)
175+
{
176+
await SSWW.Watch_CatchException(Exception);
177+
}
178+
179+
if (Response.IsSuccessStatusCode)
180+
{
181+
await Task.Delay(50);
167182

168-
File.Delete(Path);
183+
File.Delete(Path);
184+
}
169185
}
170186
}
171187
}

0 commit comments

Comments
 (0)