diff --git a/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/activity/Apps.kt b/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/activity/Apps.kt index 521aba6..80acb6f 100644 --- a/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/activity/Apps.kt +++ b/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/activity/Apps.kt @@ -8,7 +8,6 @@ import android.graphics.Paint import android.graphics.drawable.Drawable import android.icu.text.Collator import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -155,7 +154,6 @@ class Apps : AppCompatActivity() { !app.applicationInfo.enabled, get(AppSP.is_enabled), hooks.size, - hooks.fold(0) { sum, hash -> sum + getInt("hook_times_$hash", 0) }, ) } appList.add(appItem) @@ -165,7 +163,6 @@ class Apps : AppCompatActivity() { adapter.init( appList.sortedWith( compareByDescending{it.isEnabled} - .thenByDescending{it.hookTimes} .thenByDescending{it.ruleNumbers} .thenBy{it.isSystemApp} .thenBy(Collator.getInstance()){it.name} @@ -214,7 +211,6 @@ class Apps : AppCompatActivity() { oldItem.versionName == newItem.versionName && oldItem.versionCode == newItem.versionCode && oldItem.ruleNumbers == newItem.ruleNumbers && - oldItem.hookTimes == newItem.hookTimes && oldItem.isSystemApp == newItem.isSystemApp && oldItem.isNoNetwork == newItem.isNoNetwork } @@ -243,7 +239,6 @@ class Apps : AppCompatActivity() { filteredData.add(p, raw) if (partialRefresh) { notifyItemInserted(p) - Log.i("WankkoRee", "notifyItemInserted(${p})") } p++ } @@ -252,7 +247,6 @@ class Apps : AppCompatActivity() { filteredData.removeAt(p) if (partialRefresh) { notifyItemRemoved(p) - Log.i("WankkoRee", "notifyItemRemoved(${p})") } } else { p++ @@ -275,7 +269,7 @@ class Apps : AppCompatActivity() { holder.nameView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv() holder.versionView.text = context!!.getString(R.string.version_format).format(filteredData[position].versionName, filteredData[position].versionCode) holder.packageView.text = filteredData[position].pkg - holder.stateView.text = context!!.getString(R.string.applistitem_num).format(context!!.getString(if (filteredData[position].isEnabled) R.string.enabled else R.string.disabled), filteredData[position].ruleNumbers, filteredData[position].hookTimes) + holder.stateView.text = context!!.getString(R.string.applistitem_num).format(context!!.getString(if (filteredData[position].isEnabled) R.string.enabled else R.string.disabled), filteredData[position].ruleNumbers) holder.isSystemAppView.color = context!!.getColor(if (!filteredData[position].isSystemApp) R.color.backgroundSuccess else R.color.backgroundError) holder.isSystemAppView.text = context!!.getString(if (!filteredData[position].isSystemApp) R.string.user_application else R.string.system_application) holder.isNoNetworkView.color = context!!.getColor(if (!filteredData[position].isNoNetwork) R.color.backgroundSuccess else R.color.backgroundError) @@ -302,7 +296,6 @@ class Apps : AppCompatActivity() { val hooks = getSet(AppSP.hooks) filteredData[p].isEnabled = get(AppSP.is_enabled) filteredData[p].ruleNumbers = hooks.size - filteredData[p].hookTimes = hooks.fold(0) { sum, hash -> sum + getInt("hook_times_$hash", 0) } } notifyItemChanged(p) } @@ -318,7 +311,6 @@ class Apps : AppCompatActivity() { val isFreezed: Boolean, var isEnabled: Boolean, var ruleNumbers: Int, - var hookTimes: Int, ) inner class ViewHolder(view: View): RecyclerView.ViewHolder(view) { diff --git a/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/data/AppSP.kt b/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/data/AppSP.kt index f487e94..67f69a2 100644 --- a/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/data/AppSP.kt +++ b/app/src/main/java/cn/wankkoree/xposed/enablewebviewdebugging/data/AppSP.kt @@ -4,9 +4,8 @@ import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData object AppSP { val is_enabled = PrefsData("is_enabled", false) - val hooks = PrefsData("hooks", hashSetOf()) // 哈希去重的 Hook 点集合,以|分隔,并且有多个对应的"hook_entry_$name"、"hook_times_$name"子变量 + val hooks = PrefsData("hooks", hashSetOf()) // 哈希去重的 Hook 点集合,以|分隔,并且有多个对应的"hook_entry_$name"子变量 //val "hook_entry_$name" = PrefsData("hook_entry_$name", ListOf()) // 有序的 Hook 参数列表 - //val "hook_times_$name" = PrefsData("hook_times_$name", 0) // Hook 成功次数 val vConsole = PrefsData("vConsole", false) val vConsole_version = PrefsData("vConsole_version", "") val nebulaUCSDK = PrefsData("nebulaUCSDK", false) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6737d3d..98a3480 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -12,7 +12,7 @@ 下载 vConsole 本地版本: %s 下载 UC 调试内核 - %1$s,配置了 %2$d 条规则,生效了 %3$d 次 + %1$s,配置了 %2$d 条规则 显示系统应用 显示无网络权限 YukiHookAPI 版本: %s(%d) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0532f4c..ece851b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ Download vConsole Local Version: %s Download NebulaUCSDK - %1$s, %2$d rules, hooked %3$d times + %1$s, %2$d rules Show System Applications Show No Network Permission YukiHookAPI Version: %s(%d)