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
commit dad7d224d0
1 changed files with 13 additions and 31 deletions

View File

@ -35,17 +35,16 @@ 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() 启用全面屏支持
* 绑定视图使用 ViewBinding 加载布局 * 绑定视图使用 ViewBinding 加载布局
* *
* 权限检查调用 checkPermission() 请求通知和存储权限 * 权限检查调用 checkPermission() 请求通知和存储权限
* 服务与监听注册脚本接收器设置按钮点击监听器以启动或停止监控服务 * 服务与监听注册脚本接收器设置按钮点击监听器以启动或停止监控服务
* *
* Socket 服务器初始化创建并配置本地 Socket 服务器注释部分为通信逻辑 * Socket 服务器初始化创建并配置本地 Socket 服务器注释部分为通信逻辑
*/ */
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
enableEdgeToEdge() enableEdgeToEdge()
@ -57,15 +56,12 @@ 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 的根视图设置监听
* 获取系统栏边距 insets 中提取状态栏和导航栏的边距信息 * 获取系统栏边距 insets 中提取状态栏和导航栏的边距信息
* 设置视图内边距将视图的内边距设为系统栏的边距使内容避开系统栏区域 * 设置视图内边距将视图的内边距设为系统栏的边距使内容避开系统栏区域
*/ */
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
@ -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()
} }