优化
This commit is contained in:
@@ -36,12 +36,8 @@ object RuleComplete {
|
|||||||
fun autoComplete(
|
fun autoComplete(
|
||||||
rule: String?,
|
rule: String?,
|
||||||
preRule: String? = null,
|
preRule: String? = null,
|
||||||
type: Int = 1,
|
type: Int = 1
|
||||||
enable: Boolean
|
|
||||||
): String? {
|
): String? {
|
||||||
if (!enable) {
|
|
||||||
return rule
|
|
||||||
}
|
|
||||||
if (rule.isNullOrEmpty() || rule.contains(completeIgnore)
|
if (rule.isNullOrEmpty() || rule.contains(completeIgnore)
|
||||||
|| preRule?.contains(completeIgnorePreRule) == true
|
|| preRule?.contains(completeIgnorePreRule) == true
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -98,7 +98,10 @@ class BookSourceEditViewModel(application: Application) : BaseViewModel(applicat
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun ruleComplete(rule: String?, preRule: String? = null, type: Int = 1): String? {
|
fun ruleComplete(rule: String?, preRule: String? = null, type: Int = 1): String? {
|
||||||
return RuleComplete.autoComplete(rule, preRule, type, autoComplete)
|
if (autoComplete) {
|
||||||
|
return RuleComplete.autoComplete(rule, preRule, type)
|
||||||
|
}
|
||||||
|
return rule
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -78,7 +78,10 @@ class RssSourceEditViewModel(application: Application) : BaseViewModel(applicati
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun ruleComplete(rule: String?, preRule: String? = null, type: Int = 1): String? {
|
fun ruleComplete(rule: String?, preRule: String? = null, type: Int = 1): String? {
|
||||||
return RuleComplete.autoComplete(rule, preRule, type, autoComplete)
|
if (autoComplete) {
|
||||||
|
return RuleComplete.autoComplete(rule, preRule, type)
|
||||||
|
}
|
||||||
|
return rule
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user