use separate file saver

moonheart · Dec 31, 2023 · bc75060 · bc75060
1 parent 77f0067
commit bc75060
Show file tree

Hide file tree

Showing 59 changed files with 55 additions and 4,453 deletions.
diff --git a/MementoMori.BlazorShared/IFileSaver.cs b/MementoMori.BlazorShared/IFileSaver.cs
@@ -0,0 +1,6 @@
+namespace MementoMori.BlazorShared;
+
+public interface IFileSaver
+{
+    Task SaveFile(string content, string filename);
+}
diff --git a/MementoMori.BlazorShared/MementoMori.BlazorShared.csproj b/MementoMori.BlazorShared/MementoMori.BlazorShared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -44,10 +44,6 @@
 	<PackageReference Include="Injectio" Version="3.1.0" PrivateAssets="all"/>
   </ItemGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-        <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.3" />
-    </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\MementoMori\MementoMori.csproj" />
   </ItemGroup>

diff --git a/MementoMori.BlazorShared/Pages/BattleLog.razor b/MementoMori.BlazorShared/Pages/BattleLog.razor
@@ -4,6 +4,7 @@
 @page "/battlelog"
 @inject IJSRuntime JS
 @inject IDialogService DialogService
+@inject IFileSaver FileSaver
 
 <MudText Typo="Typo.h6">
     @ResourceStrings.You_can_download_the_battle_log_and_parse_it_here: <MudLink Href="https://mentemori.icu/battle_log.html" Target="_blank">Battle Log Viewer</MudLink>

diff --git a/MementoMori.BlazorShared/Pages/BattleLog.razor.cs b/MementoMori.BlazorShared/Pages/BattleLog.razor.cs
@@ -1,10 +1,4 @@
-using System.Text;
-using AutoCtor;
-#if ANDROID 
-using Microsoft.Maui.ApplicationModel.DataTransfer;
-using Microsoft.Maui.Storage;
-#endif
-using MementoMori.Ortega.Share.Data.Battle.Result;
+using MementoMori.Ortega.Share.Data.Battle.Result;
 using Microsoft.JSInterop;
 using Newtonsoft.Json;
 
@@ -55,22 +49,14 @@ private async Task DownloadBattleLog(string filename)
     {
         if (string.IsNullOrEmpty(filename)) return;
         if (!ReadLogContent(filename, out var json)) return;
-#if ANDROID
         try
         {
-            var tempPath = Path.Combine(FileSystem.CacheDirectory, filename);
-            await File.WriteAllTextAsync(tempPath, json);
-            await Share.Default.RequestAsync(new ShareFileRequest() { File = new ShareFile(tempPath) });
+            await FileSaver.SaveFile(json, filename);
         }
         catch (Exception e)
         {
             await DialogService.ShowMessageBox("错误", e.ToString());
         }
-#else
-        var bytes = Encoding.UTF8.GetBytes(json);
-        using var streamRef = new DotNetStreamReference(new MemoryStream(bytes));
-        await JS.InvokeVoidAsync("downloadFileFromStream", filename, streamRef);
-#endif
     }
 
     private bool ReadLogContent(string filename, out string json)

diff --git a/MementoMori.Common/MementoMori.Common.csproj b/MementoMori.Common/MementoMori.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/MementoMori.Maui/InitializeService.cs b/MementoMori.Maui/InitializeService.cs
diff --git a/MementoMori.Maui/MainPage.xaml.cs b/MementoMori.Maui/MainPage.xaml.cs
@@ -19,8 +19,8 @@ private void UpdateInfo(string msg)
 
         private async Task InitializeMemento()
         {
-            var accountManager = Services.Get<AccountManager>();
-            var networkManager = Services.Get<MementoNetworkManager>();
+            var accountManager = Common.Services.Get<AccountManager>();
+            var networkManager = Common.Services.Get<MementoNetworkManager>();
             UpdateInfo("Initializing...");
             accountManager.MigrateToAccountArray();
             accountManager.CurrentCulture = CultureInfo.CurrentCulture;

diff --git a/MementoMori.Maui/MauiProgram.cs b/MementoMori.Maui/MauiProgram.cs
@@ -48,6 +48,7 @@ public static MauiApp CreateMauiApp()
 
             builder.Services.AddMementoMori();
             builder.Services.AddMementoMoriBlazorShared();
+            builder.Services.AddMementoMoriMaui();
             builder.Services.AddHttpClient();
 
             builder.Services.AddOptions();
@@ -63,7 +64,7 @@ public static MauiApp CreateMauiApp()
 #endif
 
             var app = builder.Build();
-            Services.Setup(app.Services);
+            Common.Services.Setup(app.Services);
 
             return app;
         }

diff --git a/MementoMori.Maui/MementoMori.Maui.csproj b/MementoMori.Maui/MementoMori.Maui.csproj
@@ -90,6 +90,7 @@
         <PackageReference Include="Quartz" Version="3.7.0" />
         <PackageReference Include="Quartz.AspNetCore" Version="3.7.0" />
 		<PackageReference Include="Sentry.Maui" Version="3.41.3" />
+        <PackageReference Include="Injectio" Version="3.1.0" PrivateAssets="all"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/MementoMori.Maui/Services/FileSaver.cs b/MementoMori.Maui/Services/FileSaver.cs
@@ -0,0 +1,15 @@
+using Injectio.Attributes;
+using MementoMori.BlazorShared;
+
+namespace MementoMori.Maui.Services;
+
+[RegisterSingleton]
+public class FileSaver: IFileSaver
+{
+    public async Task SaveFile(string content, string filename)
+    {
+        var tempPath = Path.Combine(FileSystem.CacheDirectory, filename);
+        await File.WriteAllTextAsync(tempPath, content);
+        await Share.Default.RequestAsync(new ShareFileRequest() { File = new ShareFile(tempPath) });
+    }
+}
diff --git a/MementoMori.WebUI/Extensions/GameExtensions.cs b/MementoMori.WebUI/Extensions/GameExtensions.cs
diff --git a/MementoMori.WebUI/Extensions/JsonExtensions.cs b/MementoMori.WebUI/Extensions/JsonExtensions.cs
diff --git a/MementoMori.WebUI/Extensions/TimeExtensions.cs b/MementoMori.WebUI/Extensions/TimeExtensions.cs
diff --git a/MementoMori.WebUI/Extensions/UserItemExtensions.cs b/MementoMori.WebUI/Extensions/UserItemExtensions.cs
diff --git a/MementoMori.WebUI/MementoMori.WebUI.csproj b/MementoMori.WebUI/MementoMori.WebUI.csproj
@@ -31,6 +31,7 @@
         <PackageReference Include="Quartz.AspNetCore" Version="3.7.0" />
       <PackageReference Include="ReactiveUI.Blazor" Version="19.5.1" />
       <PackageReference Include="Sentry.AspNetCore" Version="3.40.1" />
+      <PackageReference Include="Injectio" Version="3.1.0" PrivateAssets="all"/>
     </ItemGroup>
 
     <ItemGroup>