From e736bd2c2a8c170096291b1cf23c1c68c91a801b Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sat, 13 Jan 2024 10:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?`=E5=85=85=E7=94=B5=E7=8A=B6=E6=80=81`=E4=B8=AD`=E5=85=85?=
=?UTF-8?q?=E7=94=B5=E5=99=A8`=E5=A2=9E=E5=8A=A0`=E4=B8=8D=E9=99=90`?=
=?UTF-8?q?=E9=80=89=E9=A1=B9=20#I8VOE3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/FUNDING.yml | 2 +-
.../idormy/sms/forwarder/entity/condition/ChargeSetting.kt | 5 +++--
.../com/idormy/sms/forwarder/utils/task/ConditionUtils.kt | 2 +-
app/src/main/res/layout/fragment_tasks_condition_charge.xml | 4 ++--
app/src/main/res/values-en/strings.xml | 1 +
app/src/main/res/values-zh-rCN/strings.xml | 1 +
app/src/main/res/values-zh-rTW/strings.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
8 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 4e7bd06c..595c65d0 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,3 @@
# These are supported funding model platforms
-custom: ["https://github.com/pppscn/SmsForwarder/wiki/%E6%89%93%E8%B5%8F%E5%90%8D%E5%8D%95", "https://gitee.com/pp/SmsForwarder/wikis/pages?sort_id=4912193&doc_id=1821427", "https://afdian.net/a/pppscn"]
+custom: ["https://foruda.gitee.com/images/1705068554951915754/89c6e226_16273.png", "https://afdian.net/a/pppscn", "https://github.com/pppscn/SmsForwarder/wiki/%E6%89%93%E8%B5%8F%E5%90%8D%E5%8D%95", "https://gitee.com/pp/SmsForwarder/wikis/pages?sort_id=4912193&doc_id=1821427"]
diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/condition/ChargeSetting.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/condition/ChargeSetting.kt
index 349987ca..181b8f22 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/entity/condition/ChargeSetting.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/entity/condition/ChargeSetting.kt
@@ -24,6 +24,7 @@ data class ChargeSetting(
R.id.rb_plugged_ac -> BatteryManager.BATTERY_PLUGGED_AC
R.id.rb_plugged_usb -> BatteryManager.BATTERY_PLUGGED_USB
R.id.rb_plugged_wireless -> BatteryManager.BATTERY_PLUGGED_WIRELESS
+ R.id.rb_plugged_unlimited -> 0 //不限
else -> BatteryManager.BATTERY_PLUGGED_AC
}
description = String.format(getString(R.string.battery_status), getStatusStr(status))
@@ -57,7 +58,7 @@ data class ChargeSetting(
BatteryManager.BATTERY_PLUGGED_AC -> getString(R.string.battery_ac)
BatteryManager.BATTERY_PLUGGED_USB -> getString(R.string.battery_usb)
BatteryManager.BATTERY_PLUGGED_WIRELESS -> getString(R.string.battery_wireless)
- else -> getString(R.string.battery_unknown)
+ else -> getString(R.string.battery_unlimited)
}
}
@@ -66,7 +67,7 @@ data class ChargeSetting(
BatteryManager.BATTERY_PLUGGED_AC -> R.id.rb_plugged_ac
BatteryManager.BATTERY_PLUGGED_USB -> R.id.rb_plugged_usb
BatteryManager.BATTERY_PLUGGED_WIRELESS -> R.id.rb_plugged_wireless
- else -> R.id.rb_plugged_unknown
+ else -> R.id.rb_plugged_unlimited
}
}
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt
index c679e0a4..6b037333 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt
@@ -192,7 +192,7 @@ class ConditionUtils private constructor() {
val batteryStatus = TaskUtils.batteryStatus
val batteryPlugged = TaskUtils.batteryPlugged
- if (batteryStatus != chargeSetting.status || batteryPlugged != chargeSetting.plugged) {
+ if (batteryStatus != chargeSetting.status || (chargeSetting.plugged != 0 && batteryPlugged != chargeSetting.plugged)) {
Log.d(TAG, "TASK-$taskId:batteryStatus or batteryPlugged is not match, chargeSetting = $chargeSetting")
return false
}
diff --git a/app/src/main/res/layout/fragment_tasks_condition_charge.xml b/app/src/main/res/layout/fragment_tasks_condition_charge.xml
index a7064399..38e9189c 100644
--- a/app/src/main/res/layout/fragment_tasks_condition_charge.xml
+++ b/app/src/main/res/layout/fragment_tasks_condition_charge.xml
@@ -141,9 +141,9 @@
tools:ignore="TouchTargetSizeCheck" />
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 9d887da6..2588cc5d 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -938,6 +938,7 @@
^.{1,390}$
unknown
+ unlimited
AC
USB
Wireless
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 8da1da3c..30f5ab59 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -939,6 +939,7 @@
^.{1,390}$
未知
+ 不限
AC
USB
无线
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9b25498d..80a425bc 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -939,6 +939,7 @@
^.{1,390}$
未知
+ 不限
AC
USB
無線
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 932df0c3..c93821a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -939,6 +939,7 @@
^.{1,390}$
未知
+ 不限
AC
USB
无线