fix ASP.NET Core Dependent & ASF for Android & res Chinese and Englis…

…h typesetting
Moonmiracle · Dec 2, 2021 · 7a0a4c4 · 7a0a4c4
1 parent dcf4db3
commit 7a0a4c4
Show file tree

Hide file tree

Showing 16 changed files with 445 additions and 296 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm
diff --git a/resources/screenshot_asf_android.png b/resources/screenshot_asf_android.png
diff --git a/resources/screenshot_asf_plus_android.png b/resources/screenshot_asf_plus_android.png
diff --git a/resources/screenshot_asf_ui_android.png b/resources/screenshot_asf_ui_android.png
diff --git a/src/Common.CoreLib/Common.CoreLib.csproj b/src/Common.CoreLib/Common.CoreLib.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!--<TargetFrameworks>netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>-->
@@ -17,6 +17,9 @@
     <PackageReference Include="gfoidl.Base64" />
     <PackageReference Include="MessagePack" />
     <PackageReference Include="Newtonsoft.Json" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
     <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Text.Encodings.Web" />
   </ItemGroup>

diff --git a/src/ST.Client.Android/GoToPlatformPages.cs b/src/ST.Client.Android/GoToPlatformPages.cs
@@ -139,7 +139,7 @@ public static void StartActivity<TActivity, TViewModel>(Fragment fragment, TView
             StartActivity<TActivity, TViewModel>(activity, viewModel);
         }
 
-        public static bool OpenFile(Context context, JFile apkFile, string mime)
+        public static bool OpenFile(Context context, JFile jFile, string mime)
         {
             try
             {
@@ -148,12 +148,12 @@ public static bool OpenFile(Context context, JFile apkFile, string mime)
                 AndroidUri apkUri;
                 if (sdkInt >= (int)BuildVersionCodes.N) // 7.0 FileProvider
                 {
-                    apkUri = FileProvider.GetUriForFile(context, GetAuthority(context), apkFile);
+                    apkUri = FileProvider.GetUriForFile(context, GetAuthority(context), jFile);
                     intent.AddFlags(ActivityFlags.GrantReadUriPermission); // FLAG_GRANT_READ_URI_PERMISSION 添加这一句表示对目标应用临时授权该Uri所代表的文件
                 }
                 else
                 {
-                    apkUri = AndroidUri.FromFile(apkFile)!;
+                    apkUri = AndroidUri.FromFile(jFile)!;
                 }
                 intent.SetDataAndType(apkUri, mime);
                 intent.AddFlags(ActivityFlags.NewTask);

diff --git a/src/ST.Client.Android/Services/Implementation/AndroidPlatformServiceImpl.cs b/src/ST.Client.Android/Services/Implementation/AndroidPlatformServiceImpl.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Text;
 using XEPlatform = Xamarin.Essentials.Platform;
@@ -29,11 +28,21 @@ public void SetLightOrDarkThemeFollowingSystem(bool enable)
         void IPlatformService.OpenFileByTextReader(string filePath)
         {
             var activity = XEPlatform.CurrentActivity;
+            if (filePath.StartsWith(IOPath.AppDataDirectory) || filePath.StartsWith(IOPath.CacheDirectory))
+            {
+                OpenFileByTextReaderByTextBlockActivity();
+                return;
+            }
             var result = GoToPlatformPages.OpenFile(
                 activity,
                 new(filePath),
                 MediaTypeNames.TXT);
             if (!result)
+            {
+                OpenFileByTextReaderByTextBlockActivity();
+            }
+
+            void OpenFileByTextReaderByTextBlockActivity()
             {
                 TextBlockActivity.StartActivity(activity, new() { FilePath = filePath });
             }

diff --git a/src/ST.Client.Android/UI/Fragments/ArchiSteamFarmPlus/ASFPlusFragment.cs b/src/ST.Client.Android/UI/Fragments/ArchiSteamFarmPlus/ASFPlusFragment.cs
@@ -44,12 +44,16 @@ public override void OnCreateView(View view)
 
             ASFService.Current.WhenAnyValue(x => x.IsASFRuning).SubscribeInMainThread(value =>
             {
-                if (menuBuilder == null) return;
-                var menu_start = menuBuilder.FindItem(Resource.Id.menu_start);
-                if (menu_start == null) return;
-                menu_start.SetIcon(value ?
-                    Resource.Drawable.round_pause_circle_outline_black_24 :
-                    Resource.Drawable.round_play_circle_outline_black_24);
+                if (menuBuilder != null) // toolbar menu 因主活动改为 XF Shell，已由 XF 托管
+                {
+                    var menu_start = menuBuilder.FindItem(Resource.Id.menu_start);
+                    if (menu_start != null)
+                    {
+                        menu_start.SetIcon(value ?
+                            Resource.Drawable.round_pause_circle_outline_black_24 :
+                            Resource.Drawable.round_play_circle_outline_black_24);
+                    }
+                }
             }).AddTo(this);
         }
 
@@ -110,9 +114,9 @@ static ActionItem MenuIdResToEnum(int resId)
 
         string ViewPagerWithTabLayoutAdapter.IHost.GetPageTitle(int position) => position switch
         {
-            0 => "ASF控制台",
-            1 => "Bot配置",
-            2 => "ASF配置",
+            0 => ASF_Console,
+            1 => ASF_BotManage,
+            2 => ASF_GlobalConfig,
             _ => throw new ArgumentOutOfRangeException(nameof(position), position.ToString()),
         };
     }

diff --git a/src/ST.Client.Mobile.Droid.App/ST.Client.Android.App.csproj b/src/ST.Client.Mobile.Droid.App/ST.Client.Android.App.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,6 +41,7 @@
     <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>false</BundleAssemblies>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>

diff --git a/src/ST.Client/Services/Implementation/CloudServiceClient.cs b/src/ST.Client/Services/Implementation/CloudServiceClient.cs
@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Application.Columns;
 using System.Application.Models;
@@ -25,7 +25,7 @@ public CloudServiceClient(
                 httpPlatformHelper,
                 toast,
                 userManager,
-                options,
+                options.Value,
                 validator)
         {
             this.userManager = userManager;