From 66a4a5c3aa78869a3c51e79f2a6a610c99016c24 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 16 四月 2025 08:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/activity/SettingActivity.kt | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/activity/SettingActivity.kt b/app/src/main/java/com/example/firstapp/activity/SettingActivity.kt
index 371c4d8..f20a9c1 100644
--- a/app/src/main/java/com/example/firstapp/activity/SettingActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/SettingActivity.kt
@@ -10,6 +10,7 @@
import android.widget.Button
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
+
import com.example.firstapp.databinding.ActivitySettingBinding
import com.example.firstapp.R
import com.example.firstapp.core.Core
@@ -66,12 +67,24 @@
// 退出登录
logout()
-
// 账号注销
accountClose()
+ // 关于我们
+ aboutCompany()
+ }
+
+ private fun aboutCompany(){
+
+ binding.aboutCompany.setOnClickListener {
+
+ // 跳转到关于我们的
+ val intent = Intent(this, AboutCompanyActivity::class.java)
+ startActivity(intent)
+
+ }
}
private fun accountClose(){
@@ -103,7 +116,7 @@
Core.code.deleteAll()
Core.msg.deleteAll()
Core.keyword.deleteAll()
- Core.reminder.deleteAll()
+// Core.reminder.deleteAll()
dialog.dismiss()
// 跳转到 LoginActivity 并清除之前的任务栈
--
Gitblit v1.9.3