Archives
/
SmsForwarder
mirror of https://github.com/pppscn/SmsForwarder
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化：自动任务的触发条件`充电状态`中`充电器`增加`不限`选项 #I8VOE3

Browse Source
pull/408/head
pppscn 4 months ago
parent 8c897971bf
commit e736bd2c2a
8 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
.github/FUNDING.yml vendored
Unescape Escape View File

@ -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"]

5
app/src/main/java/com/idormy/sms/forwarder/entity/condition/ChargeSetting.kt
Unescape Escape View File

@ -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
}
}

2
app/src/main/java/com/idormy/sms/forwarder/utils/task/ConditionUtils.kt
Unescape Escape View File

@ -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
}

4
app/src/main/res/layout/fragment_tasks_condition_charge.xml
Unescape Escape View File

@ -141,9 +141,9 @@
tools:ignore="TouchTargetSizeCheck" />
<RadioButton
android:id="@+id/rb_plugged_unknown"
android:id="@+id/rb_plugged_unlimited"
style="@style/rg_rb_style"
android:text="@string/battery_unknown"
android:text="@string/battery_unlimited"
tools:ignore="TouchTargetSizeCheck" />
</RadioGroup>

1
app/src/main/res/values-en/strings.xml
Unescape Escape View File

@ -938,6 +938,7 @@
<string name="msg_content_regex">^.{1,390}$</string>
<string name="battery_unknown">unknown</string>
<string name="battery_unlimited">unlimited</string>
<string name="battery_ac">AC</string>
<string name="battery_usb">USB</string>
<string name="battery_wireless">Wireless</string>

1
app/src/main/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -939,6 +939,7 @@
<string name="msg_content_regex">^.{1,390}$</string>
<string name="battery_unknown">未知</string>
<string name="battery_unlimited">不限</string>
<string name="battery_ac">AC</string>
<string name="battery_usb">USB</string>
<string name="battery_wireless">无线</string>

1
app/src/main/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -939,6 +939,7 @@
<string name="msg_content_regex">^.{1,390}$</string>
<string name="battery_unknown">未知</string>
<string name="battery_unlimited">不限</string>
<string name="battery_ac">AC</string>
<string name="battery_usb">USB</string>
<string name="battery_wireless">無線</string>

1
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -939,6 +939,7 @@
<string name="msg_content_regex">^.{1,390}$</string>
<string name="battery_unknown">未知</string>
<string name="battery_unlimited">不限</string>
<string name="battery_ac">AC</string>
<string name="battery_usb">USB</string>
<string name="battery_wireless">无线</string>

Write Preview
Loading…
Cancel
Save