From 4c53c43f7b41af087d715685988449c20f97445e Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Sat, 16 May 2026 17:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AE=B6=E5=BA=AD=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 .../adapter/DeviceAdapter.kt                  |   6 +-
 .../adapter/FamilyAdapter.kt                  |   9 +-
 .../adapter/FamilySwitchAdapter.kt            |   8 +-
 .../defenseapplication/bean/DeviceBean.kt     |  27 +++-
 .../defenseapplication/bean/MessageBean.kt    |  18 +++
 .../home/HomeMenuFragment.kt                  |  91 +++++++++--
 .../home/MessageActivity.kt                   | 143 ++++++++++--------
 .../home/PersonalFragment.kt                  |  64 +++++++-
 .../defenseapplication/utils/ApiService.kt    |   7 +
 .../utils/FamilySwitchEvent.kt                |  23 +++
 .../utils/MessageStatusManager.kt             |  44 ++++++
 .../view/FamilySwitchDialog.kt                |  87 +++++++++--
 app/src/main/res/drawable/bg_family_popup.xml |   9 ++
 .../main/res/drawable/bg_family_selected.xml  |   6 +
 app/src/main/res/drawable/ic_check_white.xml  |   9 ++
 app/src/main/res/drawable/no_message.png      | Bin 0 -> 13189 bytes
 .../main/res/layout/home_menu_fragment.xml    |  15 +-
 app/src/main/res/layout/item_device.xml       |  15 +-
 app/src/main/res/layout/message_activity.xml  |  44 ++++--
 app/src/main/res/layout/register_activity.xml |   4 +-
 app/src/main/res/values-zh/strings.xml        |   2 +
 app/src/main/res/values/strings.xml           |   1 +
 23 files changed, 515 insertions(+), 121 deletions(-)
 create mode 100644 app/src/main/java/com/example/defenseapplication/bean/MessageBean.kt
 create mode 100644 app/src/main/java/com/example/defenseapplication/utils/FamilySwitchEvent.kt
 create mode 100644 app/src/main/java/com/example/defenseapplication/utils/MessageStatusManager.kt
 create mode 100644 app/src/main/res/drawable/bg_family_popup.xml
 create mode 100644 app/src/main/res/drawable/bg_family_selected.xml
 create mode 100644 app/src/main/res/drawable/ic_check_white.xml
 create mode 100644 app/src/main/res/drawable/no_message.png

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 4235cce..9bdc442 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-05-14T00:25:02.182359600Z">
+        <DropdownSelection timestamp="2026-05-16T03:07:32.812890200Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=AMRF025926116461" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=80bece4" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/example/defenseapplication/adapter/DeviceAdapter.kt b/app/src/main/java/com/example/defenseapplication/adapter/DeviceAdapter.kt
index 4b54ecc..a3d7bb2 100644
--- a/app/src/main/java/com/example/defenseapplication/adapter/DeviceAdapter.kt
+++ b/app/src/main/java/com/example/defenseapplication/adapter/DeviceAdapter.kt
@@ -38,13 +38,13 @@ class DeviceAdapter(
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(item: DeviceUi) {
-            binding.tvDeviceName.text = item.name
+            binding.tvDeviceType.text = item.name
             if (item.isOnline) {
-                binding.tvDeviceName.text = "\u25CF  正在运行"
                 binding.tvDeviceName.setTextColor(binding.root.context.getColor(R.color.green))
+                binding.tvDeviceName.text = "\u25CF 正在运行"
             } else {
-                binding.tvDeviceName.text = "\u25CF  离线"
                 binding.tvDeviceName.setTextColor(binding.root.context.getColor(R.color.red))
+                binding.tvDeviceName.text = "\u25CF 离线"
             }
             binding.root.setOnClickListener {
                 onItemClick(item)
diff --git a/app/src/main/java/com/example/defenseapplication/adapter/FamilyAdapter.kt b/app/src/main/java/com/example/defenseapplication/adapter/FamilyAdapter.kt
index f7807fd..12cddc0 100644
--- a/app/src/main/java/com/example/defenseapplication/adapter/FamilyAdapter.kt
+++ b/app/src/main/java/com/example/defenseapplication/adapter/FamilyAdapter.kt
@@ -37,7 +37,12 @@ class FamilyAdapter(
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(item: FamilyBean) {
-            binding.tvFamilyName.text = item.parentName
+            val isAdmin = item.role == "appadmin"
+            if (isAdmin) {
+                binding.tvFamilyName.text = binding.root.context.getString(R.string.my_family)
+            } else {
+                binding.tvFamilyName.text = "${item.parentName}${binding.root.context.getString(R.string.family_with_normal)}"
+            }
             binding.tvFamilyRole.text = getRoleText(item.role)
 
             val isSelected = item.parentName == selectedFamily
@@ -48,7 +53,7 @@ class FamilyAdapter(
 
         private fun getRoleText(role: String): String {
             return when (role) {
-                "appadmin" ->binding.root.context.getString(R.string.admin_user)
+                "appadmin" -> binding.root.context.getString(R.string.admin_user)
                 else -> binding.root.context.getString(R.string.normal_user)
             }
         }
diff --git a/app/src/main/java/com/example/defenseapplication/adapter/FamilySwitchAdapter.kt b/app/src/main/java/com/example/defenseapplication/adapter/FamilySwitchAdapter.kt
index 1ce576a..759fda1 100644
--- a/app/src/main/java/com/example/defenseapplication/adapter/FamilySwitchAdapter.kt
+++ b/app/src/main/java/com/example/defenseapplication/adapter/FamilySwitchAdapter.kt
@@ -9,12 +9,18 @@ import com.example.defenseapplication.databinding.ItemSwitchFamilyBinding
 import com.example.defenseapplication.model.FamilyItem
 
 class FamilySwitchAdapter(
-    private val familyList: List<FamilyItem>,
+    private var familyList: List<FamilyItem>,
     private val onItemClickListener: (FamilyItem) -> Unit
 ) : RecyclerView.Adapter<FamilySwitchAdapter.FamilyViewHolder>() {
 
     private var selectedPosition = 0
 
+    fun updateList(newList: List<FamilyItem>) {
+        familyList = newList
+        selectedPosition = 0
+        notifyDataSetChanged()
+    }
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FamilyViewHolder {
         val binding = ItemSwitchFamilyBinding.inflate(
             LayoutInflater.from(parent.context),
diff --git a/app/src/main/java/com/example/defenseapplication/bean/DeviceBean.kt b/app/src/main/java/com/example/defenseapplication/bean/DeviceBean.kt
index a102c2e..1f5a25c 100644
--- a/app/src/main/java/com/example/defenseapplication/bean/DeviceBean.kt
+++ b/app/src/main/java/com/example/defenseapplication/bean/DeviceBean.kt
@@ -1,10 +1,29 @@
 package com.example.defenseapplication.bean
 
 data class DeviceBean(
-    val id: String,
+    val alertAudio: String,
+    val audioContet: Any,
+    val container: Any,
+    val countNum: Any,
+    val deviceEm: String,
+    val deviceFamilyId: String,
+    val deviceImg: Any,
     val deviceName: String,
+    val deviceNo: String,
+    val deviceSn: String,
+    val endTime: Any,
+    val expirationTime: String,
+    val fwVer: String,
+    val id: String,
+    val light: String,
+    val patternPerception: Any,
+    val startTime: Any,
     val status: String,
-    val deviceType: String,
-    val parentId: String,
-    val createTime: String?
+    val strikeInterval: Any,
+    val strikePosition: Any,
+    val strikeRange: Any,
+    val userId: String,
+    val wifiName: String,
+    val wifiPassword: String,
+    val workMode: String
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/defenseapplication/bean/MessageBean.kt b/app/src/main/java/com/example/defenseapplication/bean/MessageBean.kt
new file mode 100644
index 0000000..08904a4
--- /dev/null
+++ b/app/src/main/java/com/example/defenseapplication/bean/MessageBean.kt
@@ -0,0 +1,18 @@
+package com.example.defenseapplication.bean
+
+data class MessageItem(
+    val id: String,
+    val userId: String,
+    val deviceId: String,
+    val category: Int,
+    val categoryName: String,
+    val image: String?,
+    val imageUrl: String?,
+    val video: String?,
+    val createTime: String
+)
+
+data class MessageGroup(
+    val time: String,
+    val list: List<MessageItem>
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt b/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt
index 3059f8e..1665137 100644
--- a/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt
+++ b/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt
@@ -5,6 +5,7 @@ import android.graphics.Color
 import android.graphics.Rect
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
+import android.util.Log
 import android.util.TypedValue
 import android.widget.Toast
 import androidx.fragment.app.Fragment
@@ -22,6 +23,8 @@ import com.example.defenseapplication.bean.DeviceBean
 import com.example.defenseapplication.bean.FamilyBean
 import com.example.defenseapplication.bean.SwitchFamilyRequest
 import com.example.defenseapplication.databinding.HomeMenuFragmentBinding
+import com.example.defenseapplication.utils.FamilySwitchEvent
+import com.example.defenseapplication.utils.MessageStatusManager
 import com.example.defenseapplication.utils.RetrofitNetwork
 import com.example.defenseapplication.utils.UserinfoUtil
 import com.example.defenseapplication.view.DefenseDialogs
@@ -42,6 +45,33 @@ class HomeMenuFragment : Fragment() {
     private var isFamilyExpanded = false
     private lateinit var currentFamily: String
 
+    private val unreadCountChangeListener = object : MessageStatusManager.UnreadCountChangeListener {
+        override fun onUnreadCountChanged(count: Int) {
+            updateUnreadCountUI(count)
+        }
+    }
+
+    private val familySwitchListener = object : FamilySwitchEvent.FamilySwitchListener {
+        override fun onFamilySwitched(familyName: String) {
+            if (familyName != currentFamily) {
+                currentFamily = familyName
+                updateFamilyDisplayText(familyName)
+                familyAdapter.submitList(familyBeanList, currentFamily)
+                switchToFamily(familyName)
+            }
+        }
+    }
+
+    private fun updateFamilyDisplayText(familyName: String) {
+        val familyBean = familyBeanList.find { it.parentName == familyName }
+        val isAdmin = familyBean?.role == "appadmin"
+        binding.tvCurrentFamily.text = if (isAdmin) {
+            getString(R.string.my_family)
+        } else {
+            "${familyName}${getString(R.string.family_with_normal)}"
+        }
+    }
+
     private var familyList: List<String> = emptyList()
     private var familyBeanList: List<FamilyBean> = emptyList()
     private var deviceBeanList: List<DeviceBean> = emptyList()
@@ -87,6 +117,11 @@ class HomeMenuFragment : Fragment() {
         }
 
         fetchFamilyList()
+        fetchUnreadMessageCount()
+
+        MessageStatusManager.addListener(unreadCountChangeListener)
+        FamilySwitchEvent.addListener(familySwitchListener)
+        updateUnreadCountUI(MessageStatusManager.getUnreadCount())
     }
 
     private fun initView() {
@@ -111,17 +146,49 @@ class HomeMenuFragment : Fragment() {
         }
     }
 
+    private fun fetchUnreadMessageCount() {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val response = RetrofitNetwork.getNetworkService().getMessage()
+                withContext(Dispatchers.Main) {
+                    if (response.code == 200 && response.data != null) {
+                        val messageGroups = response.data as List<*>
+                        var unreadCount = 0
+                        messageGroups.forEach { group ->
+                            if (group is Map<*, *>) {
+                                val list = group["list"] as? List<*>
+                                list?.let { unreadCount += it.size }
+                            }
+                        }
+                        MessageStatusManager.setUnreadCount(unreadCount)
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun updateUnreadCountUI(count: Int) {
+        if (count > 0) {
+            binding.tvUnreadCount.visibility = View.VISIBLE
+            binding.tvUnreadCount.text = if (count > 99) "99+" else count.toString()
+        } else {
+            binding.tvUnreadCount.visibility = View.GONE
+        }
+    }
+
     private fun fetchFamilyList() {
         CoroutineScope(Dispatchers.IO).launch {
             try {
                 val response = RetrofitNetwork.getNetworkService().getFamilyList()
                 withContext(Dispatchers.Main) {
                     if (response.code == 200 && response.data != null) {
-                        familyBeanList = response.data
-                        familyList = response.data.map { it.parentName }
+                        familyBeanList = response.data.reversed()
+                        familyList = response.data.map { it.parentName }.reversed()
                         if (familyList.isNotEmpty()) {
                             currentFamily = familyList.first()
-                            binding.tvCurrentFamily.text = currentFamily
+                            updateFamilyDisplayText(currentFamily)
                             familyAdapter.submitList(familyBeanList, currentFamily)
 
                             val userInfo = UserinfoUtil.getUserInfo()
@@ -144,6 +211,7 @@ class HomeMenuFragment : Fragment() {
     }
 
     private fun updateAdminUI() {
+        Log.d("HomeMenuFragment", "canViewDevice = $canViewDevice")
         if (canViewDevice) {
             binding.tvDeviceTitle.visibility = View.VISIBLE
             binding.rvDeviceList.visibility = View.VISIBLE
@@ -180,7 +248,9 @@ class HomeMenuFragment : Fragment() {
                         val userInfo = UserinfoUtil.getUserInfo()
                         canViewDevice = userInfo?.role == "appadmin" && familyBean.role != "member"
                         updateAdminUI()
+                        updateFamilyDisplayText(familyName)
                         fetchDeviceList()
+                        FamilySwitchEvent.notifyFamilySwitched(familyName)
                     } else {
                         Toast.makeText(requireContext(), response.msg, Toast.LENGTH_SHORT).show()
                     }
@@ -200,8 +270,10 @@ class HomeMenuFragment : Fragment() {
             try {
                 val response = RetrofitNetwork.getNetworkService().getDeviceList()
                 withContext(Dispatchers.Main) {
+                    Log.d("DeviceList", "code = ${response.code}, data = ${response.data}")
                     if (response.code == 200 && response.data != null) {
                         deviceBeanList = response.data
+                        Log.d("DeviceList", "deviceBeanList size = ${deviceBeanList.size}")
                         updateDeviceList()
                     } else {
                         Toast.makeText(requireContext(), response.msg, Toast.LENGTH_SHORT).show()
@@ -237,15 +309,8 @@ class HomeMenuFragment : Fragment() {
     }
 
     private fun updateDeviceList() {
-        val currentFamilyId = currentFamilyBean?.id
-        val filteredDevices = if (currentFamilyId != null) {
-            deviceBeanList.filter { it.parentId == currentFamilyId }
-        } else {
-            deviceBeanList
-        }
-
-        val deviceUiList = filteredDevices.map {
-            DeviceUi(it.deviceName, it.status == "online")
+        val deviceUiList = deviceBeanList.map {
+            DeviceUi(it.deviceName, it.status == "0")
         }
 
         if (deviceUiList.isEmpty()) {
@@ -307,6 +372,8 @@ class HomeMenuFragment : Fragment() {
         super.onDestroyView()
         binding.rvFamilyList.adapter = null
         binding.rvDeviceList.adapter = null
+        MessageStatusManager.removeListener(unreadCountChangeListener)
+        FamilySwitchEvent.removeListener(familySwitchListener)
         _binding = null // 避免内存泄漏
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/defenseapplication/home/MessageActivity.kt b/app/src/main/java/com/example/defenseapplication/home/MessageActivity.kt
index 63208a7..6db9f0c 100644
--- a/app/src/main/java/com/example/defenseapplication/home/MessageActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/home/MessageActivity.kt
@@ -1,6 +1,7 @@
 package com.example.defenseapplication.home
 
 import android.os.Bundle
+import android.view.View
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
@@ -8,8 +9,16 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.defenseapplication.adapter.MessageListAdapter
 import com.example.defenseapplication.adapter.MessageListItem
+import com.example.defenseapplication.bean.MessageGroup
+import com.example.defenseapplication.bean.MessageItem
 import com.example.defenseapplication.databinding.MessageActivityBinding
+import com.example.defenseapplication.utils.MessageStatusManager
+import com.example.defenseapplication.utils.RetrofitNetwork
 import com.gyf.immersionbar.ImmersionBar
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 //消息通知页面
 class MessageActivity : AppCompatActivity() {
     private lateinit var binding: MessageActivityBinding
@@ -17,80 +26,94 @@ class MessageActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
         binding = MessageActivityBinding.inflate(layoutInflater)
         setContentView(binding.root)
         ImmersionBar.with(this)
             .statusBarDarkFont(true)
             .titleBar(binding.topBar)
             .init()
-        ViewCompat.setOnApplyWindowInsetsListener(binding.main) { v, insets ->
-            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-            insets
-        }
         initView()
+        MessageStatusManager.clearUnreadCount()
+        loadMessageList()
     }
 
     private fun initView() {
         binding.ivBack.setOnClickListener { finish() }
         binding.rvMessageList.layoutManager = LinearLayoutManager(this)
         binding.rvMessageList.adapter = messageAdapter
-        messageAdapter.submitList(buildMockData())
     }
 
-    private fun buildMockData(): List<MessageListItem> {
-        return listOf(
-            MessageListItem.Header("今天"),
-            MessageListItem.Message(
-                time = "15:54",
-                title = "有人入侵",
-                dateTime = "2026-05-06 15:54:25",
-                unread = true
-            ),
-            MessageListItem.Message(
-                time = "12:54",
-                title = "有人入侵",
-                dateTime = "2026-05-06 15:54:25",
-                unread = true
-            ),
-            MessageListItem.Message(
-                time = "11:54",
-                title = "有人入侵",
-                dateTime = "2026-05-06 15:54:25",
-                unread = true
-            ),
-            MessageListItem.Header("05-05"),
-            MessageListItem.Message(
-                time = "15:54",
-                title = "设备故障",
-                dateTime = "2026-05-06 15:54:25",
-                unread = false
-            ),
-            MessageListItem.Message(
-                time = "08:07",
-                title = "设备离线",
-                dateTime = "2026-05-06 15:54:25",
-                unread = false
-            ),
-            MessageListItem.Message(
-                time = "08:07",
-                title = "到期提醒",
-                dateTime = "2026-05-06 15:54:25",
-                unread = false
-            ),
-            MessageListItem.Message(
-                time = "11:54",
-                title = "有人入侵",
-                dateTime = "2026-05-06 15:54:25",
-                unread = false
-            ),
-            MessageListItem.Message(
-                time = "11:54",
-                title = "有人入侵",
-                dateTime = "2026-05-06 15:54:25",
-                unread = false
-            )
-        )
+    private fun loadMessageList() {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val response = RetrofitNetwork.getNetworkService().getMessage()
+                if (response.code == 0 && response.data != null) {
+                    val messageGroups = response.data as List<MessageGroup>
+                    val items = convertToMessageListItems(messageGroups)
+                    withContext(Dispatchers.Main) {
+                        if (items.isEmpty()) {
+                            showEmptyState()
+                        } else {
+                            hideEmptyState()
+                            messageAdapter.submitList(items)
+                        }
+                    }
+                } else {
+                    withContext(Dispatchers.Main) {
+                        showEmptyState()
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                withContext(Dispatchers.Main) {
+                    showEmptyState()
+                }
+            }
+        }
+    }
+
+    private fun showEmptyState() {
+        binding.contentLayout.visibility = View.GONE
+        binding.emptyLayout.visibility = View.VISIBLE
+    }
+
+    private fun hideEmptyState() {
+        binding.contentLayout.visibility = View.VISIBLE
+        binding.emptyLayout.visibility = View.GONE
+    }
+
+    private fun convertToMessageListItems(groups: List<MessageGroup>): List<MessageListItem> {
+        val items = mutableListOf<MessageListItem>()
+        groups.forEach { group ->
+            val headerTitle = formatDate(group.time)
+            items.add(MessageListItem.Header(headerTitle))
+            group.list.forEach { message ->
+                items.add(
+                    MessageListItem.Message(
+                        time = extractTime(message.createTime),
+                        title = message.categoryName,
+                        dateTime = message.createTime,
+                        unread = false
+                    )
+                )
+            }
+        }
+        return items
+    }
+
+    private fun formatDate(dateStr: String): String {
+        return if (dateStr == "今天" || dateStr.contains("今天")) {
+            "今天"
+        } else {
+            dateStr
+        }
+    }
+
+    private fun extractTime(dateTime: String): String {
+        return if (dateTime.contains(" ")) {
+            dateTime.split(" ")[1].substring(0, 5)
+        } else {
+            dateTime
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt b/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
index 78a85d7..6fe88e7 100644
--- a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
+++ b/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import com.bumptech.glide.Glide
 import com.example.defenseapplication.R
 import com.example.defenseapplication.databinding.PersonalFragmentBinding
@@ -13,9 +14,15 @@ import com.example.defenseapplication.liveVideo.LinkedUserActivity
 import com.example.defenseapplication.personal.PasswordManagementActivity
 import com.example.defenseapplication.personal.PersonalProfileActivity
 import com.example.defenseapplication.utils.LanguageUtil
+import com.example.defenseapplication.utils.RetrofitNetwork
+import com.example.defenseapplication.utils.UserinfoUtil
 import com.example.defenseapplication.view.FamilySwitchDialog
 import com.example.defenseapplication.view.LanguageDialog
 import com.gyf.immersionbar.ImmersionBar
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 //我的碎片
 class PersonalFragment : Fragment() {
     // ViewBinding
@@ -61,9 +68,36 @@ class PersonalFragment : Fragment() {
             val intent= Intent(requireContext(), PasswordManagementActivity::class.java)
             startActivity(intent)
         }
+        fetchCurrentFamily()
         return binding.root
     }
 
+    private fun fetchCurrentFamily() {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val response = RetrofitNetwork.getNetworkService().getFamilyList()
+                withContext(Dispatchers.Main) {
+                    if (response.code == 200 && response.data != null) {
+                        val userInfo = UserinfoUtil.getUserInfo()
+                        val currentFamily = response.data.find {
+                            it.role == userInfo?.role && it.role != "member"
+                        } ?: response.data.firstOrNull()
+                        currentFamily?.let {
+                            val isAdmin = it.role == "appadmin"
+                            if (isAdmin) {
+                                binding.tvCurrentFamily.text = getString(R.string.my_family)
+                            } else {
+                                binding.tvCurrentFamily.text = "${it.parentName}${getString(R.string.family_with_normal)}"
+                            }
+                        }
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
 
     /**
      * 更新当前语言显示
@@ -90,11 +124,39 @@ class PersonalFragment : Fragment() {
      */
     private fun showFamilySwitchDialog() {
         val dialog = FamilySwitchDialog(requireContext()) { familyName ->
-            binding.tvCurrentFamily.text = familyName
+            updateFamilyDisplay(familyName)
         }
         dialog.show()
     }
 
+    private fun updateFamilyDisplay(familyName: String) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val response = RetrofitNetwork.getNetworkService().getFamilyList()
+                withContext(Dispatchers.Main) {
+                    if (response.code == 200 && response.data != null) {
+                        val family = response.data.find { it.parentName == familyName }
+                        family?.let {
+                            val isAdmin = it.role == "appadmin"
+                            if (isAdmin) {
+                                binding.tvCurrentFamily.text = getString(R.string.my_family)
+                            } else {
+                                binding.tvCurrentFamily.text = "${it.parentName}${getString(R.string.family_with_normal)}"
+                            }
+                        } ?: run {
+                            binding.tvCurrentFamily.text = familyName
+                        }
+                    } else {
+                        binding.tvCurrentFamily.text = familyName
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                binding.tvCurrentFamily.text = familyName
+            }
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null // 避免内存泄漏
diff --git a/app/src/main/java/com/example/defenseapplication/utils/ApiService.kt b/app/src/main/java/com/example/defenseapplication/utils/ApiService.kt
index abc257f..51dd9e4 100644
--- a/app/src/main/java/com/example/defenseapplication/utils/ApiService.kt
+++ b/app/src/main/java/com/example/defenseapplication/utils/ApiService.kt
@@ -7,6 +7,7 @@ import com.example.defenseapplication.bean.GetCodeBean
 import bean.LoginBean
 import bean.LoginRequest
 import bean.RegisterRequest
+import com.example.defenseapplication.bean.MessageGroup
 import com.example.defenseapplication.bean.SwitchFamilyRequest
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -55,6 +56,12 @@ interface ApiService {
      */
     @GET("/app/getdeviceList")
     suspend fun getDeviceList(): GetCodeBean<List<DeviceBean>>
+    /**
+     * 查看消息列表
+     */
+    @GET("/app/appMessage/list")
+    suspend fun getMessage(): GetCodeBean<List<MessageGroup>>
+
 
 
 }
diff --git a/app/src/main/java/com/example/defenseapplication/utils/FamilySwitchEvent.kt b/app/src/main/java/com/example/defenseapplication/utils/FamilySwitchEvent.kt
new file mode 100644
index 0000000..cf8aa4a
--- /dev/null
+++ b/app/src/main/java/com/example/defenseapplication/utils/FamilySwitchEvent.kt
@@ -0,0 +1,23 @@
+package com.example.defenseapplication.utils
+
+object FamilySwitchEvent {
+    private val listeners = mutableListOf<FamilySwitchListener>()
+
+    interface FamilySwitchListener {
+        fun onFamilySwitched(familyName: String)
+    }
+
+    fun addListener(listener: FamilySwitchListener) {
+        if (!listeners.contains(listener)) {
+            listeners.add(listener)
+        }
+    }
+
+    fun removeListener(listener: FamilySwitchListener) {
+        listeners.remove(listener)
+    }
+
+    fun notifyFamilySwitched(familyName: String) {
+        listeners.forEach { it.onFamilySwitched(familyName) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/defenseapplication/utils/MessageStatusManager.kt b/app/src/main/java/com/example/defenseapplication/utils/MessageStatusManager.kt
new file mode 100644
index 0000000..18e532d
--- /dev/null
+++ b/app/src/main/java/com/example/defenseapplication/utils/MessageStatusManager.kt
@@ -0,0 +1,44 @@
+package com.example.defenseapplication.utils
+
+object MessageStatusManager {
+    private var unreadCount = 0
+    private val listeners = mutableListOf<UnreadCountChangeListener>()
+
+    fun getUnreadCount(): Int {
+        return unreadCount
+    }
+
+    fun setUnreadCount(count: Int) {
+        unreadCount = if (count > 99) 99 else count
+        notifyListeners()
+    }
+
+    fun incrementUnreadCount() {
+        unreadCount++
+        if (unreadCount > 99) unreadCount = 99
+        notifyListeners()
+    }
+
+    fun clearUnreadCount() {
+        unreadCount = 0
+        notifyListeners()
+    }
+
+    fun addListener(listener: UnreadCountChangeListener) {
+        if (!listeners.contains(listener)) {
+            listeners.add(listener)
+        }
+    }
+
+    fun removeListener(listener: UnreadCountChangeListener) {
+        listeners.remove(listener)
+    }
+
+    private fun notifyListeners() {
+        listeners.forEach { it.onUnreadCountChanged(unreadCount) }
+    }
+
+    interface UnreadCountChangeListener {
+        fun onUnreadCountChanged(count: Int)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/defenseapplication/view/FamilySwitchDialog.kt b/app/src/main/java/com/example/defenseapplication/view/FamilySwitchDialog.kt
index ea92540..d062724 100644
--- a/app/src/main/java/com/example/defenseapplication/view/FamilySwitchDialog.kt
+++ b/app/src/main/java/com/example/defenseapplication/view/FamilySwitchDialog.kt
@@ -7,21 +7,30 @@ import android.view.Gravity
 import android.view.Window
 import android.view.WindowManager
 import android.widget.TextView
+import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.example.defenseapplication.R
 import com.example.defenseapplication.adapter.FamilySwitchAdapter
+import com.example.defenseapplication.bean.FamilyBean
+import com.example.defenseapplication.bean.SwitchFamilyRequest
 import com.example.defenseapplication.model.FamilyItem
+import com.example.defenseapplication.utils.FamilySwitchEvent
+import com.example.defenseapplication.utils.RetrofitNetwork
+import com.example.defenseapplication.utils.UserinfoUtil
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
-/**
- * 家庭切换对话框
- */
 class FamilySwitchDialog(
     context: Context,
     private val onFamilySelected: (String) -> Unit
 ) : Dialog(context, R.style.BottomDialogStyle) {
 
     private lateinit var adapter: FamilySwitchAdapter
+    private var familyBeanList: List<FamilyBean> = emptyList()
+    private var currentFamilyName: String = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,6 +47,7 @@ class FamilySwitchDialog(
         window?.setDimAmount(0.5f)
 
         initViews()
+        fetchFamilyList()
     }
 
     private fun initViews() {
@@ -45,12 +55,7 @@ class FamilySwitchDialog(
         val tvConfirm = findViewById<TextView>(R.id.tvConfirm)
         val rvMessageList = findViewById<RecyclerView>(R.id.rvMessageList)
 
-        val familyList = listOf(
-            FamilyItem("1", context.getString(R.string.my_family)),
-            FamilyItem("2", "张三的家庭")
-        )
-
-        adapter = FamilySwitchAdapter(familyList) { familyItem ->
+        adapter = FamilySwitchAdapter(emptyList()) { familyItem ->
         }
 
         rvMessageList.layoutManager = LinearLayoutManager(context)
@@ -61,9 +66,67 @@ class FamilySwitchDialog(
         }
 
         tvConfirm.setOnClickListener {
-            val selectedFamily = adapter.getSelectedItem()
-            onFamilySelected(selectedFamily.name)
-            dismiss()
+            val selectedItem = adapter.getSelectedItem()
+            val selectedFamily = familyBeanList.find { it.parentName == selectedItem.name }
+            selectedFamily?.let {
+                switchToFamily(it)
+            }
+        }
+    }
+
+    private fun fetchFamilyList() {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val response = RetrofitNetwork.getNetworkService().getFamilyList()
+                withContext(Dispatchers.Main) {
+                    if (response.code == 200 && response.data != null) {
+                        familyBeanList = response.data.reversed()
+                        val familyItems = familyBeanList.map { FamilyItem(it.id, it.parentName) }
+                        adapter.updateList(familyItems)
+
+                        familyBeanList.firstOrNull()?.let {
+                            currentFamilyName = it.parentName
+                        }
+                    } else {
+                        Toast.makeText(context, response.msg, Toast.LENGTH_SHORT).show()
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, R.string.network_error, Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
+    }
+
+    private fun switchToFamily(familyBean: FamilyBean) {
+        CoroutineScope(Dispatchers.IO).launch {
+            try {
+                val userInfo = UserinfoUtil.getUserInfo()
+                val request = SwitchFamilyRequest(
+                    clientId = "428a8310cd442757ae699df5d894f051",
+                    grantType = "switch",
+                    id = familyBean.id,
+                    userType = "app_user",
+                    role = userInfo?.role ?: ""
+                )
+                val response = RetrofitNetwork.getNetworkService().switchFamily(request)
+                withContext(Dispatchers.Main) {
+                    if (response.code == 200) {
+                        onFamilySelected(familyBean.parentName)
+                        FamilySwitchEvent.notifyFamilySwitched(familyBean.parentName)
+                        dismiss()
+                    } else {
+                        Toast.makeText(context, response.msg, Toast.LENGTH_SHORT).show()
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+                withContext(Dispatchers.Main) {
+                    Toast.makeText(context, R.string.network_error, Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_family_popup.xml b/app/src/main/res/drawable/bg_family_popup.xml
new file mode 100644
index 0000000..98ca636
--- /dev/null
+++ b/app/src/main/res/drawable/bg_family_popup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="12dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#EEEEEE" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_family_selected.xml b/app/src/main/res/drawable/bg_family_selected.xml
new file mode 100644
index 0000000..6012864
--- /dev/null
+++ b/app/src/main/res/drawable/bg_family_selected.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#00CED1" />
+    <corners android:radius="8dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check_white.xml b/app/src/main/res/drawable/ic_check_white.xml
new file mode 100644
index 0000000..1e56ad7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/no_message.png b/app/src/main/res/drawable/no_message.png
new file mode 100644
index 0000000000000000000000000000000000000000..93f3668885672d7a8b9f5a7e35b056844453faf7
GIT binary patch
literal 13189
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/home_menu_fragment.xml b/app/src/main/res/layout/home_menu_fragment.xml
index b85c80a..988c2b4 100644
--- a/app/src/main/res/layout/home_menu_fragment.xml
+++ b/app/src/main/res/layout/home_menu_fragment.xml
@@ -78,11 +78,18 @@
                             android:layout_height="match_parent"
                             android:src="@drawable/message"/>
 
-                        <View
-                            android:layout_width="10dp"
-                            android:layout_height="10dp"
+                        <TextView
+                            android:id="@+id/tvUnreadCount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
                             android:layout_gravity="end|top"
-                            android:background="@drawable/ic_red_dot" />
+                            android:background="@drawable/bg_unread_dot"
+                            android:minWidth="16dp"
+                            android:height="16dp"
+                            android:gravity="center"
+                            android:textSize="10sp"
+                            android:textColor="@color/white"
+                            android:visibility="gone" />
                     </FrameLayout>
 
                     <FrameLayout
diff --git a/app/src/main/res/layout/item_device.xml b/app/src/main/res/layout/item_device.xml
index 9e4ec51..5a567bd 100644
--- a/app/src/main/res/layout/item_device.xml
+++ b/app/src/main/res/layout/item_device.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center"
     android:orientation="vertical"
     android:background="@drawable/bg_white"
     android:layout_marginBottom="14dp"
@@ -29,22 +28,28 @@
             android:src="@drawable/go_up" />
     </LinearLayout>
 
-
-
     <TextView
+        android:text="防雨机"
         android:id="@+id/tvDeviceType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:layout_marginStart="10dp"
         android:textColor="@color/black"
-        android:textSize="12dp" />
+        android:textSize="14dp"
+        android:textStyle="bold"/>
 
     <TextView
+        android:text="离线"
         android:id="@+id/tvDeviceName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:layout_marginStart="10dp"
         android:textColor="@color/black"
-        android:textSize="12dp" />
+        android:textSize="12dp"
+        android:textStyle="bold"/>
+
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/message_activity.xml b/app/src/main/res/layout/message_activity.xml
index d4e1419..bb18bf7 100644
--- a/app/src/main/res/layout/message_activity.xml
+++ b/app/src/main/res/layout/message_activity.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
+    android:padding="16dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/message_bg"
-    android:orientation="vertical"
     tools:context=".home.MessageActivity">
 
     <LinearLayout
@@ -35,15 +35,35 @@
     </LinearLayout>
 
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvMessageList"
+    <LinearLayout
+        android:id="@+id/contentLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:paddingStart="16dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="16dp"
-        tools:listitem="@layout/item_message_notice" />
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="16dp">
 
-</LinearLayout>
\ No newline at end of file
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvMessageList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingTop="12dp"
+            android:paddingBottom="16dp"
+            tools:listitem="@layout/item_message_notice" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/emptyLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/no_message" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/register_activity.xml b/app/src/main/res/layout/register_activity.xml
index c08b58f..391d317 100644
--- a/app/src/main/res/layout/register_activity.xml
+++ b/app/src/main/res/layout/register_activity.xml
@@ -15,9 +15,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
+        app:layout_constraintEnd_toEndOf="parent">
         <ImageView
             android:id="@+id/backIcon"
             android:layout_width="24dp"
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index f70fb18..8cf89d8 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -109,6 +109,8 @@
     <string name="join_family">加入家庭</string>
     <string name="family_code">家庭码</string>
     <string name="enter_family_code">请输入家庭码</string>
+    <string name="family_with_normal">的家庭</string>
+    <string name="no_device">暂无设备</string>
 
     <!-- User Management -->
     <string name="user_management">用户管理</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cedcb16..ab189bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,6 +56,7 @@
     <string name="profile">Profile</string>
     <string name="admin_user">Administrator</string>
     <string name="normal_user">Ordinary User</string>
+    <string name="family_with_normal">s Family</string>
 
 
     <!-- Home Menu -->