Skip to content

Commit 13fab53

Browse files
committed
feat:完善api、文档
1 parent 3d22a2e commit 13fab53

File tree

8 files changed

+23
-45
lines changed

8 files changed

+23
-45
lines changed

assists/src/main/java/com/ven/assists/AssistsService.kt renamed to assists/src/main/java/com/ven/assists/service/AssistsService.kt

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,50 +9,49 @@ import android.view.MotionEvent
99
import android.view.accessibility.AccessibilityEvent
1010
import com.blankj.utilcode.util.ActivityUtils
1111
import com.blankj.utilcode.util.LogUtils
12+
import com.ven.assists.utils.CoroutineWrapper
13+
import kotlinx.coroutines.flow.MutableSharedFlow
1214

1315
class AssistsService : AccessibilityService() {
16+
companion object {
17+
18+
val event = MutableSharedFlow<Int>()
19+
20+
/**
21+
* 无障碍服务,未开启前为null,使用注意判空
22+
*/
23+
var instance: AssistsService? = null
24+
private set
25+
}
26+
27+
1428

1529
override fun onCreate() {
1630
super.onCreate()
17-
Assists.service = this
31+
instance = this
1832
}
1933

2034
override fun onServiceConnected() {
2135
super.onServiceConnected()
22-
LogUtils.d(Assists.LOG_TAG, "assists service on service connected")
23-
Assists.service = this
36+
instance = this
2437
AssistsWindowManager.init(this)
2538
Assists.serviceListeners.forEach { it.onServiceConnected(this) }
39+
CoroutineWrapper.launch { event.emit(1) }
40+
LogUtils.d(Assists.LOG_TAG, "assists service on service connected")
2641
}
2742

2843
override fun onAccessibilityEvent(event: AccessibilityEvent) {
29-
Assists.service = this
44+
instance = this
3045
Assists.serviceListeners.forEach { it.onAccessibilityEvent(event) }
3146
}
3247

3348
override fun onUnbind(intent: Intent?): Boolean {
34-
Assists.service = null
49+
instance = null
3550
Assists.serviceListeners.forEach { it.onUnbind() }
3651
return super.onUnbind(intent)
3752
}
3853

3954
override fun onInterrupt() {
4055
Assists.serviceListeners.forEach { it.onInterrupt() }
4156
}
42-
43-
override fun onKeyEvent(event: KeyEvent?): Boolean {
44-
LogUtils.d(event?.action)
45-
return super.onKeyEvent(event)
46-
}
47-
48-
override fun onMotionEvent(event: MotionEvent) {
49-
LogUtils.d(event.x, event.y)
50-
super.onMotionEvent(event)
51-
}
52-
53-
override fun onGesture(gestureEvent: AccessibilityGestureEvent): Boolean {
54-
LogUtils.d(gestureEvent.toString())
55-
return super.onGesture(gestureEvent)
56-
}
57-
5857
}

assists/src/main/java/com/ven/assists/AssistsServiceListener.kt renamed to assists/src/main/java/com/ven/assists/service/AssistsServiceListener.kt

File renamed without changes.

assists/src/main/java/com/ven/assists/AssistsFileProvider.kt renamed to assists/src/main/java/com/ven/assists/utils/AssistsFileProvider.kt

File renamed without changes.

assists/src/main/java/com/ven/assists/utils/Extension.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

assists/src/main/java/com/ven/assists/NodeClassValue.kt renamed to assists/src/main/java/com/ven/assists/utils/NodeClassValue.kt

File renamed without changes.

assists/src/main/java/com/ven/assists/AssistsWindowManager.kt renamed to assists/src/main/java/com/ven/assists/window/AssistsWindowManager.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ import androidx.core.view.isVisible
1515
import androidx.core.view.setPadding
1616
import com.blankj.utilcode.util.LogUtils
1717
import com.blankj.utilcode.util.SizeUtils
18+
import com.ven.assists.service.AssistsService
1819
import com.ven.assists.utils.CoroutineWrapper
1920
import com.ven.assists.utils.runIO
2021
import com.ven.assists.utils.runMain
21-
import kotlinx.coroutines.CoroutineScope
2222
import kotlinx.coroutines.Dispatchers
23-
import kotlinx.coroutines.Job
2423
import kotlinx.coroutines.delay
2524
import kotlinx.coroutines.withContext
2625
import java.util.Collections
@@ -37,7 +36,7 @@ object AssistsWindowManager {
3736
}
3837

3938
fun getWindowManager(): WindowManager? {
40-
Assists.service?.getSystemService(Context.WINDOW_SERVICE)?.let { return (it as WindowManager) }
39+
AssistsService.instance?.getSystemService(Context.WINDOW_SERVICE)?.let { return (it as WindowManager) }
4140
return null
4241
}
4342

@@ -212,7 +211,7 @@ object AssistsWindowManager {
212211
}
213212

214213
fun String.overlayToast(delay: Long = 2000) {
215-
Assists.service?.let {
214+
AssistsService.instance?.let {
216215
CoroutineWrapper.launch(isMain = true) {
217216
val textView = TextView(it).apply {
218217
text = this@overlayToast

assists/src/main/java/com/ven/assists/AssistsWindowWrapper.kt renamed to assists/src/main/java/com/ven/assists/window/AssistsWindowWrapper.kt

File renamed without changes.

simple/src/main/java/com/ven/assists/simple/common/ToastExp.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)