From 57d1ff885c981283758d355856012b16b4c7bc5e Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期三, 26 三月 2025 18:00:38 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/MainActivity.kt | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/MainActivity.kt b/app/src/main/java/com/example/firstapp/MainActivity.kt
index baea6f5..7d01490 100644
--- a/app/src/main/java/com/example/firstapp/MainActivity.kt
+++ b/app/src/main/java/com/example/firstapp/MainActivity.kt
@@ -91,14 +91,7 @@
val navView = binding.navView
val navController = findNavController(R.id.nav_host_fragment_activity_main)
- // Passing each menu ID as a set of Ids because each
- // menu should be considered as top level destinations.
- val appBarConfiguration = AppBarConfiguration(
- setOf(
- R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications
- )
- )
- setupActionBarWithNavController(navController, appBarConfiguration)
+ // 只保留底部导航的设置
navView.setupWithNavController(navController)
// 检查权限
@@ -144,10 +137,7 @@
// }, filter)
}
- override fun onSupportNavigateUp(): Boolean {
- val navController = findNavController(R.id.nav_host_fragment_activity_main)
- return navController.navigateUp() || super.onSupportNavigateUp()
- }
+
private fun registerSmsReceiver() {
// 应用启动时执行 registerSmsReceiver()
// 创建 SmsReceiver 实例
--
Gitblit v1.9.3