🐛 修复替换令牌时恢复代码不显示的问题

调整添加令牌时的提示信息
🎨 vipEndTimeString
2026-10-21 09:02:26 +08:00 · 2024-04-29 18:07:05 +08:00 · 2024-04-29 16:13:40 +08:00 · 2024-04-29 15:27:28 +08:00 · 2024-04-29 15:04:47 +08:00 · 2024-04-29 15:01:57 +08:00
5 changed files with 50 additions and 50 deletions
@@ -68,19 +68,19 @@ jobs:
        run: dotnet --info

      - name: Build BD.WTTS.Client.AppHost
-        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.AppHost\BD.WTTS.Client.AppHost.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 

      - name: Build BD.WTTS.Client.Plugins.Accelerator.ReverseProxy
-        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 

      - name: Build BD.WTTS.Client.Avalonia.App
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.App\BD.WTTS.Client.Avalonia.App.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 

      - name: Build BD.WTTS.Client.Avalonia.Designer.HostApp
-        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q /property:WarningLevel=1 
+        run: dotnet build -c Release src\BD.WTTS.Client.Avalonia.Designer.HostApp\BD.WTTS.Client.Avalonia.Designer.HostApp.csproj --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 

      - name: Test
-        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q /property:WarningLevel=1 
+        run: dotnet test src/BD.WTTS.UnitTest/BD.WTTS.UnitTest.csproj -c Release -p:GeneratePackageOnBuild=false --nologo -v q --property:WarningLevel=1;DebugType=pdbonly 

 #  release:
 #    name: Release
@@ -52,8 +52,10 @@ public sealed partial class GameAcceleratorService
    [Reactive]
    public DateTime? VipEndTime { get; set; }

+    const string VipEndTimeStringDef = "新用户免费试用 2 天";
+
    [Reactive]
-    public string? VipEndTimeString { get; set; }
+    public string? VipEndTimeString { get; set; } = VipEndTimeStringDef;

    GameAcceleratorService()
    {
@@ -177,54 +179,51 @@ public sealed partial class GameAcceleratorService
                .ObserveOn(RxApp.MainThreadScheduler)
                .Subscribe(async x =>
                {
-                    if (string.IsNullOrWhiteSpace(x?.WattOpenId))
-                        return;
-
-                    var vipEndTimeResult = await IMicroServiceClient.Instance.Manage.GetXunYouVipEndTime();
-                    if (vipEndTimeResult == null)
+                    string vipEndTimeString = VipEndTimeStringDef;
+                    try
                    {
-                        Log.Error(nameof(GameAcceleratorService),
-                            "XunYouSDK.GetVipEndTime is null.");
-                        return;
-                    }
-
-                    if (!vipEndTimeResult.IsSuccess || vipEndTimeResult.Content == null)
-                    {
-                        Toast.Show(ToastIcon.Error, "获取会员时间失败");
-                        return;
-                    }
-
-                    if (vipEndTimeResult.Content.Code == XunYouBaseResponseCode.成功)
-                    {
-                        var etime = vipEndTimeResult.Content.Data?.ExpireTime;
-                        if (etime.HasValue)
+                        if (string.IsNullOrWhiteSpace(x?.WattOpenId))
                        {
-                            VipEndTime = etime.Value.ToDateTime(UnixTimestampType.Seconds);
-                            //var acc_order = (await IMicroServiceClient.Instance.Ordering.GetUserOrderCount([OrderStatus.Paid, OrderStatus.Completed], OrderBusinessType.XunYouOrder)).Content;
-                            //if (acc_order <= 0)
-                            //{
-                            //    if (VipEndTime.Value.AddDays(365).Date == DateTimeOffset.Now.Date)
-                            //        VipEndTimeString = "试用时长到期";
-                            //    else
-                            //        VipEndTimeString = "新用户试用2天";
-                            //}
-                            //else
-                            //{
-                            //    VipEndTimeString = $"游戏加速会员有效期 {VipEndTime.Value:yyyy-MM-dd}";
-                            //}
+                            return;
+                        }

-                            if (VipEndTime.Value.AddDays(365).Date == DateTimeOffset.Now.Date)
-                                VipEndTimeString = "新用户试用2天";
-                            else
-                                VipEndTimeString = $"游戏加速会员有效期 {VipEndTime.Value:yyyy-MM-dd}";
+                        var vipEndTimeResult = await IMicroServiceClient.Instance.Manage.GetXunYouVipEndTime();
+                        if (vipEndTimeResult == null)
+                        {
+                            Log.Error(nameof(GameAcceleratorService),
+                                "XunYouSDK.GetVipEndTime is null.");
+                            return;
+                        }
+
+                        if (!vipEndTimeResult.IsSuccess || vipEndTimeResult.Content == null)
+                        {
+                            Toast.Show(ToastIcon.Error, "获取会员时间失败");
+                            return;
+                        }
+
+                        if (vipEndTimeResult.Content.Code == XunYouBaseResponseCode.成功)
+                        {
+                            var etime = vipEndTimeResult.Content.Data?.ExpireTime;
+                            if (etime.HasValue)
+                            {
+                                VipEndTime = etime.Value.ToDateTime(UnixTimestampType.Seconds);
+                                if (VipEndTime.Value > DateTime.Now)
+                                {
+                                    vipEndTimeString = $"游戏加速会员有效期 {VipEndTime.Value:yyyy-MM-dd}";
+                                }
+                            }
+                        }
+                        else
+                        {
+                            Log.Error(nameof(GameAcceleratorService),
+                                "XunYouSDK.GetVipEndTime is fail, message: {message}, code: {code}.",
+                                vipEndTimeResult.Content.Message,
+                                vipEndTimeResult.Content.Code);
                        }
                    }
-                    else
+                    finally
                    {
-                        Log.Error(nameof(GameAcceleratorService),
-                            "XunYouSDK.GetVipEndTime is fail, message: {message}, code: {code}.",
-                            vipEndTimeResult.Content.Message,
-                            vipEndTimeResult.Content.Code);
+                        VipEndTimeString = vipEndTimeString;
                    }
                });

@@ -300,6 +300,7 @@ public sealed partial class SteamLoginImportPageViewModel : ViewModelBase
                        if (await steamAuthenticator.RemoveAuthenticatorViaChallengeContinueSync(PhoneCodeText, _enrollState.AccessToken!))
                        {
                            await SaveAuthenticatorAsync();
+                            RevocationCodeText = steamAuthenticator.RecoveryCode;
                            return;
                        }
                    }
