bugfix 修正 PURCHASEHISTORY 命令

chr233 · Jul 2, 2024 · a6d5d03 · a6d5d03
1 parent 4134761
commit a6d5d03
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/ASFEnhance/Account/CurrencyHelper.cs b/ASFEnhance/Account/CurrencyHelper.cs
@@ -61,6 +61,7 @@ internal static class CurrencyHelper
         { "¥",    "CNY" },
         { "COL$", "COP" },
         { "₡",    "CRC" },
+        { "--€",    "EUR" },
         { "€",    "EUR" },
         { "£",    "GBP" },
         { "HK$",  "HKD" },
@@ -102,6 +103,7 @@ internal static class CurrencyHelper
         "BRL",
         "NOK",
         "EUR",
-        "PLN"
+        "PLN",
+        "VND",
     ];
 }
diff --git a/ASFEnhance/Account/HtmlParser.cs b/ASFEnhance/Account/HtmlParser.cs
@@ -165,7 +165,7 @@ decimal ParseMoneyString(string strMoney)
 
             string strItem = whtItem?.Text().Trim().Replace("\t", "") ?? "";
             string strType = whtType?.Text().Trim().Replace("\t", "") ?? "";
-            string strTotal = whtTotal?.Text().Trim().Replace("\t", "") ?? "";
+            string strTotal = whtTotal?.Text().Replace("资金", "").Trim().Replace("\t", "") ?? "";
             string strChange = whtChange?.Text().Trim().Replace("\t", "") ?? "";
 
             if (!string.IsNullOrEmpty(strType))
@@ -174,6 +174,7 @@ decimal ParseMoneyString(string strMoney)
                 if (!string.IsNullOrEmpty(strType) && !strType.StartsWith("转换") && !strType.StartsWith("退款"))
                 {
                     int total = (int)(ParseMoneyString(strTotal) * 100);
+
                     int walletChange;
                     int walletChangeAbs;
 

diff --git a/ASFEnhance/RegexUtils.cs b/ASFEnhance/RegexUtils.cs
@@ -21,7 +21,7 @@ internal static partial class RegexUtils
     [GeneratedRegex("g_historyCursor = ([^;]+)")]
     public static partial Regex MatchHistortyCursor();
 
-    [GeneratedRegex(@"^\s*([-+])?([^\d,.]*)([\d,.]+)([^\d,.]*)$")]
+    [GeneratedRegex(@"^([-+])?([^\d,.]*)([\d,.]+)\s*([^\d,.]*|[pуб.]*)$")]
     public static partial Regex MatchHistoryItem();
 
     [GeneratedRegex(@"\( (\d+),")]

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>2.1.10.3</Version>
+		<Version>2.1.10.4</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>