优化：自定义模板增加`{{IPV4}}``{{IPV6}}`标签 #398
This commit is contained in:
pppscn
parent
ef115f1b96
commit
9379882ca3
|
|
@ -73,6 +73,8 @@ data class MsgInfo(
|
|||
.replace(getString(R.string.tag_device_name), deviceMark)
|
||||
.replace(getString(R.string.tag_app_version), versionName)
|
||||
.replace(getString(R.string.tag_call_type), callTypeMap[callType.toString()] ?: getString(R.string.unknown_call))
|
||||
.replace(getString(R.string.tag_ipv4), TaskUtils.ipv4)
|
||||
.replace(getString(R.string.tag_ipv6), TaskUtils.ipv6)
|
||||
.replace(getString(R.string.tag_battery_pct), TaskUtils.batteryPct.toString())
|
||||
.replace(getString(R.string.tag_battery_status), BatteryUtils.getStatus(TaskUtils.batteryStatus))
|
||||
.replace(getString(R.string.tag_battery_plugged), BatteryUtils.getPlugged(TaskUtils.batteryPlugged))
|
||||
|
|
@ -126,6 +128,8 @@ data class MsgInfo(
|
|||
.replace(getString(R.string.tag_device_name), deviceMark)
|
||||
.replace(getString(R.string.tag_app_version), versionName)
|
||||
.replace(getString(R.string.tag_call_type), callTypeMap[callType.toString()] ?: getString(R.string.unknown_call))
|
||||
.replace(getString(R.string.tag_ipv4), TaskUtils.ipv4)
|
||||
.replace(getString(R.string.tag_ipv6), TaskUtils.ipv6)
|
||||
.replace(getString(R.string.tag_battery_pct), TaskUtils.batteryPct.toString())
|
||||
.replace(getString(R.string.tag_battery_status), BatteryUtils.getStatus(TaskUtils.batteryStatus))
|
||||
.replace(getString(R.string.tag_battery_plugged), BatteryUtils.getPlugged(TaskUtils.batteryPlugged))
|
||||
|
|
@ -162,6 +166,8 @@ data class MsgInfo(
|
|||
.replace(getString(R.string.tag_device_name), jsonInnerStr(deviceMark))
|
||||
.replace(getString(R.string.tag_app_version), jsonInnerStr(versionName))
|
||||
.replace(getString(R.string.tag_call_type), jsonInnerStr(callTypeMap[callType.toString()] ?: getString(R.string.unknown_call)))
|
||||
.replace(getString(R.string.tag_ipv4), jsonInnerStr(TaskUtils.ipv4))
|
||||
.replace(getString(R.string.tag_ipv6), jsonInnerStr(TaskUtils.ipv6))
|
||||
.replace(getString(R.string.tag_battery_pct), jsonInnerStr(TaskUtils.batteryPct.toString()))
|
||||
.replace(getString(R.string.tag_battery_status), jsonInnerStr(BatteryUtils.getStatus(TaskUtils.batteryStatus)))
|
||||
.replace(getString(R.string.tag_battery_plugged), jsonInnerStr(BatteryUtils.getPlugged(TaskUtils.batteryPlugged)))
|
||||
|
|
|
|||
|
|
@ -33,6 +33,13 @@ class NetworkWorker(context: Context, params: WorkerParameters) : CoroutineWorke
|
|||
|
||||
override suspend fun doWork(): Result {
|
||||
try {
|
||||
//获取公网IP地址
|
||||
val ipv4 = getPublicIP(false)
|
||||
TaskUtils.ipv4 = if (ipv4Pattern.matches(ipv4)) ipv4 else ""
|
||||
val ipv6 = getPublicIP(true)
|
||||
TaskUtils.ipv6 = if (ipv6Pattern.matches(ipv6)) ipv6 else ""
|
||||
Log.d(TAG, "ipv4 = $ipv4, ipv6 = $ipv6")
|
||||
|
||||
val conditionType = inputData.getInt(TaskWorker.conditionType, -1)
|
||||
val taskList = Core.task.getByType(conditionType)
|
||||
for (task in taskList) {
|
||||
|
|
@ -67,8 +74,6 @@ class NetworkWorker(context: Context, params: WorkerParameters) : CoroutineWorke
|
|||
continue
|
||||
}
|
||||
|
||||
var ipv4 = ""
|
||||
var ipv6 = ""
|
||||
val msg = StringBuilder()
|
||||
msg.append(getString(R.string.network_type)).append(": ")
|
||||
when (networkSetting.networkState) {
|
||||
|
|
@ -91,9 +96,6 @@ class NetworkWorker(context: Context, params: WorkerParameters) : CoroutineWorke
|
|||
msg.append(getString(R.string.carrier_name)).append(": ").append(App.SimInfoList[simIndex]?.mCarrierName).append("\n")
|
||||
}
|
||||
}
|
||||
|
||||
ipv4 = getPublicIP(false)
|
||||
ipv6 = getPublicIP(true)
|
||||
}
|
||||
|
||||
//WiFi
|
||||
|
|
@ -104,9 +106,6 @@ class NetworkWorker(context: Context, params: WorkerParameters) : CoroutineWorke
|
|||
}
|
||||
msg.append(getString(R.string.net_wifi)).append("\n")
|
||||
msg.append(getString(R.string.wifi_ssid)).append(": ").append(TaskUtils.wifiSsid).append("\n")
|
||||
|
||||
ipv4 = getPublicIP(false)
|
||||
ipv6 = getPublicIP(true)
|
||||
}
|
||||
|
||||
//未知 && 没有网络
|
||||
|
|
@ -118,22 +117,16 @@ class NetworkWorker(context: Context, params: WorkerParameters) : CoroutineWorke
|
|||
val isHttpServerRunning = ServiceUtils.isServiceRunning("com.idormy.sms.forwarder.service.HttpServerService")
|
||||
if (ipv4Pattern.matches(ipv4)) {
|
||||
msg.append(getString(R.string.ipv4)).append(": ").append(ipv4).append("\n")
|
||||
TaskUtils.ipv4 = ipv4
|
||||
if (isHttpServerRunning) {
|
||||
msg.append(getString(R.string.http_server)).append(": ").append("http://${ipv4}:5000").append("\n")
|
||||
}
|
||||
} else {
|
||||
TaskUtils.ipv4 = ""
|
||||
}
|
||||
|
||||
if (ipv6Pattern.matches(ipv6)) {
|
||||
msg.append(getString(R.string.ipv6)).append(": ").append(ipv6).append("\n")
|
||||
TaskUtils.ipv6 = ipv6
|
||||
if (isHttpServerRunning) {
|
||||
msg.append(getString(R.string.http_server)).append(": ").append("http://[${ipv6}]:5000").append("\n")
|
||||
}
|
||||
} else {
|
||||
TaskUtils.ipv6 = ""
|
||||
}
|
||||
|
||||
//TODO: 组装消息体 && 执行具体任务
|
||||
|
|
|
|||
|
|
@ -630,6 +630,8 @@
|
|||
<string name="tag_battery_plugged">{{BATTERY_PLUGGED}}</string>
|
||||
<string name="tag_battery_info">{{BATTERY_INFO}}</string>
|
||||
<string name="tag_uid">{{UID}}</string>
|
||||
<string name="tag_ipv4">{{IPV4}}</string>
|
||||
<string name="tag_ipv6">{{IPV6}}</string>
|
||||
<string name="rule_sms">SMS</string>
|
||||
<string name="rule_call">CALL</string>
|
||||
<string name="rule_app">APP</string>
|
||||
|
|
|
|||
|
|
@ -631,6 +631,8 @@
|
|||
<string name="tag_battery_plugged">{{充电方式}}</string>
|
||||
<string name="tag_battery_info">{{电池信息}}</string>
|
||||
<string name="tag_uid">{{UID}}</string>
|
||||
<string name="tag_ipv4">{{IPV4}}</string>
|
||||
<string name="tag_ipv6">{{IPV6}}</string>
|
||||
<string name="rule_sms">短信</string>
|
||||
<string name="rule_call">来电</string>
|
||||
<string name="rule_app">应用</string>
|
||||
|
|
|
|||
|
|
@ -631,6 +631,8 @@
|
|||
<string name="tag_battery_plugged">{{充電方式}}</string>
|
||||
<string name="tag_battery_info">{{電池信息}}</string>
|
||||
<string name="tag_uid">{{UID}}</string>
|
||||
<string name="tag_ipv4">{{IPV4}}</string>
|
||||
<string name="tag_ipv6">{{IPV6}}</string>
|
||||
<string name="rule_sms">簡訊</string>
|
||||
<string name="rule_call">來電</string>
|
||||
<string name="rule_app">應用</string>
|
||||
|
|
|
|||
|
|
@ -631,6 +631,8 @@
|
|||
<string name="tag_battery_plugged">{{充电方式}}</string>
|
||||
<string name="tag_battery_info">{{电池信息}}</string>
|
||||
<string name="tag_uid">{{UID}}</string>
|
||||
<string name="tag_ipv4">{{IPV4}}</string>
|
||||
<string name="tag_ipv6">{{IPV6}}</string>
|
||||
<string name="rule_sms">短信</string>
|
||||
<string name="rule_call">来电</string>
|
||||
<string name="rule_app">应用</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue