diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a4de281..36be8d3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,11 +26,6 @@
android:supportsRtl="true"
android:theme="@style/Theme.WordUnlock"
tools:targetApi="31">
-
+ dialog.dismiss()
+ openAccessibilitySettings()
+ }
+ .setCancelable(false) // 避免用户点击外部关闭而不做处理
+ .show()
+ }
bottomNavView.setupWithNavController(navController)
+
// 检查并请求 SYSTEM_ALERT_WINDOW 权限
if (!Settings.canDrawOverlays(this)) {
val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
@@ -97,7 +113,7 @@ class MainActivity : AppCompatActivity() {
// 检查权限是否已授予
if (Settings.canDrawOverlays(this)) {
// 权限已授予，执行相关操作
- val intent = Intent(this, WordUnlockForegroundService::class.java)
+ val intent = Intent(this, WordUnlockService::class.java)
startService(intent)
} else {
// 权限未授予，提示用户或执行其他操作
@@ -106,11 +122,6 @@ class MainActivity : AppCompatActivity() {
}
}
- fun getRawFileNames(context: Context): List {
- val rawClass = R.raw::class.java
- return rawClass.fields.map { it.name }
- }
-
//}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
// Inflate the menu; this adds items to the action bar if it is present.
@@ -130,38 +141,7 @@ class MainActivity : AppCompatActivity() {
override fun onResume() {
super.onResume()
- // 在Activity变为可见时检查辅助功能状态
- if (!isAccessibilityServiceEnabled()) {
- // 如果辅助功能未开启，在这里处理逻辑，比如弹窗提示或直接finish()
- // 注意：此处处理逻辑需谨慎，避免无限循环或用户体验不佳的情况
- // 示例代码可能需要根据实际情况调整
- AlertDialog.Builder(this)
- .setTitle("辅助功能未开启")
- .setMessage("请确保辅助功能已开启以正常使用应用。")
- .setPositiveButton("前往设置") { dialog, _ ->
- dialog.dismiss()
- openAccessibilitySettings()
- }
- .setCancelable(false) // 避免用户点击外部关闭而不做处理
- .show()
- } else {
- // 辅助功能已开启，执行其他逻辑
- //setContentView(R.layout.activity_main)
- val navController = findNavController(R.id.frame_layout_container)
- val bottomNavView = findViewById(R.id.bottom_nav_view)
- bottomNavView.setupWithNavController(navController)
- // val fileList = assets.list("raw")
- /*val raw_read_string = applicationContext.resources.openRawResource(R.raw.sixlevel).bufferedReader().use{
- it.readText()
- }*/
- /*recyclerView = this.findViewById(R.id.recycler_view)
- val layoutManager = LinearLayoutManager(this)
- recyclerView.layoutManager = layoutManager
-
- val fileNames = getRawFileNames(this)
- jsonFileListAdapter = JsonFileListAdapter(this, fileNames)
- recyclerView.adapter = jsonFileListAdapter*/
- }
+
}
}
diff --git a/app/src/main/java/com/example/wordunlock/WordUnlockService.kt b/app/src/main/java/com/example/wordunlock/WordUnlockService.kt
index 1f59b6c..996a902 100644
--- a/app/src/main/java/com/example/wordunlock/WordUnlockService.kt
+++ b/app/src/main/java/com/example/wordunlock/WordUnlockService.kt
@@ -128,9 +128,11 @@ class WordUnlockService : AccessibilityService() {
val intent = Intent(this, WordUnlockForegroundService::class.java)
val randomWordDefinition = getRandomWordDefinitionFromJson(this)
randomWordDefinition?.let {
- intent.putExtra("wordDefinition", it) // 传递单词数据
- intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
- startService(intent)
+ if(it != null) {
+ intent.putExtra("wordDefinition", it) // 传递单词数据
+ intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+ startService(intent)
+ }
}
// }
}
diff --git a/app/src/main/res/color/custom_primary_color.xml b/app/src/main/res/color/custom_primary_color.xml
index 2935908..0c5bbd4 100644
--- a/app/src/main/res/color/custom_primary_color.xml
+++ b/app/src/main/res/color/custom_primary_color.xml
@@ -1,4 +1,4 @@
- - @raw/sixlevel
- - @raw/sixlevel
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8e24bdf..46d5308 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,6 +10,9 @@
+
+
\ No newline at end of file