ls
/
grape
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/java/com/android/grape/MainActivity.kt
This commit is contained in:
yjj38 2025-07-15 19:03:50 +08:00
parent 4a6348642d ee9f79051b
commit dad7d224d0
1 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/android/grape/MainActivity.kt
View File

@ -35,7 +35,6 @@ class MainActivity : AppCompatActivity() {
*/ */
private lateinit var viewBinding: ActivityMainBinding private lateinit var viewBinding: ActivityMainBinding
private lateinit var permissionHandler: NotificationPermissionHandler private lateinit var permissionHandler: NotificationPermissionHandler
private lateinit var socketServer: SocketServer
/** /**
* 基础设置：调用 super.onCreate() 和 enableEdgeToEdge() 启用全面屏支持。 * 基础设置：调用 super.onCreate() 和 enableEdgeToEdge() 启用全面屏支持。
@ -57,9 +56,6 @@ class MainActivity : AppCompatActivity() {
*/ */
viewBinding = ActivityMainBinding.inflate(layoutInflater) viewBinding = ActivityMainBinding.inflate(layoutInflater)
setContentView(viewBinding.root) setContentView(viewBinding.root)
socketServer = SocketServer(8888)
/** /**
* 这段代码用于适配系统窗口（如状态栏、导航栏）的内边距，确保内容不被遮挡： * 这段代码用于适配系统窗口（如状态栏、导航栏）的内边距，确保内容不被遮挡：
* 设置窗口边距监听器：通过 ViewCompat.setOnApplyWindowInsetsListener 为 ID 为 main 的根视图设置监听。 * 设置窗口边距监听器：通过 ViewCompat.setOnApplyWindowInsetsListener 为 ID 为 main 的根视图设置监听。
@ -78,19 +74,6 @@ class MainActivity : AppCompatActivity() {
} }
viewBinding.stop.setOnClickListener { viewBinding.stop.setOnClickListener {
killRecordProcess(this, packageName) killRecordProcess(this, packageName)
// val deviceInfo = DeviceDataAccessor.getDeviceInfo(this, DeviceInfoHelper.getDeviceId())
// FileUtils.writeDevice("com.headway.books", deviceInfo?:"")
// socketServer.start { client, message ->
// Log.d("Server", "收到消息: $message")
//
// // 处理消息并回复
// val response = "服务器已收到: $message"
// runOnUiThread {
// findViewById<TextView>(R.id.text).append("$message\n")
// }
// socketServer.sendToClient(client, deviceInfo?:"没有设备信息")
// }
// FileUtils.runPlugin("com.headway.books")
} }
} }
@ -102,7 +85,6 @@ class MainActivity : AppCompatActivity() {
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
// socketServer.stop()
ClashUtil.unregisterReceiver(this) ClashUtil.unregisterReceiver(this)
ScriptUtil.unregisterScriptResultReceiver() ScriptUtil.unregisterScriptResultReceiver()
} }