tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构 使用AndroidX代替android.support库

Browse Source
This commit is contained in:
hyb1996
2018-11-30 13:17:36 +08:00
parent c3c73ab94a
commit 9d30996ae8
297 changed files with 749 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
automator/build.gradle
View File

@@ -12,7 +12,7 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
@@ -35,10 +35,10 @@ repositories {
}
dependencies {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testImplementation 'junit:junit:4.12'
api 'com.android.support:appcompat-v7:28.0.0'
api 'androidx.appcompat:appcompat:1.0.2'
api project(path: ':common')
}

2
automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt
View File

@@ -6,7 +6,7 @@ import android.graphics.Path
import android.os.Build
import android.os.Handler
import android.os.Looper
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
import android.view.ViewConfiguration
import com.stardust.concurrent.VolatileBox

20
automator/src/main/java/com/stardust/automator/UiObject.kt
View File

@@ -1,27 +1,25 @@
package com.stardust.automator
import android.graphics.Rect
import android.os.Build
import android.os.Bundle
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import android.util.Log
import android.view.accessibility.AccessibilityNodeInfo
import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator
import com.stardust.view.accessibility.AccessibilityNodeInfoHelper
import com.stardust.view.accessibility.AccessibilityService
import java.util.ArrayList
import java.util.Arrays
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN
/**
* Created by Stardust on 2017/3/9.

62
automator/src/main/java/com/stardust/automator/UiObjectCollection.kt
View File

@@ -7,37 +7,37 @@ import com.stardust.util.Consumer
import java.util.ArrayList
import java.util.Collections
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN
/**
* Created by Stardust on 2017/3/9.

2
automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt
View File

@@ -1,7 +1,7 @@
package com.stardust.automator.filter
import android.os.Build
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
import com.stardust.automator.UiObject

2
automator/src/main/java/com/stardust/automator/filter/DfsFilter.kt
View File

@@ -8,7 +8,7 @@ import java.util.ArrayList
* Created by Stardust on 2017/3/9.
*/
abstract class DfsFilter : ListFilter, Filter {
abstract class DfsFilter : ListFilter(), Filter {
override fun filter(nodes: List<UiObject>): List<UiObject> {
val list = ArrayList<UiObject>()

11
automator/src/main/java/com/stardust/automator/filter/ListFilter.kt
View File

@@ -8,16 +8,21 @@ import java.util.ArrayList
* Created by Stardust on 2017/3/9.
*/
interface ListFilter {
abstract class ListFilter {
fun filter(nodes: List<UiObject>): List<UiObject>
var maxCount: Int = Integer.MAX_VALUE
abstract class Default : Filter, ListFilter {
abstract fun filter(nodes: List<UiObject>): List<UiObject>
abstract class Default : Filter, ListFilter() {
override fun filter(nodes: List<UiObject>): List<UiObject> {
val list = ArrayList<UiObject>()
for (node in nodes) {
list.addAll(filter(node))
if (list.size > maxCount) {
break
}
}
return list
}

1
automator/src/main/java/com/stardust/automator/filter/TextFilter.kt
View File

@@ -8,7 +8,6 @@ import com.stardust.automator.UiObject
class TextFilter private constructor(private val mText: String) : ListFilter.Default() {
override fun filter(node: UiObject): List<UiObject> {
return node.findByText(mText)
}

2
automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt
View File

@@ -3,7 +3,7 @@ package com.stardust.automator.simple_action
import android.graphics.Rect
import android.os.Build
import android.os.Bundle
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
import android.view.accessibility.AccessibilityNodeInfo
import com.stardust.automator.UiObject

2
automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt
View File

@@ -2,7 +2,7 @@ package com.stardust.automator.simple_action
import android.graphics.Rect
import android.os.Build
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
/**
* Created by Stardust on 2017/1/27.

2
automator/src/main/java/com/stardust/notification/Notification.kt
View File

@@ -3,7 +3,7 @@ package com.stardust.notification
import android.app.PendingIntent
import android.os.Build
import android.os.Parcel
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
/**
* Created by Stardust on 2017/10/30.

2
automator/src/main/java/com/stardust/notification/NotificationListenerService.kt
View File

@@ -4,7 +4,7 @@ import android.app.Notification
import android.os.Build
import android.os.Parcel
import android.service.notification.StatusBarNotification
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
import com.stardust.view.accessibility.NotificationListener
import java.util.concurrent.CopyOnWriteArrayList

4
automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt
View File

@@ -1,8 +1,8 @@
package com.stardust.view.accessibility
import android.os.Build
import android.support.annotation.RequiresApi
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat
import androidx.annotation.RequiresApi
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import android.util.Log
import android.view.accessibility.AccessibilityNodeInfo

2
automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt
View File

@@ -1,7 +1,7 @@
package com.stardust.view.accessibility
import android.graphics.Rect
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import android.view.accessibility.AccessibilityNodeInfo
import com.stardust.automator.UiObject

4
automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt
View File

@@ -2,7 +2,7 @@ package com.stardust.view.accessibility
import android.content.Context
import android.os.Build
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
import android.util.Log
import android.view.accessibility.AccessibilityNodeInfo
@@ -82,6 +82,6 @@ class LayoutInspector(private val mContext: Context) {
companion object {
private val LOG_TAG = LayoutInspector::class.java!!.getSimpleName()
private val LOG_TAG = LayoutInspector::class.java.simpleName
}
}

2
automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt
View File

@@ -4,7 +4,7 @@ import android.content.Context
import android.content.pm.PackageManager
import android.content.res.Resources
import android.graphics.Rect
import android.support.annotation.Keep
import androidx.annotation.Keep
import android.view.accessibility.AccessibilityNodeInfo
import com.stardust.automator.UiObject