opt:锚点模式添加id name

Block-Network · Jan 8, 2025 · 26a6ac3 · 26a6ac3
1 parent d5bdfc4
commit 26a6ac3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/kotlin/statusbar/lyric/data/Data.kt b/app/src/main/kotlin/statusbar/lyric/data/Data.kt
@@ -11,6 +11,7 @@ class Data private constructor(parcel: Parcel) : Parcelable {
     var isRepeat: Boolean = false
     var index: Int = 0
     var textSize: Float = 0f
+    var idname: String = ""
     override fun describeContents(): Int {
         return 0
     }
@@ -23,7 +24,8 @@ class Data private constructor(parcel: Parcel) : Parcelable {
         parentViewId: Int,
         isRepeat: Boolean,
         index: Int,
-        size: Float
+        size: Float,
+        idname:String
     ) : this() {
         this.textViewClassName = textViewClassName
         this.textViewId = textViewId
@@ -32,6 +34,7 @@ class Data private constructor(parcel: Parcel) : Parcelable {
         this.isRepeat = isRepeat
         this.index = index
         this.textSize = size
+        this.idname = idname
     }
 
     override fun writeToParcel(dest: Parcel, flags: Int) {
@@ -43,6 +46,7 @@ class Data private constructor(parcel: Parcel) : Parcelable {
             writeInt(if (isRepeat) 1 else 0)
             writeInt(index)
             writeFloat(textSize)
+            writeString(idname)
         }
     }
 
@@ -54,6 +58,7 @@ class Data private constructor(parcel: Parcel) : Parcelable {
         isRepeat = parcel.readInt() == 1
         index = parcel.readInt()
         textSize = parcel.readFloat()
+        idname = parcel.readString().toString()
     }
 
     companion object CREATOR : Parcelable.Creator<Data> {
@@ -67,6 +72,6 @@ class Data private constructor(parcel: Parcel) : Parcelable {
     }
 
     override fun toString(): String {
-        return "Data(textViewClassName='$textViewClassName', textViewId=$textViewId, parentViewClassName='$parentViewClassName', parentViewId=$parentViewId, isRepeat=$isRepeat, index=$index, textSize=$textSize)"
+        return "Data(textViewClassName='$textViewClassName', textViewId=$textViewId, parentViewClassName='$parentViewClassName', parentViewId=$parentViewId, isRepeat=$isRepeat, index=$index, textSize=$textSize idname=$idname)"
     }
 }
diff --git a/app/src/main/kotlin/statusbar/lyric/hook/module/SystemUITest.kt b/app/src/main/kotlin/statusbar/lyric/hook/module/SystemUITest.kt
@@ -101,15 +101,15 @@ class SystemUITest : BaseHook() {
                             view.filterView {
                                 val parentView = (view.parent as LinearLayout)
                                 val data = if (dataHashMap.size == 0) {
-                                    Data(className, view.id, parentView::class.java.name, parentView.id, false, 0, view.textSize)
+                                    Data(className, view.id, parentView::class.java.name, parentView.id, false, 0, view.textSize,context.resources.getResourceEntryName(view.id))
                                 } else {
                                     var index = 0
                                     dataHashMap.values.forEach { data ->
-                                        if (data.textViewClassName == className && data.textViewId == view.id && data.parentViewClassName == parentView::class.java.name && data.parentViewId == parentView.id && data.textSize == view.textSize) {
+                                        if (data.textViewClassName == className && data.textViewId == view.id && data.parentViewClassName == parentView::class.java.name && data.parentViewId == parentView.id && data.textSize == view.textSize && data.idname == context.resources.getResourceEntryName(view.id) ) {
                                             index += 1
                                         }
                                     }
-                                    Data(className, view.id, parentView::class.java.name, parentView.id, index != 0, index, view.textSize)
+                                    Data(className, view.id, parentView::class.java.name, parentView.id, index != 0, index, view.textSize,context.resources.getResourceEntryName(view.id))
                                 }
                                 dataHashMap[view] = data
                                 moduleRes.getString(R.string.first_filter).format(data, dataHashMap.size).log()

diff --git a/app/src/main/kotlin/statusbar/lyric/ui/page/ChoosePage.kt b/app/src/main/kotlin/statusbar/lyric/ui/page/ChoosePage.kt
@@ -119,7 +119,7 @@ fun ChoosePage(navController: NavController) {
                         ) {
                             SuperArrow(
                                 title = "${data.textViewClassName} ${data.textViewId}",
-                                summary = "${data.parentViewClassName} ${data.parentViewId} textSize:${data.textSize}",
+                                summary = "${data.parentViewClassName} ${data.parentViewId} textSize:${data.textSize} idname:${data.idname}",
                                 onClick = {
                                     context.showView(data)
                                     showDialog.value = true