From bcaebbc9e38861502eb90f26228045e50fc4a475 Mon Sep 17 00:00:00 2001
From: hwf453 <hwf453@163.com>
Date: Mon, 23 Mar 2026 21:16:55 +0800
Subject: [PATCH] 2.4.6 release

---
 app/build.gradle                              |  4 +--
 .../zhdcoa/ui/activity/LoginActivity.kt       |  4 +--
 .../rehome/zhdcoa/ui/fragment/HomeFragment.kt | 27 ++++++++++++-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6b0276d..18dd0d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.rehome.zhdcoa"
         minSdk 24
         targetSdk 36
-        versionCode 29
-        versionName "2.4.5"
+        versionCode 30
+        versionName "2.4.6"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
index e07c2b0..883c6b2 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
@@ -241,8 +241,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 
         if (isApkInDebug(context)) {
             //        管理员
-            binding.etUsername.setText("ZHPS_Admin")
-            binding.etPassword.setText("Rehome.zhps@996")
+//            binding.etUsername.setText("ZHPS_Admin")
+//            binding.etPassword.setText("Rehome.zhps@996")
 
 //            binding.etUsername.setText("310187")
 //            binding.etPassword.setText("4321@cwxING")
diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt
index b44d7d7..0d4cfcc 100644
--- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt
@@ -198,7 +198,7 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
     private fun initLists() {
         val titles = arrayOf(
 //            "来访管理",
-//            "会议管理",
+            "会议录音",
             "用餐管理",
             "车辆管理",
 //            "办公领用",
@@ -214,7 +214,7 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
         )
         val imgIds = intArrayOf(
 //            R.drawable.icon_visit,
-//            R.drawable.icon_meet,
+            R.drawable.icon_meet,
             R.drawable.icon_dinner,
             R.drawable.icon_vehicle,
 //            R.drawable.icon_office,
@@ -258,12 +258,19 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
         binding.gv.setAdapter(adapter)
         binding.gv.onItemClickListener =
             AdapterView.OnItemClickListener { parent: AdapterView<*>?, view: View?, position: Int, id: Long ->
-                if (position == 1) {
+                if (position == 0) {
+                    if (resultList.contains("ApplyVehicle")) {
+                        val intent = Intent(getContext(), ConferenceAudioActivity::class.java)
+                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                        startActivity(intent)
+                    }
+                }else if (position == 2) {
                     if (resultList.contains("ApplyVehicle")) {
                         val intent = Intent(getContext(), ApplyVehicleActivity::class.java)
+                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
                         startActivity(intent)
                     }
-                }else if (position == 7) {
+                }else if (position == 8) {
                     val intent = Intent(getContext(), WeatherActivity::class.java)
                     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
                     startActivity(intent)
@@ -285,15 +292,15 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>() {
 //                    }
                     when (position) {
 //                        0 -> TAG = GridViewDialog.TAG_MEET
-                        0 -> TAG = GridViewDialog.TAG_DINNER
+                        1 -> TAG = GridViewDialog.TAG_DINNER
 //                        3 -> TAG = GridViewDialog.TAG_OFFICE
 //                        4 -> TAG = GridViewDialog.TAG_TASK
 //                        5 -> TAG = GridViewDialog.TAG_SCHEDULE
-                        2 -> TAG = GridViewDialog.TAG_CHECK
-                        3 -> TAG = GridViewDialog.TAG_PEIXUN
-                        4 -> TAG = GridViewDialog.TAG_PDANGJIAN
-                        5 -> TAG = GridViewDialog.TAG_JD
-                        6 -> TAG = GridViewDialog.TAG_AF
+                        3 -> TAG = GridViewDialog.TAG_CHECK
+                        4 -> TAG = GridViewDialog.TAG_PEIXUN
+                        5 -> TAG = GridViewDialog.TAG_PDANGJIAN
+                        6 -> TAG = GridViewDialog.TAG_JD
+                        7 -> TAG = GridViewDialog.TAG_AF
                     }
                     val dialog = GridViewDialog(context, TAG)
                     dialog.show()