Author	SHA1	Message	Date
wangyingpan	bc19a02f4f	🐛 修复替换令牌时恢复代码不显示的问题调整添加令牌时的提示信息	2024-04-29 18:07:05 +08:00
Aigio Liu	d59d63d57e	🎨 vipEndTimeString	2024-04-29 16:13:40 +08:00
yingpanwang	9ad6e8fa8d	Fix/authenticator verifycode UI (#3313 ) * 🐛 修复添加令牌邮箱/短信验证ui显示 * 🎨 删除绑定手机号步骤 🐛 修复替换令牌逻辑验证码信息展示错误的问题 * 🐛 修复添加令牌邮箱/短信验证ui显示 * 🎨 删除绑定手机号步骤 🐛 修复替换令牌逻辑验证码信息展示错误的问题 * ✨ 替换令牌中添加绑定手机号窜哦做	2024-04-29 15:27:28 +08:00
Aigio Liu	45ef15b220	🎨 VipEndTimeString	2024-04-29 15:04:47 +08:00
Aigio Liu	25dfd1f888	🐛 VipEndTimeString	2024-04-29 15:01:57 +08:00
Aigio Liu	0495cd3079	💚 CI	2024-04-29 13:14:45 +08:00
Aigio Liu	ea9c45d78b	🎨 VipEndTimeString	2024-04-29 13:11:51 +08:00
Aigio Liu	4427fd1a5f	🐛 VipEndTimeString	2024-04-29 12:18:03 +08:00
RMBGAME	edf3c3a72c	⬆️ SteamClient	2024-04-29 12:10:10 +08:00
Aigio Liu	55490d2351	🐛 VipEndTimeString	2024-04-29 11:59:22 +08:00
Aigio Liu	17ae6655b4	🐛 VipEndTimeString	2024-04-29 11:55:34 +08:00