From 6601a454727853c42a7ede54688b8e07f3018031 Mon Sep 17 00:00:00 2001 From: Dude so hot Date: Sat, 19 Oct 2024 22:39:15 +0800 Subject: [PATCH] GP divide by 1k --- .../kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt | 2 +- .../main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt | 2 +- app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt index c68b0210c..e1870a710 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/ArchiveParser.kt @@ -60,7 +60,7 @@ object ArchiveParser { archiveList.add(item) } val funds = maybeFunds ?: PATTERN_CURRENT_FUNDS.find(body)!!.groupValues.run { - val fundsGP = ParserUtils.parseInt(get(1), 0) + val fundsGP = ParserUtils.parseInt(get(1), 0) / 1000 val fundsC = ParserUtils.parseInt(get(2), 0) Funds(fundsGP, fundsC) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt index b7205b48a..165720fa6 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/client/parser/HomeParser.kt @@ -29,7 +29,7 @@ object HomeParser { fun parseFunds(body: String): Funds { FundsRegex.find(body)?.groupValues?.run { val fundsC = ParserUtils.parseInt(get(1), 0) - val fundsGP = ParserUtils.parseInt(get(2), 0) * 1000 + val fundsGP = ParserUtils.parseInt(get(2), 0) return Funds(fundsGP, fundsC) } throw ParseException("Parse funds error") diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt index b1b28e187..a077bad21 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/FundsItem.kt @@ -28,5 +28,8 @@ fun FundsItem( Text(text = type) } RollingNumber(number = amount, style = textStyle, separator = true) + if (type == "GP") { + Text(text = "k") + } } }