Merge code

This commit is contained in:
2022-03-20 00:21:38 +08:00
parent 9b90004bff
commit e80b95004a
2 changed files with 31 additions and 24 deletions

View File

@@ -181,7 +181,7 @@ class ConfigureActivity : BaseActivity<ActivityConfigBinding>() {
/** 装载数据 */ /** 装载数据 */
mockLocalData() mockLocalData()
/** 更新数据 */ /** 更新数据 */
onStartRefresh() if (intent?.getBooleanExtra("isShowUpdDialog", true) == true) onStartRefresh()
} }
/** 开始手动同步 */ /** 开始手动同步 */

View File

@@ -64,6 +64,9 @@ object IconRuleManagerTool {
/** 当前规则的系统名称 */ /** 当前规则的系统名称 */
private const val OS_TAG = "MIUI" private const val OS_TAG = "MIUI"
/** 当前规则的通知图标颜色 */
private const val OS_COLOR = 0xFFE06818
/** /**
* 从在线地址手动同步规则 * 从在线地址手动同步规则
* @param context 实例 * @param context 实例
@@ -201,6 +204,7 @@ object IconRuleManagerTool {
context.snakeOrNotify(title = "同步错误", msg = "目标地址不是有效的 JSON 数据") context.snakeOrNotify(title = "同步错误", msg = "目标地址不是有效的 JSON 数据")
params.isCompareDifferent(it) -> { params.isCompareDifferent(it) -> {
params.save(it) params.save(it)
pushNotify(context, title = "同步完成", msg = "已更新通知图标优化名单,点击查看")
it() it()
} }
else -> (if (context is AppCompatActivity) context.snake(msg = "列表数据已是最新")) else -> (if (context is AppCompatActivity) context.snake(msg = "列表数据已是最新"))
@@ -250,6 +254,7 @@ object IconRuleManagerTool {
context.snakeOrNotify(title = "同步错误", msg = "目标地址不是有效的 JSON 数据") context.snakeOrNotify(title = "同步错误", msg = "目标地址不是有效的 JSON 数据")
params.isCompareDifferent(content) -> { params.isCompareDifferent(content) -> {
params.save(content) params.save(content)
pushNotify(context, title = "同步完成", msg = "已更新通知图标优化名单,点击查看")
it() it()
} }
else -> (if (context is AppCompatActivity) context.snake(msg = "列表数据已是最新")) else -> (if (context is AppCompatActivity) context.snake(msg = "列表数据已是最新"))
@@ -355,11 +360,12 @@ object IconRuleManagerTool {
/** /**
* 推送通知 * 推送通知
* @param context 实例 * @param context 实例 - 类型为 [AppCompatActivity] 时将不会推送通知
* @param title 通知标题 * @param title 通知标题
* @param msg 通知消息 * @param msg 通知消息
*/ */
private fun pushNotify(context: Context, title: String, msg: String) { private fun pushNotify(context: Context, title: String, msg: String) {
if (context !is AppCompatActivity)
context.getSystemService<NotificationManager>()?.apply { context.getSystemService<NotificationManager>()?.apply {
areNotificationsEnabled() areNotificationsEnabled()
createNotificationChannel( createNotificationChannel(
@@ -371,14 +377,15 @@ object IconRuleManagerTool {
notify(0, NotificationCompat.Builder(context, "notifyRuleUpdateId").apply { notify(0, NotificationCompat.Builder(context, "notifyRuleUpdateId").apply {
setContentTitle(title) setContentTitle(title)
setContentText(msg) setContentText(msg)
color = 0xFF858585.toInt() color = OS_COLOR.toInt()
setAutoCancel(true)
setSmallIcon(R.drawable.ic_nf_icon_update) setSmallIcon(R.drawable.ic_nf_icon_update)
setSound(null) setSound(null)
setDefaults(NotificationCompat.DEFAULT_ALL) setDefaults(NotificationCompat.DEFAULT_ALL)
setContentIntent( setContentIntent(
PendingIntent.getActivity( PendingIntent.getActivity(
context, 0, context, 1,
Intent(context, ConfigureActivity::class.java), Intent(context, ConfigureActivity::class.java).apply { putExtra("isShowUpdDialog", false) },
if (Build.VERSION.SDK_INT < 31) PendingIntent.FLAG_UPDATE_CURRENT else PendingIntent.FLAG_IMMUTABLE if (Build.VERSION.SDK_INT < 31) PendingIntent.FLAG_UPDATE_CURRENT else PendingIntent.FLAG_IMMUTABLE
) )
) )