refactor(项目结构): 重构项目包名和类名

ven-coder · ven-coder · commit cc64a651c2fc · 2025-05-04T19:25:26.000+08:00
- 修改了多个模块的包名，如 com.ven.assists_mp 改为 com.ven.assists.mp
- 更新了多个类的名称，如 AXJavascriptInterface改为 ASJavascriptInterface
-调整了相关引用和文件路径以适应新的包名和类名
diff --git a/assists-mp/build.gradle b/assists-mp/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace 'com.ven.assists_mp'
+    namespace 'com.ven.assists.mp'
     compileSdk rootProject.ext.compileSdk
 
     defaultConfig {
diff --git a/assists-mp/src/main/AndroidManifest.xml b/assists-mp/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ven.assists_mp">
+    package="com.ven.assists.mp">
 
     <application>
         <provider
diff --git a/assists-mp/src/main/java/com/ven/assists/mp/MPFileProvider.kt b/assists-mp/src/main/java/com/ven/assists/mp/MPFileProvider.kt
@@ -1,4 +1,4 @@
-package com.ven.assists_mp
+package com.ven.assists.mp
 
 import android.app.Application
 import androidx.core.content.FileProvider
diff --git a/assists-mp/src/main/java/com/ven/assists/mp/MPManager.kt b/assists-mp/src/main/java/com/ven/assists/mp/MPManager.kt
@@ -1,9 +1,8 @@
-package com.ven.assists_mp
+package com.ven.assists.mp
 
 import android.app.Activity
 import android.app.Application
 import android.app.Service.MEDIA_PROJECTION_SERVICE
-import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.PixelFormat
@@ -198,9 +197,9 @@ object MPManager {
     suspend fun request(autoAllow: Boolean = true, timeOut: Long = 5000): Boolean {
         var projectionManager: MediaProjectionManager? = null
         AssistsService.instance?.let {
-            projectionManager = it.getSystemService(Context.MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
+            projectionManager = it.getSystemService(MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
         } ?: let {
-            projectionManager = ActivityUtils.getTopActivity()?.getSystemService(Context.MEDIA_PROJECTION_SERVICE)?.let {
+            projectionManager = ActivityUtils.getTopActivity()?.getSystemService(MEDIA_PROJECTION_SERVICE)?.let {
                 it as MediaProjectionManager
             }
         }
diff --git a/assists-mp/src/main/java/com/ven/assists/mp/MPService.kt b/assists-mp/src/main/java/com/ven/assists/mp/MPService.kt
@@ -1,12 +1,11 @@
-package com.ven.assists_mp
+package com.ven.assists.mp
 
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.Service
 import android.content.Intent
 import android.graphics.Color
-import android.media.projection.MediaProjection
 import android.os.Build
 import android.os.IBinder
 import androidx.annotation.RequiresApi
diff --git a/assists-opcv/build.gradle b/assists-opcv/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    namespace 'com.ven.assists_opcv'
+    namespace 'com.ven.assists.opcv'
     compileSdk rootProject.ext.compileSdk
 
     defaultConfig {
diff --git a/assists-opcv/src/main/AndroidManifest.xml b/assists-opcv/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ven.assists_opcv">
+    package="com.ven.assists.opcv">
 
     <application>
         <provider
diff --git a/assists-opcv/src/main/java/com/ven/assists/opcv/AssistsOpencvFileProvider.kt b/assists-opcv/src/main/java/com/ven/assists/opcv/AssistsOpencvFileProvider.kt
@@ -1,4 +1,4 @@
-package com.ven.assists_opcv
+package com.ven.assists.opcv
 
 import android.app.Application
 import androidx.core.content.FileProvider
diff --git a/assists-opcv/src/main/java/com/ven/assists/opcv/OpencvWrapper.kt b/assists-opcv/src/main/java/com/ven/assists/opcv/OpencvWrapper.kt
@@ -1,16 +1,12 @@
-﻿package com.ven.assists_opcv
+﻿package com.ven.assists.opcv
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.view.accessibility.AccessibilityNodeInfo
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.LogUtils
 import com.ven.assists.AssistsCore
-import com.ven.assists.AssistsCore.getBoundsInScreen
-import com.ven.assists.window.AssistsWindowManager
 import com.ven.assists.utils.CoroutineWrapper
-import com.ven.assists_mp.MPManager
-import kotlinx.coroutines.delay
+import com.ven.assists.mp.MPManager
 import org.opencv.android.OpenCVLoader
 import org.opencv.android.Utils
 import org.opencv.core.Core
diff --git a/assists-web/src/main/java/com/ven/assists/web/ASJavascriptInterface.kt b/assists-web/src/main/java/com/ven/assists/web/ASJavascriptInterface.kt
@@ -8,7 +8,6 @@ import android.webkit.WebView
 import com.blankj.utilcode.util.GsonUtils
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ScreenUtils
-import com.blankj.utilcode.util.TimeUtils
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.reflect.TypeToken
@@ -35,19 +34,15 @@ import com.ven.assists.AssistsCore.setNodeText
 import com.ven.assists.utils.CoroutineWrapper
 import com.ven.assists.window.AssistsWindowManager
 import com.ven.assists.window.AssistsWindowManager.overlayToast
-import com.ven.web.MPManager
-import com.ven.web.MPManager.getBitmap
-import com.ven.web.MPManager.takeScreenshot2File
-import kotlinx.coroutines.CompletableDeferred
+import com.ven.assists.mp.MPManager
+import com.ven.assists.mp.MPManager.getBitmap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import org.json.JSONArray
-import org.json.JSONObject
 import java.io.ByteArrayOutputStream
 
-class AXJavascriptInterface(val webView: WebView) {
+class ASJavascriptInterface(val webView: WebView) {
     private val coroutineScope = CoroutineScope(Dispatchers.Main)
 
     fun <T> callback(result: CallResponse<T>) {
diff --git a/assists-web/src/main/java/com/ven/assists/web/ASWebView.kt b/assists-web/src/main/java/com/ven/assists/web/ASWebView.kt
@@ -7,9 +7,8 @@ import android.webkit.WebViewClient
 import android.webkit.WebChromeClient
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import org.json.JSONObject
 
-class AXWebView @JvmOverloads constructor(
+class ASWebView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
@@ -59,6 +58,6 @@ class AXWebView @JvmOverloads constructor(
         isFocusableInTouchMode = true
         isFocusable = true
 
-        addJavascriptInterface(AXJavascriptInterface(this), "assistsx")
+        addJavascriptInterface(ASJavascriptInterface(this), "assistsx")
     }
 }
diff --git a/simple/src/main/java/com/ven/assists/simple/overlays/OverlayPro.kt b/simple/src/main/java/com/ven/assists/simple/overlays/OverlayPro.kt
@@ -1,16 +1,12 @@
 package com.ven.assists.simple.overlays
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.Intent
 import android.graphics.Color
-import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.accessibility.AccessibilityEvent
-import androidx.core.os.bundleOf
-import com.blankj.utilcode.util.AppUtils
 import com.blankj.utilcode.util.BarUtils
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ScreenUtils
@@ -27,8 +23,8 @@ import com.ven.assists.simple.common.LogWrapper
 import com.ven.assists.simple.common.LogWrapper.logAppend
 import com.ven.assists.simple.databinding.ProOverlayBinding
 import com.ven.assists.utils.CoroutineWrapper
-import com.ven.assists_mp.MPManager
-import com.ven.assists_mp.MPManager.takeScreenshot2File
+import com.ven.assists.mp.MPManager
+import com.ven.assists.mp.MPManager.takeScreenshot2File
 import kotlinx.coroutines.delay
 
 @SuppressLint("StaticFieldLeak")
@@ -90,7 +86,7 @@ object OverlayPro : AssistsServiceListener {
                     btnTakeScreenshot.setOnClickListener {
                         CoroutineWrapper.launch {
                             runCatching {
-                                val file = MPManager.takeScreenshot2File()
+                                val file = takeScreenshot2File()
                                 AssistsCore.launchApp(Intent(AssistsService.instance, ScreenshotReviewActivity::class.java).apply {
                                     putExtra("path", file?.path)
                                 })
diff --git a/simple/src/main/java/com/ven/assists/simple/step/AntForestEnergy.kt b/simple/src/main/java/com/ven/assists/simple/step/AntForestEnergy.kt
@@ -18,8 +18,8 @@ import com.ven.assists.stepper.StepCollector
 import com.ven.assists.stepper.StepImpl
 import com.ven.assists.stepper.StepManager
 import com.ven.assists.utils.CoroutineWrapper
-import com.ven.assists_mp.MPManager
-import com.ven.assists_opcv.OpencvWrapper
+import com.ven.assists.mp.MPManager
+import com.ven.assists.opcv.OpencvWrapper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
`8`		`- namespace 'com.ven.assists_mp'`
	`8`	`+ namespace 'com.ven.assists.mp'`
`9`	`9`	`compileSdk rootProject.ext.compileSdk`
`10`	`10`
`11`	`11`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.ven.assists_mp`
	`1`	`+package com.ven.assists.mp`
`2`	`2`
`3`	`3`	`import android.app.Application`
`4`	`4`	`import androidx.core.content.FileProvider`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
`8`		`- namespace 'com.ven.assists_opcv'`
	`8`	`+ namespace 'com.ven.assists.opcv'`
`9`	`9`	`compileSdk rootProject.ext.compileSdk`
`10`	`10`
`11`	`11`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.ven.assists_opcv`
	`1`	`+package com.ven.assists.opcv`
`2`	`2`
`3`	`3`	`import android.app.Application`
`4`	`4`	`import androidx.core.content.FileProvider`