From 575c6b683d812f93e2b7c23163fd86b20f8966e2 Mon Sep 17 00:00:00 2001 From: yize Date: Sat, 16 Jul 2022 23:48:58 +0800 Subject: [PATCH] =?UTF-8?q?String.transform=E7=B3=BB=E5=88=97=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WIKI_ALL.md | 6 +++--- .../main/java/cn/yizems/util/ktx/comm/type/StringEx.kt | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WIKI_ALL.md b/WIKI_ALL.md index f709c55..0dc0b36 100644 --- a/WIKI_ALL.md +++ b/WIKI_ALL.md @@ -435,21 +435,21 @@ fun String?.getZeroAsEmpty(blank: Boolean = true): String? * @param default 为null 时返回 * @param notNull 非null如何处理 */ -fun String?.transformNull(default: String, notNull: (String) -> String): String +fun String?.transformNotNull(default: String, notNull: (String) -> String): String /** * 转换字符串, * @param default 为 empty 时返回 * @param notEmpty 非 empty 如何处理 */ -fun String?.transformEmpty(default: String, notEmpty: (String) -> String): String +fun String?.transformNotEmpty(default: String, notEmpty: (String) -> String): String /** * 转换字符串 * @param default 为 blank 时返回 * @param notBlank 非 blank 如何处理 */ -fun String?.transformBlank(default: String, notBlank: (String) -> String): String +fun String?.transformNotBlank(default: String, notBlank: (String) -> String): String ``` diff --git a/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt b/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt index c6d828a..c3f70c5 100644 --- a/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt +++ b/comm/src/main/java/cn/yizems/util/ktx/comm/type/StringEx.kt @@ -161,7 +161,7 @@ fun String?.getZeroAsEmpty(blank: Boolean = true): String? { * @param default 为null 时返回 * @param notNull 非null如何处理 */ -fun String?.transformNull(default: String, notNull: (String) -> String): String { +fun String?.transformNotNull(default: String, notNull: (String) -> String): String { return if (this == null) { default } else { @@ -174,7 +174,7 @@ fun String?.transformNull(default: String, notNull: (String) -> String): String * @param default 为 empty 时返回 * @param notEmpty 非 empty 如何处理 */ -fun String?.transformEmpty(default: String, notEmpty: (String) -> String): String { +fun String?.transformNotEmpty(default: String, notEmpty: (String) -> String): String { return if (this.isNullOrEmpty()) { default } else { @@ -187,10 +187,12 @@ fun String?.transformEmpty(default: String, notEmpty: (String) -> String): Strin * @param default 为 blank 时返回 * @param notBlank 非 blank 如何处理 */ -fun String?.transformBlank(default: String, notBlank: (String) -> String): String { +fun String?.transformNotBlank(default: String, notBlank: (String) -> String): String { return if (this == null) { default } else { notBlank(this) } } + +