修复一些未处理异常，切换到测试服务器

app/build.gradle.kts

@@ -32,6 +32,9 @@ android {
     }
 
     buildTypes {
+        debug {
+            isDebuggable = true
+        }
         release {
             isMinifyEnabled = false
             proguardFiles(
@@ -49,6 +52,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.3"

app/proguard-rules.pro

@@ -20,3 +20,23 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+# OpenIM SDK ProGuard rules
+-keep class io.openim.android.sdk.** { *; }
+-keep class io.openim.core.** { *; }
+-keepclassmembers class io.openim.android.sdk.** { *; }
+-keepclassmembers class io.openim.core.** { *; }
+
+# Keep OpenIM models and listeners
+-keep class io.openim.android.sdk.models.** { *; }
+-keep class io.openim.android.sdk.listener.** { *; }
+-keep class io.openim.android.sdk.enums.** { *; }
+
+# Keep OpenIM Client and managers
+-keep class io.openim.android.sdk.OpenIMClient { *; }
+-keep class io.openim.android.sdk.manager.** { *; }
+
+# Prevent obfuscation of callback methods
+-keepclassmembers class * implements io.openim.android.sdk.listener.** {
+    public *;
+}
+

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/rider_pro_logo_next"
+        android:icon="@mipmap/invalid_name"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/rider_pro_logo_next_round"
         android:supportsRtl="true"

app/src/main/java/com/aiosman/ravenow/AppState.kt

@@ -67,8 +67,13 @@ object AppState {
         )
         // 设置当前登录用户 ID
         UserId = resp.id
-        var profileResult = accountService.getMyAccountProfile()
-        profile = profileResult
+        try {
+            var profileResult = accountService.getMyAccountProfile()
+            profile = profileResult
+
+        } catch (e:Exception) {
+            Log.e("AppState", "getMyAccountProfile Error:"+ e.message )
+        }
         // 获取当前用户资料
 
         // 注册 JPush
@@ -101,10 +106,11 @@ object AppState {
 
         val initConfig = InitConfig(
             "https://im.ravenow.ai/api",//SDK api地址
-            "wss:///im.ravenow.ai/msg_gateway",//SDK WebSocket地址
+            "wss://im.ravenow.ai/msg_gateway",//SDK WebSocket地址
             OpenIMManager.getStorageDir(context),//SDK数据库存储目录
         )
-        
+//        initConfig.isLogStandardOutput = true;
+//         initConfig.logLevel = 6
         // 使用 OpenIMManager 初始化 SDK
         OpenIMManager.initSDK(context, initConfig)
 

app/src/main/java/com/aiosman/ravenow/Const.kt

@@ -1,11 +1,14 @@
 package com.aiosman.ravenow
 
 object ConstVars {
-    // api 地址
-//    const val BASE_SERVER = "http://192.168.31.131:8088"
-//    const val BASE_SERVER = "http://192.168.142.141:8088"
-//        const val BASE_SERVER = "http://192.168.0.228:8088"
-     const val BASE_SERVER = "https://rider-pro.aiosman.com/beta_api"
+    // api 地址 - 根据构建类型自动选择
+    // Debug: http://192.168.0.201:8088
+    // Release: https://rider-pro.aiosman.com/beta_api
+    val BASE_SERVER = if (BuildConfig.DEBUG) {
+        "http://47.109.137.67:6363"  // Debug环境
+    } else {
+        "https://rider-pro.aiosman.com/beta_api"  // Release环境
+    }
 
     const val MOMENT_LIKE_CHANNEL_ID = "moment_like"
     const val MOMENT_LIKE_CHANNEL_NAME = "Moment Like"

app/src/main/java/com/aiosman/ravenow/data/AccountService.kt

@@ -430,9 +430,17 @@ interface AccountService {
 
 class AccountServiceImpl : AccountService {
     override suspend fun getMyAccountProfile(): AccountProfileEntity {
+        // 如果已有缓存，直接返回缓存结果
+        AppState.profile?.let { return it }
+        
+        // 第一次调用，获取数据并缓存
         val resp = ApiClient.api.getMyAccount()
         val body = resp.body() ?: throw ServiceException("Failed to get account")
-        return body.data.toAccountProfileEntity()
+        val profile = body.data.toAccountProfileEntity()
+        
+        // 缓存结果到共享状态
+        AppState.profile = profile
+        return profile
     }
 
     override suspend fun getMyAccount(): UserAuth {

app/src/main/java/com/aiosman/ravenow/data/AgentService.kt

@@ -91,7 +91,7 @@ interface AgentService {
     pageNumber: Int,
     pageSize: Int = 20,
     authorId: Int? = null
-    ): ListContainer<AgentEntity>
+    ): ListContainer<AgentEntity>?
 
 }
 

app/src/main/java/com/aiosman/ravenow/data/api/ApiClient.kt

@@ -46,6 +46,7 @@ class AuthInterceptor() : Interceptor {
         }
 
         requestBuilder.addHeader("Authorization", "Bearer ${AppStore.token}")
+        requestBuilder.addHeader("DEVICE-OS", "Android")
 
         val response = chain.proceed(requestBuilder.build())
         return response
@@ -69,9 +70,9 @@ class AuthInterceptor() : Interceptor {
 }
 
 object ApiClient {
-    const val BASE_SERVER = ConstVars.BASE_SERVER
-    const val BASE_API_URL = "${BASE_SERVER}/api/v1"
-    const val RETROFIT_URL = "${BASE_API_URL}/"
+    val BASE_SERVER = ConstVars.BASE_SERVER
+    val BASE_API_URL = "${BASE_SERVER}/api/v1"
+    val RETROFIT_URL = "${BASE_API_URL}/"
     const val TIME_FORMAT = "yyyy-MM-dd HH:mm:ss"
     private val okHttpClient: OkHttpClient by lazy {
         getSafeOkHttpClient(authInterceptor = AuthInterceptor())

app/src/main/java/com/aiosman/ravenow/entity/Agent.kt

@@ -80,9 +80,9 @@ class AgentPagingSource(
                 authorId = authorId
             )
             LoadResult.Page(
-                data = users.list,
+                data = users?.list ?: listOf(),
                 prevKey = if (currentPage == 1) null else currentPage - 1,
-                nextKey = if (users.list.isEmpty()) null else users.page + 1
+                nextKey = if (users?.list?.isNotEmpty() == true) users.page + 1 else  null
             )
         } catch (exception: IOException) {
             return LoadResult.Error(exception)
@@ -102,7 +102,7 @@ class AgentRemoteDataSource(
     suspend fun getAgent(
         pageNumber: Int,
         authorId: Int? = null
-    ): ListContainer<AgentEntity> {
+    ): ListContainer<AgentEntity>? {
         return agentService.getAgent(
             pageNumber = pageNumber,
             authorId = authorId
@@ -117,7 +117,7 @@ class AgentServiceImpl() : AgentService {
         pageNumber: Int,
         pageSize: Int,
         authorId: Int?
-    ): ListContainer<AgentEntity> {
+    ): ListContainer<AgentEntity>? {
         return agentBackend.getAgent(
             pageNumber = pageNumber,
             authorId = authorId
@@ -130,7 +130,7 @@ class AgentBackend {
     suspend fun getAgent(
         pageNumber: Int,
         authorId: Int? = null
-    ): ListContainer<AgentEntity> {
+    ): ListContainer<AgentEntity>? {
         // 如果是游客模式且获取我的Agent（authorId为null），返回空列表
         if (authorId == null && AppStore.isGuest) {
             return ListContainer(
@@ -154,7 +154,7 @@ class AgentBackend {
             )
         }
 
-        val body = resp.body() ?: throw ServiceException("Failed to get agents")
+        val body = resp.body() ?: return null
 
         // 处理不同的返回类型
         return if (authorId != null) {

app/src/main/java/com/aiosman/ravenow/ui/chat/BaseChatViewModel.kt

@@ -0,0 +1,377 @@
+package com.aiosman.ravenow.ui.chat
+
+import android.content.Context
+import android.net.Uri
+import android.provider.MediaStore
+import android.util.Log
+import android.webkit.MimeTypeMap
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.aiosman.ravenow.data.AccountService
+import com.aiosman.ravenow.data.AccountServiceImpl
+import com.aiosman.ravenow.data.UserService
+import com.aiosman.ravenow.data.UserServiceImpl
+import com.aiosman.ravenow.entity.AccountProfileEntity
+import com.aiosman.ravenow.entity.ChatItem
+import io.openim.android.sdk.OpenIMClient
+import io.openim.android.sdk.enums.ConversationType
+import io.openim.android.sdk.enums.ViewType
+import io.openim.android.sdk.listener.OnAdvanceMsgListener
+import io.openim.android.sdk.listener.OnBase
+import io.openim.android.sdk.listener.OnMsgSendCallback
+import io.openim.android.sdk.models.*
+import kotlinx.coroutines.launch
+import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStream
+
+/**
+ * 聊天ViewModel基类，包含所有聊天功能的通用实现
+ * 子类需要实现抽象方法来处理特定的聊天类型（单聊/群聊）
+ */
+abstract class BaseChatViewModel : ViewModel() {
+    
+    // 通用状态属性
+    var chatData by mutableStateOf<List<ChatItem>>(emptyList())
+    var myProfile by mutableStateOf<AccountProfileEntity?>(null)
+    var hasMore by mutableStateOf(true)
+    var isLoading by mutableStateOf(false)
+    var lastMessage: Message? = null
+    val showTimestampMap = mutableMapOf<String, Boolean>()
+    var goToNew by mutableStateOf(false)
+    var conversationID: String = "" // 会话ID，通过getOneConversation初始化
+    
+    // 通用服务
+    val userService: UserService = UserServiceImpl()
+    val accountService: AccountService = AccountServiceImpl()
+    var textMessageListener: OnAdvanceMsgListener? = null
+
+    val fetchHistorySize = 20
+    
+    /**
+     * 初始化方法，子类需要实现具体的初始化逻辑
+     */
+    abstract fun init(context: Context)
+    
+    /**
+     * 获取日志标签，子类需要实现
+     */
+    abstract fun getLogTag(): String
+    
+    /**
+     * 获取会话参数，子类需要实现
+     * @return Triple(targetId, conversationType, isSingleChat)
+     */
+    abstract fun getConversationParams(): Triple<String, Int, Boolean>
+    
+    /**
+     * 处理接收到的新消息，子类可以重写以添加特定逻辑
+     */
+    open fun handleNewMessage(message: Message, context: Context): Boolean {
+        return false // 默认不处理，子类重写
+    }
+    
+    /**
+     * 获取发送消息时的接收者ID，子类需要实现
+     */
+    abstract fun getReceiverInfo(): Pair<String?, String?> // (recvID, groupID)
+    
+    /**
+     * 发送消息成功后的额外处理，子类可以重写
+     */
+    open fun onMessageSentSuccess(message: String, sentMessage: Message?) {
+        // 默认无额外处理，子类可以重写
+    }
+    
+    /**
+     * 获取会话信息并初始化conversationID
+     */
+    fun getOneConversation(onSuccess: (() -> Unit)? = null) {
+        val (targetId, conversationType, isSingleChat) = getConversationParams()
+        
+        OpenIMClient.getInstance().conversationManager.getOneConversation(
+            object : OnBase<ConversationInfo> {
+                override fun onError(code: Int, error: String) {
+                    Log.e(getLogTag(), "getOneConversation error: $error")
+                }
+
+                override fun onSuccess(data: ConversationInfo) {
+                    conversationID = data.conversationID
+                    Log.d(getLogTag(), "获取会话信息成功，conversationID: $conversationID")
+                    onSuccess?.invoke()
+                }
+            },
+            targetId,
+            conversationType
+        )
+    }
+    
+    /**
+     * 注册消息监听器
+     */
+    fun RegistListener(context: Context) {
+        // 检查 OpenIM 是否已登录
+        if (!com.aiosman.ravenow.AppState.enableChat) {
+            Log.w(getLogTag(), "OpenIM 未登录，跳过注册消息监听器")
+            return
+        }
+        
+        textMessageListener = object : OnAdvanceMsgListener {
+            override fun onRecvNewMessage(msg: Message?) {
+                msg?.let { message ->
+                    if (handleNewMessage(message, context)) {
+                        val chatItem = ChatItem.convertToChatItem(message, context, avatar = getMessageAvatar(message))
+                        chatItem?.let {
+                            chatData = listOf(it) + chatData
+                            goToNew = true
+                            Log.i(getLogTag(), "收到来自 ${message.sendID} 的消息，更新聊天列表")
+                        }
+                    }
+                }
+            }
+        }
+        OpenIMClient.getInstance().messageManager.setAdvancedMsgListener(textMessageListener)
+    }
+    
+    /**
+     * 获取消息头像，子类可以重写
+     */
+    open fun getMessageAvatar(message: Message): String? {
+        return null
+    }
+    
+    /**
+     * 取消注册消息监听器
+     */
+    fun UnRegistListener() {
+        textMessageListener = null
+    }
+    
+    /**
+     * 清除未读消息
+     */
+    fun clearUnRead() {
+        if (conversationID.isEmpty()) {
+            Log.w(getLogTag(), "conversationID为空，无法清除未读消息")
+            return
+        }
+
+        OpenIMClient.getInstance().messageManager.markConversationMessageAsRead(
+            conversationID,
+            object : OnBase<String> {
+                override fun onSuccess(data: String?) {
+                    Log.i("openim", "清除未读消息成功")
+                }
+
+                override fun onError(code: Int, error: String?) {
+                    Log.i("openim", "清除未读消息失败, code:$code, error:$error")
+                }
+            }
+        )
+    }
+    
+    /**
+     * 加载更多历史消息
+     */
+    fun onLoadMore(context: Context) {
+        if (!hasMore || isLoading) {
+            return
+        }
+        loadHistoryMessages(context, isLoadMore = true)
+    }
+    
+    /**
+     * 发送文本消息
+     */
+    fun sendMessage(message: String, context: Context) {
+        // 检查 OpenIM 是否已登录
+        if (!com.aiosman.ravenow.AppState.enableChat) {
+            Log.w(getLogTag(), "OpenIM 未登录，无法发送消息")
+            return
+        }
+        
+        val textMessage = OpenIMClient.getInstance().messageManager.createTextMessage(message)
+        val (recvID, groupID) = getReceiverInfo()
+        
+        OpenIMClient.getInstance().messageManager.sendMessage(
+            object : OnMsgSendCallback {
+                override fun onProgress(progress: Long) {
+                    // 发送进度
+                }
+
+                override fun onError(code: Int, error: String?) {
+                    Log.e(getLogTag(), "发送消息失败: $error")
+                }
+
+                override fun onSuccess(data: Message?) {
+                    Log.d(getLogTag(), "发送消息成功")
+                    onMessageSentSuccess(message, data)
+                    data?.let { sentMessage ->
+                        val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
+                        chatItem?.let {
+                            chatData = listOf(it) + chatData
+                            goToNew = true
+                        }
+                    }
+                }
+            },
+            textMessage,
+            recvID,
+            groupID,
+            OfflinePushInfo()
+        )
+    }
+    
+    /**
+     * 发送图片消息
+     */
+    fun sendImageMessage(imageUri: Uri, context: Context) {
+        val tempFile = createTempFile(context, imageUri)
+        val imagePath = tempFile?.path
+        if (imagePath != null) {
+            val imageMessage = OpenIMClient.getInstance().messageManager.createImageMessageFromFullPath(imagePath)
+            val (recvID, groupID) = getReceiverInfo()
+            
+            OpenIMClient.getInstance().messageManager.sendMessage(
+                object : OnMsgSendCallback {
+                    override fun onProgress(progress: Long) {
+                        Log.d(getLogTag(), "发送图片消息进度: $progress")
+                    }
+
+                    override fun onError(code: Int, error: String?) {
+                        Log.e(getLogTag(), "发送图片消息失败: $error")
+                    }
+
+                    override fun onSuccess(data: Message?) {
+                        Log.d(getLogTag(), "发送图片消息成功")
+                        data?.let { sentMessage ->
+                            val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
+                            chatItem?.let {
+                                chatData = listOf(it) + chatData
+                                goToNew = true
+                            }
+                        }
+                    }
+                },
+                imageMessage,
+                recvID,
+                groupID,
+                OfflinePushInfo()
+            )
+        }
+    }
+    
+    /**
+     * 创建临时文件
+     */
+    fun createTempFile(context: Context, uri: Uri): File? {
+        return try {
+            val projection = arrayOf(MediaStore.Images.Media.DATA)
+            val cursor = context.contentResolver.query(uri, projection, null, null, null)
+            cursor?.use {
+                if (it.moveToFirst()) {
+                    val columnIndex = it.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
+                    val filePath = it.getString(columnIndex)
+                    val inputStream: InputStream? = context.contentResolver.openInputStream(uri)
+                    val mimeType = context.contentResolver.getType(uri)
+                    val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)
+                    val tempFile =
+                        File.createTempFile("temp_image", ".$extension", context.cacheDir)
+                    val outputStream = FileOutputStream(tempFile)
+
+                    inputStream?.use { input ->
+                        outputStream.use { output ->
+                            input.copyTo(output)
+                        }
+                    }
+                    tempFile
+                } else {
+                    null
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
+    
+    /**
+     * 获取历史消息
+     */
+    fun fetchHistoryMessage(context: Context) {
+        loadHistoryMessages(context, isLoadMore = false)
+    }
+    
+    /**
+     * 加载历史消息的通用方法
+     * @param context 上下文
+     * @param isLoadMore 是否是加载更多（true：追加到现有数据，false：替换现有数据）
+     */
+    private fun loadHistoryMessages(context: Context, isLoadMore: Boolean) {
+        if (conversationID.isEmpty()) {
+            Log.w(getLogTag(), "conversationID为空，无法${if (isLoadMore) "加载更多" else "获取"}历史消息")
+            return
+        }
+        
+        if (isLoadMore) {
+            isLoading = true
+        }
+        
+        viewModelScope.launch {
+            OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList(
+                object : OnBase<AdvancedMessage> {
+                    override fun onSuccess(data: AdvancedMessage?) {
+                        val messages = data?.messageList ?: emptyList()
+                        val newChatItems = messages.mapNotNull {
+                            ChatItem.convertToChatItem(it, context, avatar = getMessageAvatar(it))
+                        }.reversed() // 反转顺序，使最新消息在前面
+                        
+                        // 根据是否是加载更多来决定数据处理方式
+                        chatData = if (isLoadMore) {
+                            chatData + newChatItems // 追加到现有数据
+                        } else {
+                            newChatItems // 替换现有数据
+                        }
+                        
+                        if (messages.size < fetchHistorySize) {
+                            hasMore = false
+                        }
+                        lastMessage = messages.firstOrNull()
+                        
+                        if (isLoadMore) {
+                            isLoading = false
+                        }
+                        
+                        Log.d(getLogTag(), "${if (isLoadMore) "加载更多" else "获取"}历史消息成功")
+                    }
+
+                    override fun onError(code: Int, error: String?) {
+                        Log.e(getLogTag(), "${if (isLoadMore) "加载更多" else "获取"}历史消息失败: $error")
+                        if (isLoadMore) {
+                            isLoading = false
+                        }
+                    }
+                },
+                conversationID,
+                if (isLoadMore) lastMessage else null, // 首次加载不传lastMessage
+                fetchHistorySize,
+                ViewType.History
+            )
+        }
+    }
+    
+    /**
+     * 获取显示的聊天列表
+     */
+    fun getDisplayChatList(): List<ChatItem> {
+        val list = chatData
+        // 更新每条消息的时间戳显示状态
+        for (item in list) {
+            item.showTimestamp = showTimestampMap.getOrDefault(item.msgId, false)
+        }
+        return list
+    }
+}

app/src/main/java/com/aiosman/ravenow/ui/chat/ChatAiViewModel.kt

@@ -1,57 +1,27 @@
 package com.aiosman.ravenow.ui.chat
 
 import android.content.Context
-import android.net.Uri
-import android.provider.MediaStore
 import android.util.Log
-import android.webkit.MimeTypeMap
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import androidx.navigation.NavHostController
 import com.aiosman.ravenow.ChatState
-import com.aiosman.ravenow.data.AccountService
-import com.aiosman.ravenow.data.AccountServiceImpl
-import com.aiosman.ravenow.data.UserService
-import com.aiosman.ravenow.data.UserServiceImpl
 import com.aiosman.ravenow.data.api.ApiClient
 import com.aiosman.ravenow.data.api.SendChatAiRequestBody
-import com.aiosman.ravenow.data.api.SingleChatRequestBody
 import com.aiosman.ravenow.entity.AccountProfileEntity
-import com.aiosman.ravenow.entity.ChatItem
 import com.aiosman.ravenow.entity.ChatNotification
-import com.aiosman.ravenow.ui.navigateToChatAi
-// OpenIM SDK 导入
-import io.openim.android.sdk.OpenIMClient
-import io.openim.android.sdk.enums.ViewType
-import io.openim.android.sdk.listener.OnAdvanceMsgListener
-import io.openim.android.sdk.listener.OnBase
-import io.openim.android.sdk.listener.OnMsgSendCallback
+import io.openim.android.sdk.enums.ConversationType
 import io.openim.android.sdk.models.*
 import kotlinx.coroutines.launch
-import java.io.File
-import java.io.FileOutputStream
-import java.io.InputStream
 
 
 class ChatAiViewModel(
     val userId: String,
-) : ViewModel() {
-    var chatData by mutableStateOf<List<ChatItem>>(emptyList())
+) : BaseChatViewModel() {
     var userProfile by mutableStateOf<AccountProfileEntity?>(null)
-    var myProfile by mutableStateOf<AccountProfileEntity?>(null)
-    val userService: UserService = UserServiceImpl()
-    val accountService: AccountService = AccountServiceImpl()
-    var textMessageListener: OnAdvanceMsgListener? = null
-    var hasMore by mutableStateOf(true)
-    var isLoading by mutableStateOf(false)
-    var lastMessage: Message? = null
-    val showTimestampMap = mutableMapOf<String, Boolean>() // Add this map
     var chatNotification by mutableStateOf<ChatNotification?>(null)
-    var goToNew by mutableStateOf(false)
-    fun init(context: Context) {
+    override fun init(context: Context) {
         // 获取用户信息
         viewModelScope.launch {
             val resp = userService.getUserProfile(userId)
@@ -59,150 +29,55 @@ class ChatAiViewModel(
             myProfile = accountService.getMyAccountProfile()
 
             RegistListener(context)
-            fetchHistoryMessage(context)
+            
+            // 获取会话信息，然后加载历史消息
+            getOneConversation {
+                fetchHistoryMessage(context)
+            }
+            
             // 获取通知信息
             val notiStrategy = ChatState.getStrategyByTargetTrtcId(resp.trtcUserId)
             chatNotification = notiStrategy
         }
     }
 
+    override fun getConversationParams(): Triple<String, Int, Boolean> {
+        return Triple(userProfile?.trtcUserId ?: userId, ConversationType.SINGLE_CHAT, true)
+    }
 
-    fun RegistListener(context: Context) {
-        // 检查 OpenIM 是否已登录
-        if (!com.aiosman.ravenow.AppState.enableChat) {
-            android.util.Log.w("ChatAiViewModel", "OpenIM 未登录，跳过注册消息监听器")
-            return
-        }
+    override fun getLogTag(): String {
+        return "ChatAiViewModel"
+    }
+
+    override fun handleNewMessage(message: Message, context: Context): Boolean {
+        // 只处理当前聊天对象的消息
+        val currentChatUserId = userProfile?.trtcUserId
+        val currentUserId = com.aiosman.ravenow.AppState.profile?.trtcUserId
         
-        textMessageListener = object : OnAdvanceMsgListener {
-            override fun onRecvNewMessage(msg: Message?) {
-                msg?.let { message ->
-                    // 只处理当前聊天对象的消息
-                    val currentChatUserId = userProfile?.trtcUserId
-                    val currentUserId = com.aiosman.ravenow.AppState.profile?.trtcUserId
-                    
-                    if (currentChatUserId != null && currentUserId != null) {
-                        // 检查消息是否来自当前聊天对象，且不是自己发送的消息
-                        if ((message.sendID == currentChatUserId || message.sendID == currentUserId) && 
-                            message.sendID != currentUserId) {
-                            val chatItem = ChatItem.convertToChatItem(message, context, avatar = userProfile?.avatar)
-                            chatItem?.let {
-                                chatData = listOf(it) + chatData
-                                goToNew = true
-                                android.util.Log.i("ChatAiViewModel", "收到来自 ${message.sendID} 的消息，更新AI聊天列表")
-                            }
-                        }
-                    }
-                }
-            }
+        if (currentChatUserId != null && currentUserId != null) {
+            // 检查消息是否来自当前聊天对象，且不是自己发送的消息
+            return (message.sendID == currentChatUserId || message.sendID == currentUserId) && 
+                   message.sendID != currentUserId
         }
-        OpenIMClient.getInstance().messageManager.setAdvancedMsgListener(textMessageListener)
+        return false
     }
 
-    fun UnRegistListener() {
-        // OpenIM SDK 不需要显式移除监听器，只需要设置为 null
-        textMessageListener = null
+    override fun getReceiverInfo(): Pair<String?, String?> {
+        return Pair(userProfile?.trtcUserId, null) // (recvID, groupID)
     }
 
-    fun clearUnRead() {
-        val conversationID = "single_${userProfile?.trtcUserId}"
-        OpenIMClient.getInstance().messageManager.markConversationMessageAsRead(
-            conversationID,
-            object : OnBase<String> {
-                override fun onSuccess(data: String?) {
-                    Log.i("openim", "clear unread success")
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.i("openim", "clear unread failure, code:$code, error:$error")
-                }
-            }
-        )
-    }
-
-
-    fun onLoadMore(context: Context) {
-        if (!hasMore || isLoading) {
-            return
-        }
-        isLoading = true
-        viewModelScope.launch {
-            val conversationID = "single_${userProfile?.trtcUserId!!}"
-//            val options = OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList() .apply {
-//                conversationID = conversationID
-//                count = 20
-//                lastMinSeq = lastMessage?.seq ?: 0
-//            }
-            OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList(
-                object : OnBase<AdvancedMessage> {
-                    override fun onSuccess(data: AdvancedMessage?) {
-                        val messages = data?.messageList ?: emptyList()
-                        chatData = chatData + messages.map {
-                            var avatar = userProfile?.avatar
-                            if (it.sendID == com.aiosman.ravenow.AppState.profile?.trtcUserId) {
-                                avatar = myProfile?.avatar
-                            }
-                            ChatItem.convertToChatItem(it, context, avatar)
-                        }.filterNotNull()
-                        
-                        if (messages.size < 20) {
-                            hasMore = false
-                        }
-                        lastMessage = messages.lastOrNull()
-                        isLoading = false
-                        Log.d("ChatAiViewModel", "fetch history message success")
-                    }
-
-                    override fun onError(code: Int, error: String?) {
-                        Log.e("ChatAiViewModel", "fetch history message error: $error")
-                        isLoading = false
-                    }
-                },
-                conversationID,
-                lastMessage,
-                20,
-                ViewType.History
-            )
+    override fun getMessageAvatar(message: Message): String? {
+        return if (message.sendID == com.aiosman.ravenow.AppState.profile?.trtcUserId) {
+            myProfile?.avatar
+        } else {
+            userProfile?.avatar
         }
     }
 
-    fun sendMessage(message: String, context: Context) {
-        // 检查 OpenIM 是否已登录
-        if (!com.aiosman.ravenow.AppState.enableChat) {
-            android.util.Log.w("ChatAiViewModel", "OpenIM 未登录，无法发送消息")
-            return
-        }
-        
-        val textMessage = OpenIMClient.getInstance().messageManager.createTextMessage(message)
-        
-        OpenIMClient.getInstance().messageManager.sendMessage(
-            object : OnMsgSendCallback {
-                override fun onProgress(progress: Long) {
-                    // 发送进度
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.e("ChatAiViewModel", "send message error: $error")
-                }
-
-                override fun onSuccess(data: Message?) {
-                    Log.d("ChatAiViewModel", "send message success")
-                    sendChatAiMessage(myProfile?.trtcUserId!!, userProfile?.trtcUserId!!, message)
-                    createGroup2ChatAi(userProfile?.trtcUserId!!, "ai_group")
-                    data?.let { sentMessage ->
-                        val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
-                        chatItem?.let {
-                            chatData = listOf(it) + chatData
-                            goToNew = true
-                        }
-                    }
-                }
-            },
-            textMessage,
-            userProfile?.trtcUserId!!, // recvID
-            null, // groupID
-            null // offlinePushInfo
-        )
+    override fun onMessageSentSuccess(message: String, sentMessage: Message?) {
+        // AI聊天特有的处理逻辑
+        sendChatAiMessage(myProfile?.trtcUserId!!, userProfile?.trtcUserId!!, message)
+        createGroup2ChatAi(userProfile?.trtcUserId!!, "ai_group")
     }
     fun createGroup2ChatAi(
         trtcUserId: String,
@@ -212,104 +87,6 @@ class ChatAiViewModel(
         Log.d("ChatAiViewModel", "OpenIM 不支持会话分组功能")
     }
 
-    fun sendImageMessage(imageUri: Uri, context: Context) {
-        val tempFile = createTempFile(context, imageUri)
-        val imagePath = tempFile?.path
-        if (imagePath != null) {
-            val imageMessage = OpenIMClient.getInstance().messageManager.createImageMessageFromFullPath(imagePath)
-            
-            OpenIMClient.getInstance().messageManager.sendMessage(
-                object : OnMsgSendCallback {
-                    override fun onProgress(progress: Long) {
-                        Log.d("ChatAiViewModel", "send image message progress: $progress")
-                    }
-
-                    override fun onError(code: Int, error: String?) {
-                        Log.e("ChatAiViewModel", "send image message error: $error")
-                    }
-
-                    override fun onSuccess(data: Message?) {
-                        Log.d("ChatAiViewModel", "send image message success")
-                        data?.let { sentMessage ->
-                            val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
-                            chatItem?.let {
-                                chatData = listOf(it) + chatData
-                                goToNew = true
-                            }
-                        }
-                    }
-                },
-                imageMessage,
-                userProfile?.trtcUserId!!, // recvID
-                null, // groupID
-                null // offlinePushInfo
-            )
-        }
-    }
-
-    fun createTempFile(context: Context, uri: Uri): File? {
-        return try {
-            val projection = arrayOf(MediaStore.Images.Media.DATA)
-            val cursor = context.contentResolver.query(uri, projection, null, null, null)
-            cursor?.use {
-                if (it.moveToFirst()) {
-                    val columnIndex = it.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
-                    val filePath = it.getString(columnIndex)
-                    val inputStream: InputStream? = context.contentResolver.openInputStream(uri)
-                    val mimeType = context.contentResolver.getType(uri)
-                    val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)
-                    val tempFile =
-                        File.createTempFile("temp_image", ".$extension", context.cacheDir)
-                    val outputStream = FileOutputStream(tempFile)
-
-                    inputStream?.use { input ->
-                        outputStream.use { output ->
-                            input.copyTo(output)
-                        }
-                    }
-                    tempFile
-                } else {
-                    null
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    fun fetchHistoryMessage(context: Context) {
-        val conversationID = "single_${userProfile?.trtcUserId!!}"
-
-        
-        OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList(
-            object : OnBase<AdvancedMessage> {
-                override fun onSuccess(data: AdvancedMessage?) {
-                    val messages = data?.messageList ?: emptyList()
-                    chatData = messages.mapNotNull {
-                        var avatar = userProfile?.avatar
-                        if (it.sendID == com.aiosman.ravenow.AppState.profile?.trtcUserId) {
-                            avatar = myProfile?.avatar
-                        }
-                        ChatItem.convertToChatItem(it, context, avatar)
-                    }
-                    if (messages.size < 20) {
-                        hasMore = false
-                    }
-                    lastMessage = messages.lastOrNull()
-                    Log.d("ChatAiViewModel", "fetch history message success")
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.e("ChatAiViewModel", "fetch history message error: $error")
-                }
-            },
-            conversationID,
-            lastMessage,
-            20,
-            ViewType.History
-        )
-    }
     fun sendChatAiMessage(
         fromTrtcUserId: String,
         toTrtcUserId: String,
@@ -318,16 +95,6 @@ class ChatAiViewModel(
         viewModelScope.launch {
             val response = ApiClient.api.sendChatAiMessage(SendChatAiRequestBody(fromTrtcUserId = fromTrtcUserId,toTrtcUserId = toTrtcUserId,message = message))
         }
-
-    }
-
-    fun getDisplayChatList(): List<ChatItem> {
-        val list = chatData
-        // Update showTimestamp for each message
-        for (item in list) {
-            item.showTimestamp = showTimestampMap.getOrDefault(item.msgId, false)
-        }
-        return list
     }
 
     suspend fun updateNotificationStrategy(strategy: String) {

app/src/main/java/com/aiosman/ravenow/ui/chat/ChatViewModel.kt

@@ -1,53 +1,24 @@
 package com.aiosman.ravenow.ui.chat
 
 import android.content.Context
-import android.net.Uri
-import android.provider.MediaStore
-import android.util.Log
-import android.webkit.MimeTypeMap
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.aiosman.ravenow.ChatState
-import com.aiosman.ravenow.data.AccountService
-import com.aiosman.ravenow.data.AccountServiceImpl
-import com.aiosman.ravenow.data.UserService
-import com.aiosman.ravenow.data.UserServiceImpl
 import com.aiosman.ravenow.entity.AccountProfileEntity
-import com.aiosman.ravenow.entity.ChatItem
 import com.aiosman.ravenow.entity.ChatNotification
-// OpenIM SDK 导入
-import io.openim.android.sdk.OpenIMClient
-import io.openim.android.sdk.enums.MessageType
-import io.openim.android.sdk.enums.ViewType
-import io.openim.android.sdk.listener.OnAdvanceMsgListener
-import io.openim.android.sdk.listener.OnBase
-import io.openim.android.sdk.listener.OnMsgSendCallback
-import io.openim.android.sdk.models.*
+import io.openim.android.sdk.enums.ConversationType
+import io.openim.android.sdk.models.Message
 import kotlinx.coroutines.launch
-import java.io.File
-import java.io.FileOutputStream
-import java.io.InputStream
 
 
 class ChatViewModel(
     val userId: String,
-) : ViewModel() {
-    var chatData by mutableStateOf<List<ChatItem>>(emptyList())
+) : BaseChatViewModel() {
     var userProfile by mutableStateOf<AccountProfileEntity?>(null)
-    var myProfile by mutableStateOf<AccountProfileEntity?>(null)
-    val userService: UserService = UserServiceImpl()
-    val accountService: AccountService = AccountServiceImpl()
-    var textMessageListener: OnAdvanceMsgListener? = null
-    var hasMore by mutableStateOf(true)
-    var isLoading by mutableStateOf(false)
-    var lastMessage: Message? = null
-    val showTimestampMap = mutableMapOf<String, Boolean>() // Add this map
     var chatNotification by mutableStateOf<ChatNotification?>(null)
-    var goToNew by mutableStateOf(false)
-    fun init(context: Context) {
+    override fun init(context: Context) {
         // 获取用户信息
         viewModelScope.launch {
             val resp = userService.getUserProfile(userId)
@@ -55,251 +26,49 @@ class ChatViewModel(
             myProfile = accountService.getMyAccountProfile()
 
             RegistListener(context)
-            fetchHistoryMessage(context)
+            
+            // 获取会话信息，然后加载历史消息
+            getOneConversation {
+                fetchHistoryMessage(context)
+            }
+            
             // 获取通知信息
             val notiStrategy = ChatState.getStrategyByTargetTrtcId(resp.trtcUserId)
             chatNotification = notiStrategy
         }
     }
 
+    override fun getConversationParams(): Triple<String, Int, Boolean> {
+        return Triple(userProfile?.trtcUserId ?: userId, ConversationType.SINGLE_CHAT, true)
+    }
 
-    fun RegistListener(context: Context) {
-        // 检查 OpenIM 是否已登录
-        if (!com.aiosman.ravenow.AppState.enableChat) {
-            android.util.Log.w("ChatViewModel", "OpenIM 未登录，跳过注册消息监听器")
-            return
-        }
+    override fun getLogTag(): String {
+        return "ChatViewModel"
+    }
+
+    override fun handleNewMessage(message: Message, context: Context): Boolean {
+        // 只处理当前聊天对象的消息
+        val currentChatUserId = userProfile?.trtcUserId
+        val currentUserId = com.aiosman.ravenow.AppState.profile?.trtcUserId
         
-        textMessageListener = object : OnAdvanceMsgListener {
-            override fun onRecvNewMessage(msg: Message?) {
-                msg?.let { message ->
-                    // 只处理当前聊天对象的消息
-                    val currentChatUserId = userProfile?.trtcUserId
-                    val currentUserId = com.aiosman.ravenow.AppState.profile?.trtcUserId
-                    
-                    if (currentChatUserId != null && currentUserId != null) {
-                        // 检查消息是否来自当前聊天对象，且不是自己发送的消息
-                        if ((message.sendID == currentChatUserId || message.sendID == currentUserId) && 
-                            message.sendID != currentUserId) {
-                            val chatItem = ChatItem.convertToChatItem(message, context, avatar = userProfile?.avatar)
-                            chatItem?.let {
-                                chatData = listOf(it) + chatData
-                                goToNew = true
-                                android.util.Log.i("ChatViewModel", "收到来自 ${message.sendID} 的消息，更新聊天列表")
-                            }
-                        }
-                    }
-                }
-            }
+        if (currentChatUserId != null && currentUserId != null) {
+            // 检查消息是否来自当前聊天对象，且不是自己发送的消息
+            return (message.sendID == currentChatUserId || message.sendID == currentUserId) && 
+                   message.sendID != currentUserId
         }
-        OpenIMClient.getInstance().messageManager.setAdvancedMsgListener(textMessageListener)
+        return false
     }
 
-    fun UnRegistListener() {
-        // OpenIM SDK 不需要显式移除监听器，只需要设置为 null
-        textMessageListener = null
+    override fun getReceiverInfo(): Pair<String?, String?> {
+        return Pair(userProfile?.trtcUserId, null) // (recvID, groupID)
     }
 
-    fun clearUnRead() {
-        val conversationID = "single_${userProfile?.trtcUserId}"
-        OpenIMClient.getInstance().messageManager.markConversationMessageAsRead(
-            conversationID,
-            object : OnBase<String> {
-                override fun onSuccess(data: String?) {
-                    Log.i("openim", "clear unread success")
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.i("openim", "clear unread failure, code:$code, error:$error")
-                }
-            }
-        )
-    }
-
-
-    fun onLoadMore(context: Context) {
-        if (!hasMore || isLoading) {
-            return
+    override fun getMessageAvatar(message: Message): String? {
+        return if (message.sendID == com.aiosman.ravenow.AppState.profile?.trtcUserId) {
+            myProfile?.avatar
+        } else {
+            userProfile?.avatar
         }
-        isLoading = true
-        viewModelScope.launch {
-            val conversationID = "single_${userProfile?.trtcUserId!!}"
-            
-            OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList(
-                object : OnBase<AdvancedMessage> {
-                    override fun onSuccess(data: AdvancedMessage?) {
-                        val messages = data?.messageList ?: emptyList()
-                        chatData = chatData + messages.map {
-                            var avatar = userProfile?.avatar
-                            if (it.sendID == com.aiosman.ravenow.AppState.profile?.trtcUserId) {
-                                avatar = myProfile?.avatar
-                            }
-                            ChatItem.convertToChatItem(it, context, avatar)
-                        }.filterNotNull()
-                        
-                        if (messages.size < 20) {
-                            hasMore = false
-                        }
-                        lastMessage = messages.lastOrNull()
-                        isLoading = false
-                        Log.d("ChatViewModel", "fetch history message success")
-                    }
-
-                    override fun onError(code: Int, error: String?) {
-                        Log.e("ChatViewModel", "fetch history message error: $error")
-                        isLoading = false
-                    }
-                },
-                conversationID,
-                lastMessage,
-                20,
-                ViewType.History
-            )
-        }
-    }
-
-    fun sendMessage(message: String, context: Context) {
-        // 检查 OpenIM 是否已登录
-        if (!com.aiosman.ravenow.AppState.enableChat) {
-            android.util.Log.w("ChatViewModel", "OpenIM 未登录，无法发送消息")
-            return
-        }
-        
-        val textMessage = OpenIMClient.getInstance().messageManager.createTextMessage(message)
-        
-        OpenIMClient.getInstance().messageManager.sendMessage(
-            object : OnMsgSendCallback {
-                override fun onProgress(progress: Long) {
-                    // 发送进度
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.e("ChatViewModel", "send message error: $error")
-                }
-
-                override fun onSuccess(data: Message?) {
-                    Log.d("ChatViewModel", "send message success")
-                    data?.let { sentMessage ->
-                        val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
-                        chatItem?.let {
-                            chatData = listOf(it) + chatData
-                            goToNew = true
-                        }
-                    }
-                }
-            },
-            textMessage,
-            userProfile?.trtcUserId!!, // recvID
-            null, // groupID
-            null // offlinePushInfo
-        )
-    }
-
-    fun sendImageMessage(imageUri: Uri, context: Context) {
-        val tempFile = createTempFile(context, imageUri)
-        val imagePath = tempFile?.path
-        if (imagePath != null) {
-            val imageMessage = OpenIMClient.getInstance().messageManager.createImageMessageFromFullPath(imagePath)
-            
-            OpenIMClient.getInstance().messageManager.sendMessage(
-                object : OnMsgSendCallback {
-                    override fun onProgress(progress: Long) {
-                        Log.d("ChatViewModel", "send image message progress: $progress")
-                    }
-
-                    override fun onError(code: Int, error: String?) {
-                        Log.e("ChatViewModel", "send image message error: $error")
-                    }
-
-                    override fun onSuccess(data: Message?) {
-                        Log.d("ChatViewModel", "send image message success")
-                        data?.let { sentMessage ->
-                            val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
-                            chatItem?.let {
-                                chatData = listOf(it) + chatData
-                                goToNew = true
-                            }
-                        }
-                    }
-                },
-                imageMessage,
-                userProfile?.trtcUserId!!, // recvID
-                null, // groupID
-                null // offlinePushInfo
-            )
-        }
-    }
-
-    fun createTempFile(context: Context, uri: Uri): File? {
-        return try {
-            val projection = arrayOf(MediaStore.Images.Media.DATA)
-            val cursor = context.contentResolver.query(uri, projection, null, null, null)
-            cursor?.use {
-                if (it.moveToFirst()) {
-                    val columnIndex = it.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
-                    val filePath = it.getString(columnIndex)
-                    val inputStream: InputStream? = context.contentResolver.openInputStream(uri)
-                    val mimeType = context.contentResolver.getType(uri)
-                    val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)
-                    val tempFile =
-                        File.createTempFile("temp_image", ".$extension", context.cacheDir)
-                    val outputStream = FileOutputStream(tempFile)
-
-                    inputStream?.use { input ->
-                        outputStream.use { output ->
-                            input.copyTo(output)
-                        }
-                    }
-                    tempFile
-                } else {
-                    null
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    fun fetchHistoryMessage(context: Context) {
-        val conversationID = "single_${userProfile?.trtcUserId!!}"
-        
-        OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList(
-            object : OnBase<AdvancedMessage> {
-                override fun onSuccess(data: AdvancedMessage?) {
-                    val messages = data?.messageList ?: emptyList()
-                    chatData = messages.mapNotNull {
-                        var avatar = userProfile?.avatar
-                        if (it.sendID == com.aiosman.ravenow.AppState.profile?.trtcUserId) {
-                            avatar = myProfile?.avatar
-                        }
-                        ChatItem.convertToChatItem(it, context, avatar)
-                    }
-                    if (messages.size < 20) {
-                        hasMore = false
-                    }
-                    lastMessage = messages.lastOrNull()
-                    Log.d("ChatViewModel", "fetch history message success")
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.e("ChatViewModel", "fetch history message error: $error")
-                }
-            },
-            conversationID,
-            null,
-            20,
-            ViewType.History
-        )
-    }
-
-    fun getDisplayChatList(): List<ChatItem> {
-        val list = chatData
-        // Update showTimestamp for each message
-        for (item in list) {
-            item.showTimestamp = showTimestampMap.getOrDefault(item.msgId, false)
-        }
-        return list
     }
 
     suspend fun updateNotificationStrategy(strategy: String) {

app/src/main/java/com/aiosman/ravenow/ui/chat/GroupChatViewModel.kt

@@ -1,55 +1,23 @@
 package com.aiosman.ravenow.ui.chat
 
 import android.content.Context
-import android.net.Uri
-import android.provider.MediaStore
 import android.util.Log
-import android.webkit.MimeTypeMap
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.aiosman.ravenow.ChatState
-import com.aiosman.ravenow.data.AccountService
-import com.aiosman.ravenow.data.AccountServiceImpl
-import com.aiosman.ravenow.data.UserService
-import com.aiosman.ravenow.data.UserServiceImpl
 import com.aiosman.ravenow.data.api.ApiClient
-import com.aiosman.ravenow.data.api.GroupChatRequestBody
 import com.aiosman.ravenow.data.api.SendChatAiRequestBody
-import com.aiosman.ravenow.data.api.SingleChatRequestBody
-import com.aiosman.ravenow.entity.AccountProfileEntity
-import com.aiosman.ravenow.entity.ChatItem
-import com.aiosman.ravenow.entity.ChatNotification
-// OpenIM SDK 导入
-import io.openim.android.sdk.OpenIMClient
-import io.openim.android.sdk.enums.ViewType
-import io.openim.android.sdk.listener.OnAdvanceMsgListener
-import io.openim.android.sdk.listener.OnBase
-import io.openim.android.sdk.listener.OnMsgSendCallback
+import io.openim.android.sdk.enums.ConversationType
 import io.openim.android.sdk.models.*
 import kotlinx.coroutines.launch
-import java.io.File
-import java.io.FileOutputStream
-import java.io.InputStream
 
 class GroupChatViewModel(
     val groupId: String,
     val name: String,
     val avatar: String,
-) : ViewModel() {
-    var chatData by mutableStateOf<List<ChatItem>>(emptyList())
+) : BaseChatViewModel() {
     var groupInfo by mutableStateOf<GroupInfo?>(null)
-    var myProfile by mutableStateOf<AccountProfileEntity?>(null)
-    val userService: UserService = UserServiceImpl()
-    val accountService: AccountService = AccountServiceImpl()
-    var textMessageListener: OnAdvanceMsgListener? = null
-    var hasMore by mutableStateOf(true)
-    var isLoading by mutableStateOf(false)
-    var lastMessage: Message? = null
-    val showTimestampMap = mutableMapOf<String, Boolean>()
-    var goToNew by mutableStateOf(false)
     
     // 群聊特有属性
     var memberCount by mutableStateOf(0)
@@ -64,13 +32,17 @@ class GroupChatViewModel(
         val ownerId: String
     )
     
-    fun init(context: Context) {
+    override fun init(context: Context) {
         viewModelScope.launch {
             try {
                 getGroupInfo()
                 myProfile = accountService.getMyAccountProfile()
                 RegistListener(context)
-                fetchHistoryMessage(context)
+                
+                // 获取会话信息，然后加载历史消息
+                getOneConversation {
+                    fetchHistoryMessage(context)
+                }
             } catch (e: Exception) {
                 Log.e("GroupChatViewModel", "初始化失败: ${e.message}")
             }
@@ -91,120 +63,36 @@ class GroupChatViewModel(
         memberCount = groupInfo?.memberCount ?: 0
     }
 
-    fun RegistListener(context: Context) {
-        // 检查 OpenIM 是否已登录
-        if (!com.aiosman.ravenow.AppState.enableChat) {
-            android.util.Log.w("GroupChatViewModel", "OpenIM 未登录，跳过注册消息监听器")
-            return
-        }
-        
-        textMessageListener = object : OnAdvanceMsgListener {
-            override fun onRecvNewMessage(msg: Message?) {
-                msg?.let {
-                    // 检查是否是当前群聊的消息
-                    if (it.groupID == groupId) {
-                        val chatItem = ChatItem.convertToChatItem(msg, context, avatar = null)
-                        chatItem?.let {
-                            chatData = listOf(it) + chatData
-                            goToNew = true
-                        }
-                    }
-                }
-            }
-        }
-        OpenIMClient.getInstance().messageManager.setAdvancedMsgListener(textMessageListener)
+    override fun getConversationParams(): Triple<String, Int, Boolean> {
+        // 根据群组类型决定ConversationType，这里假设是普通群聊
+        return Triple(groupId, ConversationType.GROUP_CHAT, false)
     }
 
-    fun UnRegistListener() {
-        // OpenIM SDK 不需要显式移除监听器，只需要设置为 null
-        textMessageListener = null
+    override fun getLogTag(): String {
+        return "GroupChatViewModel"
     }
 
-    fun clearUnRead() {
-        val conversationID = "group_${groupId}"
-        OpenIMClient.getInstance().messageManager.markConversationMessageAsRead(
-            conversationID,
-            object : OnBase<String> {
-                override fun onSuccess(data: String?) {
-                    Log.i("openim", "清除群聊未读消息成功")
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.i("openim", "清除群聊未读消息失败, code:$code, error:$error")
-                }
-            }
-        )
+    override fun handleNewMessage(message: Message, context: Context): Boolean {
+        // 检查是否是当前群聊的消息
+        return message.groupID == groupId
     }
 
-    fun onLoadMore(context: Context) {
-        if (!hasMore || isLoading) return
-        isLoading = true
-        viewModelScope.launch {
-            val conversationID = "group_${groupId}"
-            
-            OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList(
-                object : OnBase<AdvancedMessage> {
-                    override fun onSuccess(data: AdvancedMessage?) {
-                        val messages = data?.messageList ?: emptyList()
-                        chatData = chatData + messages.map {
-                            ChatItem.convertToChatItem(it, context, avatar = null)
-                        }.filterNotNull()
-                        
-                        if (messages.size < 20) {
-                            hasMore = false
-                        }
-                        lastMessage = messages.lastOrNull()
-                        isLoading = false
-                    }
+    override fun getReceiverInfo(): Pair<String?, String?> {
+        return Pair(null, groupId) // (recvID, groupID)
+    }
 
-                    override fun onError(code: Int, error: String?) {
-                        Log.e("GroupChatViewModel", "获取群聊历史消息失败: $error")
-                        isLoading = false
-                    }
-                },
-                conversationID,
-                lastMessage,
-                20,
-                ViewType.History
-            )
+    override fun getMessageAvatar(message: Message): String? {
+        // 群聊中，如果是自己发送的消息显示自己的头像，否则为null（由ChatItem处理）
+        return if (message.sendID == com.aiosman.ravenow.AppState.profile?.trtcUserId) {
+            myProfile?.avatar
+        } else {
+            null
         }
     }
 
-    fun sendMessage(message: String, context: Context) {
-        // 检查 OpenIM 是否已登录
-        if (!com.aiosman.ravenow.AppState.enableChat) {
-            android.util.Log.w("GroupChatViewModel", "OpenIM 未登录，无法发送消息")
-            return
-        }
-        
-        val textMessage = OpenIMClient.getInstance().messageManager.createTextMessage(message)
-        
-        OpenIMClient.getInstance().messageManager.sendMessage(
-            object : OnMsgSendCallback {
-                override fun onProgress(progress: Long) {
-                    // 发送进度
-                }
-                
-                override fun onError(code: Int, error: String?) {
-                    Log.e("GroupChatViewModel", "发送群聊消息失败: $error")
-                }
-                
-                override fun onSuccess(data: Message?) {
-                    sendChatAiMessage(message = message, trtcGroupId = groupId)
-                    data?.let { sentMessage ->
-                        val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
-                        chatItem?.let {
-                            chatData = listOf(it) + chatData
-                            goToNew = true
-                        }
-                    }
-                }
-            },
-            textMessage,
-            null, // recvID (群聊为 null)
-            groupId, // groupID
-            null // offlinePushInfo
-        )
+    override fun onMessageSentSuccess(message: String, sentMessage: Message?) {
+        // 群聊特有的处理逻辑
+        sendChatAiMessage(message = message, trtcGroupId = groupId)
     }
 
 
@@ -216,107 +104,6 @@ class GroupChatViewModel(
         viewModelScope.launch {
             val response = ApiClient.api.sendChatAiMessage(SendChatAiRequestBody(trtcGroupId = trtcGroupId,message = message))
         }
-
-    }
-
-    fun sendImageMessage(imageUri: Uri, context: Context) {
-        val tempFile = createTempFile(context, imageUri)
-        val imagePath = tempFile?.path
-        if (imagePath != null) {
-            val imageMessage = OpenIMClient.getInstance().messageManager.createImageMessageFromFullPath(imagePath)
-            
-            OpenIMClient.getInstance().messageManager.sendMessage(
-                object : OnMsgSendCallback {
-                    override fun onProgress(progress: Long) {
-                        Log.d("GroupChatViewModel", "发送群聊图片消息进度: $progress")
-                    }
-                    
-                    override fun onError(code: Int, error: String?) {
-                        Log.e("GroupChatViewModel", "发送群聊图片消息失败: $error")
-                    }
-                    
-                    override fun onSuccess(data: Message?) {
-                        data?.let { sentMessage ->
-                            val chatItem = ChatItem.convertToChatItem(sentMessage, context, avatar = myProfile?.avatar)
-                            chatItem?.let {
-                                chatData = listOf(it) + chatData
-                                goToNew = true
-                            }
-                        }
-                    }
-                },
-                imageMessage,
-                null, // recvID (群聊为 null)
-                groupId, // groupID
-                null // offlinePushInfo
-            )
-        }
-    }
-
-    fun createTempFile(context: Context, uri: Uri): File? {
-        return try {
-            val projection = arrayOf(MediaStore.Images.Media.DATA)
-            val cursor = context.contentResolver.query(uri, projection, null, null, null)
-            cursor?.use {
-                if (it.moveToFirst()) {
-                    val columnIndex = it.getColumnIndexOrThrow(MediaStore.Images.Media.DATA)
-                    val filePath = it.getString(columnIndex)
-                    val inputStream: InputStream? = context.contentResolver.openInputStream(uri)
-                    val mimeType = context.contentResolver.getType(uri)
-                    val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)
-                    val tempFile =
-                        File.createTempFile("temp_image", ".$extension", context.cacheDir)
-                    val outputStream = FileOutputStream(tempFile)
-
-                    inputStream?.use { input ->
-                        outputStream.use { output ->
-                            input.copyTo(output)
-                        }
-                    }
-                    tempFile
-                } else {
-                    null
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            null
-        }
-    }
-
-    fun fetchHistoryMessage(context: Context) {
-        val conversationID = "group_${groupId}"
-        
-        OpenIMClient.getInstance().messageManager.getAdvancedHistoryMessageList(
-            object : OnBase<AdvancedMessage> {
-                override fun onSuccess(data: AdvancedMessage?) {
-                    val messages = data?.messageList ?: emptyList()
-                    chatData = messages.mapNotNull {
-                        ChatItem.convertToChatItem(it, context, avatar = null)
-                    }
-                    if (messages.size < 20) {
-                        hasMore = false
-                    }
-                    lastMessage = messages.lastOrNull()
-                }
-
-                override fun onError(code: Int, error: String?) {
-                    Log.e("GroupChatViewModel", "获取群聊历史消息失败: $error")
-                }
-            },
-            conversationID,
-            null,
-            20,
-            ViewType.History
-        )
-    }
-
-    fun getDisplayChatList(): List<ChatItem> {
-        val list = chatData
-        for (item in list) {
-            item.showTimestamp = showTimestampMap.getOrDefault(item.msgId, false)
-        }
-        return list
     }
 
 }

app/src/main/java/com/aiosman/ravenow/ui/composables/EditCommentBottomModal.kt

@@ -160,7 +160,7 @@ fun EditCommentBottomModal(
                             painter = painterResource(id = R.mipmap.rider_pro_moment_post),
                             contentDescription = "Send",
                             modifier = Modifier
-                                .size(25.dp)
+                                .size(20.dp)
                                 .align(Alignment.Top)
                                 .noRippleClickable {
                                     if (text.isNotEmpty()) {
@@ -168,7 +168,7 @@ fun EditCommentBottomModal(
                                         text = ""
                                     }
                                 },
-                            tint = if (isNotEmpty) AppColors.main else AppColors.nonActive
+                            tint = if (isNotEmpty) Color.Unspecified else AppColors.nonActive
                         )
                     }
                 }

app/src/main/java/com/aiosman/ravenow/ui/composables/TabItem.kt

@@ -37,12 +37,12 @@ fun TabItem(
     ) {
         Text(
             text = text,
-            fontSize = 14.sp,
+            fontSize = 15.sp,
             color = if (isSelected) AppColors.tabSelectedText else AppColors.tabUnselectedText,
             modifier = Modifier
-                .clip(RoundedCornerShape(8.dp))
+                .clip(RoundedCornerShape(12.dp))
                 .background(if (isSelected) AppColors.tabSelectedBackground else AppColors.tabUnselectedBackground)
-                .padding(horizontal = 11.dp, vertical = 4.dp)
+                .padding(horizontal = 16.dp, vertical = 8.dp)
         )
     }
 }

app/src/main/java/com/aiosman/ravenow/ui/group/CreateGroupChatViewModel.kt

@@ -23,8 +23,6 @@ import com.aiosman.ravenow.exp.formatChatTime
 import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.navigateToChat
 import com.aiosman.ravenow.utils.TrtcHelper
-// 临时兼容层 - TODO: 完成 OpenIM 迁移后删除
-import com.aiosman.ravenow.compat.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch

app/src/main/java/com/aiosman/ravenow/ui/index/Index.kt

@@ -91,6 +91,7 @@ fun IndexScreen() {
     val navController = LocalNavController.current
     val item = listOf(
         NavigationItem.Home,
+        //NavigationItem.Dynamic,
         NavigationItem.Ai,
         NavigationItem.Add,
         NavigationItem.Notification,
@@ -101,7 +102,7 @@ fun IndexScreen() {
     val coroutineScope = rememberCoroutineScope()
     val drawerState = rememberDrawerState(DrawerValue.Closed)
     val context = LocalContext.current
-    
+
     // 注意：不要在离开 Index 路由时全量清理资源，以免返回后列表被重置
     LaunchedEffect(Unit) {
         systemUiController.setNavigationBarColor(Color.Transparent)
@@ -295,7 +296,7 @@ fun IndexScreen() {
                                                 navController.navigate(NavigationRoute.NewPost.route)
                                                 return@noRippleClickable
                                             }
-                                            
+
                                             // 检查消息tab的游客模式
                                             if (it.route === NavigationItem.Notification.route) {
                                                 if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.VIEW_MESSAGES)) {
@@ -303,7 +304,7 @@ fun IndexScreen() {
                                                     return@noRippleClickable
                                                 }
                                             }
-                                            
+
                                             // 检查我的tab的游客模式
                                             if (it.route === NavigationItem.Profile.route) {
                                                 if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.VIEW_PROFILE)) {
@@ -311,7 +312,7 @@ fun IndexScreen() {
                                                     return@noRippleClickable
                                                 }
                                             }
-                                            
+
                                             coroutineScope.launch {
                                                 pagerState.scrollToPage(idx)
                                             }
@@ -378,8 +379,8 @@ fun IndexScreen() {
                         userScrollEnabled = false
                     ) { page ->
                         when (page) {
-                            0 -> Home()
-                            1 -> Agent()
+                            0 -> Agent()
+                            1 -> Home()
                             2 -> Add()
                             3 -> Notifications()
                             4 -> Profile()
@@ -396,13 +397,13 @@ fun IndexScreen() {
 fun Home() {
     val systemUiController = rememberSystemUiController()
     val context = LocalContext.current
-    
+
     LaunchedEffect(AppState.darkMode) {
         systemUiController.setStatusBarColor(Color.Transparent, darkIcons = !AppState.darkMode)
     }
-    
+
     // 注意：避免在离开 Home 时清理动态资源，防止返回详情后触发重新加载
-    
+
     Column(
         modifier = Modifier
             .fillMaxSize(),
@@ -418,18 +419,18 @@ fun Home() {
 fun Street() {
     val systemUiController = rememberSystemUiController()
     val context = LocalContext.current
-    
+
     LaunchedEffect(AppState.darkMode) {
         systemUiController.setStatusBarColor(Color.Transparent, darkIcons = !AppState.darkMode)
     }
-    
+
     // 页面退出时清理搜索相关资源
     DisposableEffect(Unit) {
         onDispose {
             ResourceCleanupManager.cleanupPageResources("search")
         }
     }
-    
+
     Column(
         modifier = Modifier
             .fillMaxSize(),
@@ -478,18 +479,18 @@ fun Video() {
 fun Profile() {
     val systemUiController = rememberSystemUiController()
     val context = LocalContext.current
-    
+
     LaunchedEffect(AppState.darkMode) {
         systemUiController.setStatusBarColor(Color.Transparent, !AppState.darkMode)
     }
-    
+
     // 页面退出时清理个人资料相关资源
     DisposableEffect(Unit) {
         onDispose {
             ResourceCleanupManager.cleanupPageResources("profile")
         }
     }
-    
+
     Column(
         modifier = Modifier
             .fillMaxSize(),
@@ -504,18 +505,18 @@ fun Profile() {
 fun Notifications() {
     val systemUiController = rememberSystemUiController()
     val context = LocalContext.current
-    
+
     LaunchedEffect(AppState.darkMode) {
         systemUiController.setStatusBarColor(Color.Transparent, !AppState.darkMode)
     }
-    
+
     // 页面退出时清理消息相关资源
     DisposableEffect(Unit) {
         onDispose {
             ResourceCleanupManager.cleanupPageResources("message")
         }
     }
-    
+
     Column(
         modifier = Modifier
             .fillMaxSize(),

app/src/main/java/com/aiosman/ravenow/ui/index/NavigationItem.kt

@@ -22,10 +22,15 @@ sealed class NavigationItem(
     )
 
     data object Ai : NavigationItem("Ai",
-        icon = { R.drawable.rider_pro_nav_ai },
-        selectedIcon = { R.mipmap.rider_pro_nav_ai_hl },
-        label = { stringResource(R.string.main_ai) }
+        icon = { R.mipmap.bars_x_buttons_discover_bold},
+        selectedIcon = { R.mipmap.dynamic_hl },
+        label = { stringResource(R.string.index_dynamic) }
     )
+//    data object Ai : NavigationItem("Ai",
+//        icon = { R.drawable.rider_pro_nav_ai },
+//        selectedIcon = { R.mipmap.rider_pro_nav_ai_hl },
+//        label = { stringResource(R.string.main_ai) }
+//    )
 
     data object Add : NavigationItem("Add",
         icon = { R.drawable.ic_nav_add },

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/ai/Agent.kt

@@ -43,6 +43,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -60,6 +61,7 @@ import com.aiosman.ravenow.ui.index.tabs.ai.tabs.hot.HotAgent
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.composables.TabItem
 import com.aiosman.ravenow.ui.composables.TabSpacer
+import com.aiosman.ravenow.ui.index.tabs.moment.CustomTabItem
 import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.AgentItem
 import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.ExploreViewModel
 import com.aiosman.ravenow.utils.DebounceUtils
@@ -101,7 +103,7 @@ fun Agent() {
         modifier = Modifier
             .fillMaxSize()
             .padding(
-                top = statusBarPaddingValues.calculateTopPadding()+18.dp,
+                top = statusBarPaddingValues.calculateTopPadding(),
                 bottom = navigationBarPaddings,
                 start = 16.dp,
                 end = 16.dp
@@ -111,92 +113,178 @@ fun Agent() {
         Row(
             modifier = Modifier
                 .wrapContentHeight()
+                .height(44.dp)
                 .fillMaxWidth(),
             horizontalArrangement = Arrangement.Start,
             verticalAlignment = Alignment.CenterVertically
         ) {
-            // 搜索框
-            Row(
+            androidx.compose.material3.Text(
+                text = "Rave AI",
+                fontSize = 20.sp,
+                fontWeight = FontWeight.W900,
+                color = AppColors.text,
                 modifier = Modifier
-                    .height(36.dp)
-                    .weight(1f)
-                    .clip(shape = RoundedCornerShape(8.dp))
-                    .background(AppColors.inputBackground)
-                    .padding(horizontal = 8.dp, vertical = 0.dp)
-                    .noRippleClickable {
-                        // 搜索框点击事件
-                    },
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Icon(
-                    painter = painterResource(id = R.drawable.rider_pro_nav_search),
-                    contentDescription = null,
-                    tint = AppColors.inputHint
-                )
-                Box {
-                    Text(
-                        text = stringResource(R.string.search),
-                        modifier = Modifier.padding(start = 8.dp),
-                        color = AppColors.inputHint,
-                        fontSize = 17.sp
-                    )
-                }
-            }
-            Spacer(modifier = Modifier.width(16.dp))
-            // 新增
-            Icon(
+                    .align(Alignment.CenterVertically)
+            )
+
+            Spacer(modifier = Modifier.weight(1f))
+
+            Image(
+                painter = painterResource(id = R.drawable.rider_pro_nav_search),
+                contentDescription = "search",
                 modifier = Modifier
-                    .size(36.dp)
+                    .size(24.dp)
                     .noRippleClickable {
-                        if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
-                            // 检查游客模式，如果是游客则跳转登录
-                            if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.CREATE_AGENT)) {
-                                navController.navigate(NavigationRoute.Login.route)
-                            } else {
-                                // 导航到添加智能体页面
-                                navController.navigate(
-                                    NavigationRoute.AddAgent.route
-                                )
-                            }
-                        }) {
-                            lastClickTime = System.currentTimeMillis()
-                        }
+                        navController.navigate(NavigationRoute.Search.route)
                     },
-                painter = painterResource(id = R.drawable.rider_pro_new_post_add_pic),
-                contentDescription = null,
-                tint = AppColors.text
+                colorFilter = ColorFilter.tint(AppColors.text)
             )
         }
-        // 推荐Agent
+        Spacer(modifier = Modifier.height(15.dp))
+//            // 搜索框
+//            Row(
+//                modifier = Modifier
+//                    .height(36.dp)
+//                    .weight(1f)
+//                    .clip(shape = RoundedCornerShape(8.dp))
+//                    .background(AppColors.inputBackground)
+//                    .padding(horizontal = 8.dp, vertical = 0.dp)
+//                    .noRippleClickable {
+//                        // 搜索框点击事件
+//                    },
+//                verticalAlignment = Alignment.CenterVertically
+//            ) {
+//                Icon(
+//                    painter = painterResource(id = R.drawable.rider_pro_nav_search),
+//                    contentDescription = null,
+//                    tint = AppColors.inputHint
+//                )
+//                Box {
+//                    Text(
+//                        text = stringResource(R.string.search),
+//                        modifier = Modifier.padding(start = 8.dp),
+//                        color = AppColors.inputHint,
+//                        fontSize = 17.sp
+//                    )
+//                }
+//            }
+//            Spacer(modifier = Modifier.width(16.dp))
+//            // 创建智能体
+//            Icon(
+//                modifier = Modifier
+//                    .size(36.dp)
+//                    .noRippleClickable {
+//                        if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
+//                            // 检查游客模式，如果是游客则跳转登录
+//                            if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.CREATE_AGENT)) {
+//                                navController.navigate(NavigationRoute.Login.route)
+//                            } else {
+//                                // 导航到添加智能体页面
+//                                navController.navigate(
+//                                    NavigationRoute.AddAgent.route
+//                                )
+//                            }
+//                        }) {
+//                            lastClickTime = System.currentTimeMillis()
+//                        }
+//                    },
+//                painter = painterResource(id = R.drawable.rider_pro_new_post_add_pic),
+//                contentDescription = null,
+//                tint = AppColors.text
+//            )
+
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(260.dp)
+                    .height(400.dp)
                     .padding(vertical = 8.dp)
 
             ) {
-                // 标题
+
+//                // 标题
+//                Row(
+//                    verticalAlignment = Alignment.CenterVertically,
+//                    modifier = Modifier.padding(bottom = 12.dp)
+//                ) {
+//                    Image(
+//                        painter = painterResource(R.mipmap.rider_pro_agent2),
+//                        contentDescription = "agent",
+//                        modifier = Modifier.size(28.dp),
+//
+//                        )
+//                    Spacer(modifier = Modifier.width(4.dp))
+//                    androidx.compose.material3.Text(
+//                        text = stringResource(R.string.agent_recommend_agent),
+//                        fontSize = 16.sp,
+//                        fontWeight = androidx.compose.ui.text.font.FontWeight.W600,
+//                        color = AppColors.text
+//                    )
+//                }
+
+                // 标签页
                 Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.padding(bottom = 12.dp)
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .wrapContentHeight()
+                        .padding( bottom = 16.dp),
+                    horizontalArrangement = Arrangement.Start,
+                    verticalAlignment = Alignment.Bottom
                 ) {
-                    Image(
-                        painter = painterResource(R.mipmap.rider_pro_agent2),
-                        contentDescription = "agent",
-                        modifier = Modifier.size(28.dp),
-
-                        )
-                    Spacer(modifier = Modifier.width(4.dp))
-                    androidx.compose.material3.Text(
-                        text = stringResource(R.string.agent_recommend_agent),
-                        fontSize = 16.sp,
-                        fontWeight = androidx.compose.ui.text.font.FontWeight.W600,
-                        color = AppColors.text
+                    // 推荐标签（默认选中）
+                    CustomTabItem(
+                        text = stringResource(R.string.agent_recommend),
+                        isSelected = true,
+                        onClick = {
+                            // TODO: 实现点击切换逻辑
+                        }
                     )
-                }
 
+                    TabSpacer()
+
+                    // Scenes标签
+                    CustomTabItem(
+                        text = "scenes",
+                        isSelected = false,
+                        onClick = {
+                            // TODO: 实现点击切换逻辑
+                        }
+                    )
+
+                    TabSpacer()
+
+                    // Voices标签
+                    CustomTabItem(
+                        text = "voices",
+                        isSelected = false,
+                        onClick = {
+                            // TODO: 实现点击切换逻辑
+                        }
+                    )
+
+                    TabSpacer()
+
+                    // Anime标签
+                    CustomTabItem(
+                        text = "anime",
+                        isSelected = false,
+                        onClick = {
+                            // TODO: 实现点击切换逻辑
+                        }
+                    )
+
+//                    TabSpacer()
+//
+//                    // Assist标签
+//                    CustomTabItem(
+//                        text = "assist",
+//                        isSelected = false,
+//                        onClick = {
+//                            // TODO: 实现点击切换逻辑
+//                        }
+//                    )
+                }
                 // Agent ViewPager
-                AgentViewPagerSection(agentItems = viewModel.agentItems.take(9),viewModel)
+                AgentViewPagerSection(agentItems = viewModel.agentItems.take(15),viewModel)
             }
 
         Spacer(modifier = Modifier.height(0.dp))
@@ -312,8 +400,8 @@ fun Agent() {
 fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel) {
     val AppColors = LocalAppTheme.current
 
-    // 每页显示3个agent
-    val itemsPerPage = 3
+    // 每页显示5个agent
+    val itemsPerPage = 5
     val totalPages = (agentItems.size + itemsPerPage - 1) / itemsPerPage
 
     if (totalPages > 0) {
@@ -323,7 +411,7 @@ fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel)
             // Agent内容
             Box(
                 modifier = Modifier
-                    .height(180.dp)
+                    .height(300.dp)
             ) {
                 HorizontalPager(
                     state = pagerState,
@@ -344,7 +432,8 @@ fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel)
                         viewModel = viewModel,
                         agentItems = agentItems.drop(page * itemsPerPage).take(itemsPerPage),
                         page = page,
-                        modifier = Modifier.height(180.dp)
+                        modifier = Modifier
+                            .height(300.dp)
                             .graphicsLayer {
                                 scaleX = scale
                                 scaleY = scale
@@ -368,7 +457,9 @@ fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel)
                             .padding(horizontal = 4.dp)
                             .size(3.dp)
                             .background(
-                                color = if (pagerState.currentPage == index) AppColors.text else AppColors.secondaryText.copy(alpha = 0.3f),
+                                color = if (pagerState.currentPage == index) AppColors.text else AppColors.secondaryText.copy(
+                                    alpha = 0.3f
+                                ),
                                 shape = androidx.compose.foundation.shape.CircleShape
                             )
                     )
@@ -416,8 +507,8 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
                 .background(Color(0xFFF5F5F5), RoundedCornerShape(24.dp))
                 .clickable {
                     if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
-                        viewModel.goToProfile(agentItem.openId, navController)
-                    }) {
+                            viewModel.goToProfile(agentItem.openId, navController)
+                        }) {
                         lastClickTime = System.currentTimeMillis()
                     }
                 },
@@ -482,14 +573,17 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
                 )
                 .clickable {
                     if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
-                        // 检查游客模式，如果是游客则跳转登录
-                        if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.CHAT_WITH_AGENT)) {
-                            navController.navigate(NavigationRoute.Login.route)
-                        } else {
-                            viewModel.createSingleChat(agentItem.openId)
-                            viewModel.goToChatAi(agentItem.openId, navController = navController)
-                        }
-                    }) {
+                            // 检查游客模式，如果是游客则跳转登录
+                            if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.CHAT_WITH_AGENT)) {
+                                navController.navigate(NavigationRoute.Login.route)
+                            } else {
+                                viewModel.createSingleChat(agentItem.openId)
+                                viewModel.goToChatAi(
+                                    agentItem.openId,
+                                    navController = navController
+                                )
+                            }
+                        }) {
                         lastClickTime = System.currentTimeMillis()
                     }
                 },

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt

@@ -140,143 +140,183 @@ fun NotificationsScreen() {
             Column(
                 modifier = Modifier.fillMaxSize(),
             ) {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 15.dp),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Box(
+                    Row(
                         modifier = Modifier
-                            .size(24.dp)
-                    )
-                    Column(
-                        modifier = Modifier
-                            .weight(1f)
-                            .align(Alignment.CenterVertically),
-                        horizontalAlignment = Alignment.CenterHorizontally
+                            .fillMaxWidth()
+                            .height(44.dp)
+                            .padding(horizontal = 16.dp),
+                        horizontalArrangement = Arrangement.Start,
+                        verticalAlignment = Alignment.CenterVertically
                     ) {
                         Text(
                             text = stringResource(R.string.main_message),
-                            fontSize = 17.sp,
-                            fontWeight = FontWeight.W700,
+                            fontSize = 20.sp,
+                            fontWeight = FontWeight.W900,
                             color = AppColors.text
                         )
-                    }
 
-                    Image(
-                        painter = painterResource(id = R.drawable.rider_pro_group),
-                        contentDescription = "add",
-                        modifier = Modifier
-                            .size(24.dp)
-                            .noRippleClickable {
-                                debouncer {
-                                    navController.navigate(NavigationRoute.CreateGroupChat.route)
-                                }
-                            },
-                        colorFilter = ColorFilter.tint(AppColors.text)
-                    )
+                        Spacer(modifier = Modifier.weight(1f))
 
-
-
-                }
-                // 搜索栏//
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp, vertical = 8.dp)
-                        .height(40.dp)
-
-                        .noRippleClickable {
-                        },
-                    contentAlignment = Alignment.CenterStart
-                ) {
-                    Row(
-                        modifier = Modifier
-                            .height(36.dp)
-                            .fillMaxWidth()
-                            .clip(shape = RoundedCornerShape(8.dp))
-                            .background(AppColors.inputBackground)
-                            .padding(horizontal = 8.dp, vertical = 0.dp)
-                            .noRippleClickable {
-                                // 搜索框点击事件
-                            },
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Icon(
+                        Image(
                             painter = painterResource(id = R.drawable.rider_pro_nav_search),
-                            contentDescription = null,
-                            tint = AppColors.inputHint
+                            contentDescription = "search",
+                            modifier = Modifier
+                                .size(24.dp)
+                                .noRippleClickable {
+                                    // TODO: 实现搜索功能
+                                },
+                            colorFilter = ColorFilter.tint(AppColors.text)
                         )
+
+                        Spacer(modifier = Modifier.width(16.dp))
+
                         Box {
-                            androidx.compose.material.Text(
-                                text = stringResource(R.string.search),
-                                modifier = Modifier.padding(start = 8.dp),
-                                color = AppColors.inputHint,
-                                fontSize = 17.sp
+                            Image(
+                                painter = painterResource(id = R.drawable.rider_pro_notification),
+                                contentDescription = "notifications",
+                                modifier = Modifier
+                                    .size(24.dp)
+                                    .noRippleClickable {
+                                        // TODO: 实现通知功能
+                                    },
+                                colorFilter = ColorFilter.tint(AppColors.text)
                             )
-                        }
-                    }
-                }
 
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp),
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    val likeDebouncer = rememberDebouncer()
-                    val followDebouncer = rememberDebouncer()
-                    val commentDebouncer = rememberDebouncer()
+                            // 通知红点
+                            val totalNoticeCount = MessageListViewModel.likeNoticeCount +
+                                    MessageListViewModel.followNoticeCount +
+                                    MessageListViewModel.commentNoticeCount +
+                                    MessageListViewModel.favouriteNoticeCount
 
-                    NotificationIndicator(
-                        MessageListViewModel.likeNoticeCount,
-                        R.mipmap.rider_pro_like,
-                        stringResource(R.string.like_upper),
-                        Color(0xFFFAFD5D)
-                    ) {
-                        likeDebouncer {
-                            if (MessageListViewModel.likeNoticeCount > 0) {
-                                // 刷新点赞消息列表
-                                LikeNoticeViewModel.isFirstLoad = true
-                                // 清除点赞消息数量
-                                MessageListViewModel.clearLikeNoticeCount()
+                            if (totalNoticeCount > 0) {
+                                Box(
+                                    modifier = Modifier
+                                        .size(8.dp)
+                                        .background(
+                                            color = Color(0xFFFF3B30),
+                                            shape = CircleShape
+                                        )
+                                        .align(Alignment.TopEnd)
+                                        .offset(x = 8.dp, y = (-4).dp)
+                                )
                             }
-                            navController.navigate(NavigationRoute.Likes.route)
                         }
                     }
-                    NotificationIndicator(
-                        MessageListViewModel.followNoticeCount,
-                        R.mipmap.rider_pro_followers,
-                        stringResource(R.string.followers_upper),
-                        Color(0xFFF470FE)
-                    ) {
-                        followDebouncer {
-                            if (MessageListViewModel.followNoticeCount > 0) {
-                                // 刷新关注消息列表
-                                FollowerNoticeViewModel.isFirstLoad = true
-                                MessageListViewModel.clearFollowNoticeCount()
-                            }
-                            navController.navigate(NavigationRoute.Followers.route)
-                        }
-                    }
-                    NotificationIndicator(
-                        MessageListViewModel.commentNoticeCount,
-                        R.mipmap.rider_pro_comment,
-                        stringResource(R.string.comment).uppercase(),
-                        Color(0xFF6246FF)
-                    ) {
-                        commentDebouncer {
-                            navController.navigate(NavigationRoute.CommentNoticeScreen.route)
-                        }
-                    }
-                }
+
+                //创建群聊//
+//                    Image(
+//                        painter = painterResource(id = R.drawable.rider_pro_group),
+//                        contentDescription = "add",
+//                        modifier = Modifier
+//                            .size(24.dp)
+//                            .noRippleClickable {
+//                                debouncer {
+//                                    navController.navigate(NavigationRoute.CreateGroupChat.route)
+//                                }
+//                            },
+//                        colorFilter = ColorFilter.tint(AppColors.text)
+//                    )
+
+
+//                // 搜索栏//
+//                Box(
+//                    modifier = Modifier
+//                        .fillMaxWidth()
+//                        .padding(horizontal = 16.dp, vertical = 8.dp)
+//                        .height(40.dp)
+//
+//                        .noRippleClickable {
+//                        },
+//                    contentAlignment = Alignment.CenterStart
+//                )
+//                {
+//                    Row(
+//                        modifier = Modifier
+//                            .height(36.dp)
+//                            .fillMaxWidth()
+//                            .clip(shape = RoundedCornerShape(8.dp))
+//                            .background(AppColors.inputBackground)
+//                            .padding(horizontal = 8.dp, vertical = 0.dp)
+//                            .noRippleClickable {
+//                                // 搜索框点击事件
+//                            },
+//                        verticalAlignment = Alignment.CenterVertically
+//                    ) {
+//                        Icon(
+//                            painter = painterResource(id = R.drawable.rider_pro_nav_search),
+//                            contentDescription = null,
+//                            tint = AppColors.inputHint
+//                        )
+//                        Box {
+//                            androidx.compose.material.Text(
+//                                text = stringResource(R.string.search),
+//                                modifier = Modifier.padding(start = 8.dp),
+//                                color = AppColors.inputHint,
+//                                fontSize = 17.sp
+//                            )
+//                        }
+//                    }
+//                }
+
+                //赞、粉丝、评论//
+//                Row(
+//                    modifier = Modifier
+//                        .fillMaxWidth()
+//                        .padding(horizontal = 16.dp),
+//                    horizontalArrangement = Arrangement.SpaceBetween,
+//                ) {
+//                    val likeDebouncer = rememberDebouncer()
+//                    val followDebouncer = rememberDebouncer()
+//                    val commentDebouncer = rememberDebouncer()
+//
+//                    NotificationIndicator(
+//                        MessageListViewModel.likeNoticeCount,
+//                        R.mipmap.rider_pro_like,
+//                        stringResource(R.string.like_upper),
+//                        Color(0xFFFAFD5D)
+//                    ) {
+//                        likeDebouncer {
+//                            if (MessageListViewModel.likeNoticeCount > 0) {
+//                                // 刷新点赞消息列表
+//                                LikeNoticeViewModel.isFirstLoad = true
+//                                // 清除点赞消息数量
+//                                MessageListViewModel.clearLikeNoticeCount()
+//                            }
+//                            navController.navigate(NavigationRoute.Likes.route)
+//                        }
+//                    }
+//                    NotificationIndicator(
+//                        MessageListViewModel.followNoticeCount,
+//                        R.mipmap.rider_pro_followers,
+//                        stringResource(R.string.followers_upper),
+//                        Color(0xFFF470FE)
+//                    ) {
+//                        followDebouncer {
+//                            if (MessageListViewModel.followNoticeCount > 0) {
+//                                // 刷新关注消息列表
+//                                FollowerNoticeViewModel.isFirstLoad = true
+//                                MessageListViewModel.clearFollowNoticeCount()
+//                            }
+//                            navController.navigate(NavigationRoute.Followers.route)
+//                        }
+//                    }
+//                    NotificationIndicator(
+//                        MessageListViewModel.commentNoticeCount,
+//                        R.mipmap.rider_pro_comment,
+//                        stringResource(R.string.comment).uppercase(),
+//                        Color(0xFF6246FF)
+//                    ) {
+//                        commentDebouncer {
+//                            navController.navigate(NavigationRoute.CommentNoticeScreen.route)
+//                        }
+//                    }
+//                }
+                Spacer(modifier = Modifier.height(23.dp))
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
                         .wrapContentHeight()
                         .padding(start = 16.dp,bottom = 16.dp),
-                    // center the tabs
                     horizontalArrangement = Arrangement.Start,
                     verticalAlignment = Alignment.Bottom
                 ) {

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/AgentChatListViewModel.kt

@@ -24,8 +24,10 @@ import com.aiosman.ravenow.ui.navigateToChatAi
 import io.openim.android.sdk.OpenIMClient
 import io.openim.android.sdk.listener.OnBase
 import io.openim.android.sdk.models.ConversationInfo
+import io.openim.android.sdk.models.Message
 import kotlinx.coroutines.launch
 import kotlin.coroutines.suspendCoroutine
+import com.aiosman.ravenow.utils.MessageParser
 
 data class AgentConversation(
     val id: String,
@@ -43,39 +45,19 @@ data class AgentConversation(
             val lastMessage = Calendar.getInstance().apply {
                 timeInMillis = conversation.latestMsgSendTime
             }
-            var displayText = conversation.latestMsg?: ""
-//            when (conversation.latestMsg) {
-//                101 -> { // TEXT
-//                    displayText = conversation.latestMsg?: ""
-//                }
-//                102 -> { // IMAGE
-//                    displayText = "[图片]"
-//                }
-//                103 -> { // AUDIO
-//                    displayText = "[语音]"
-//                }
-//                104 -> { // VIDEO
-//                    displayText = "[视频]"
-//                }
-//                105 -> { // FILE
-//                    displayText = "[文件]"
-//                }
-//                else -> {
-//                    displayText = "[消息]"
-//                }
-//            }
+            
+            // 解析最新消息
+            val (displayText, isSelf) = MessageParser.parseLatestMessage(conversation.latestMsg)
             return AgentConversation(
                 id = conversation.conversationID,
                 nickname = conversation.showName ?: "",
-                lastMessage = conversation.latestMsg ?: "",
+                lastMessage = displayText, // 使用解析后的显示文本
                 lastMessageTime = lastMessage.time.formatChatTime(context),
                 avatar = "${ApiClient.BASE_API_URL+"/"}${conversation.faceURL}"+"?token="+"${AppStore.token}".replace("storage/avatars/", "/avatar/"),
                 unreadCount = conversation.unreadCount,
                 trtcUserId = conversation.userID ?: "",
                 displayText = displayText,
-                // TODO: openim latestMsg
-                isSelf = false,
-//                isSelf = conversation.latestMsg?.sendID == AppState.profile?.trtcUserId
+                isSelf = isSelf // 使用解析后的发送者信息
             )
         }
     }

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/FriendChatListViewModel.kt

@@ -21,8 +21,10 @@ import com.aiosman.ravenow.data.api.ApiClient
 import io.openim.android.sdk.OpenIMClient
 import io.openim.android.sdk.listener.OnBase
 import io.openim.android.sdk.models.ConversationInfo
+import io.openim.android.sdk.models.Message
 import kotlinx.coroutines.launch
 import kotlin.coroutines.suspendCoroutine
+import com.aiosman.ravenow.utils.MessageParser
 
 data class FriendConversation(
     val id: String,
@@ -40,17 +42,20 @@ data class FriendConversation(
             val lastMessage = Calendar.getInstance().apply {
                 timeInMillis = conversation.latestMsgSendTime
             }
-            var displayText = conversation.latestMsg
+            
+            // 解析最新消息
+            val (displayText, isSelf) = MessageParser.parseLatestMessage(conversation.latestMsg)
+            
             return FriendConversation(
                 id = conversation.conversationID,
                 nickname = conversation.showName ?: "",
-                lastMessage = conversation.latestMsg ?: "",
+                lastMessage = displayText, // 使用解析后的显示文本
                 lastMessageTime = lastMessage.time.formatChatTime(context),
                 avatar = "${ApiClient.BASE_API_URL+"/"}${conversation.faceURL}"+"?token="+"${AppStore.token}".replace("storage/avatars/", "/avatar/"),
                 unreadCount = conversation.unreadCount,
                 trtcUserId = conversation.userID ?: "",
                 displayText = displayText,
-                isSelf = false
+                isSelf = isSelf // 使用解析后的发送者信息
             )
         }
     }

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListViewModel.kt

@@ -26,8 +26,10 @@ import io.openim.android.sdk.listener.OnAdvanceMsgListener
 import io.openim.android.sdk.listener.OnBase
 import io.openim.android.sdk.listener.OnConversationListener
 import io.openim.android.sdk.models.ConversationInfo
+import io.openim.android.sdk.models.Message
 import kotlinx.coroutines.launch
 import kotlin.coroutines.suspendCoroutine
+import com.aiosman.ravenow.utils.MessageParser
 
 data class GroupConversation(
     val id: String,
@@ -46,12 +48,15 @@ data class GroupConversation(
             val lastMessage = Calendar.getInstance().apply {
                 timeInMillis = conversation.latestMsgSendTime
             }
+            
+            // 解析最新消息
+            val (displayText, isSelf) = MessageParser.parseLatestMessage(conversation.latestMsg)
 
             return GroupConversation(
                 id = conversation.conversationID,
                 groupId = conversation.groupID ?: "",
                 groupName = conversation.showName ?: "",
-                lastMessage = conversation.latestMsg?: "",
+                lastMessage = displayText, // 使用解析后的显示文本
                 lastMessageTime = lastMessage.time.formatChatTime(context),
                 avatar = if (conversation.faceURL.isNullOrEmpty()) {
                     // 将 groupId 转换为 Base64
@@ -64,10 +69,9 @@ data class GroupConversation(
                     "${ApiClient.BASE_API_URL+"/outside/rooms/avatar/"}${conversation.faceURL}"+"?token="+"${AppStore.token}"
                 },
                 unreadCount = conversation.unreadCount,
-                displayText = conversation.latestMsg?: "",
-                isSelf = false,
-                // TODO openim get grouplist
-                memberCount = 0
+                displayText = displayText,
+                isSelf = isSelf, // 使用解析后的发送者信息
+                memberCount = 0 // TODO: 获取群组成员数量
             )
         }
     }

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/Moment.kt

@@ -30,9 +30,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -51,6 +48,12 @@ import com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline.TimelineMomentsLis
 import com.aiosman.ravenow.ui.index.tabs.search.SearchViewModel
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import kotlinx.coroutines.launch
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.ColorFilter
+import com.aiosman.ravenow.ui.composables.TabItem
+import com.aiosman.ravenow.ui.composables.TabSpacer
+import com.aiosman.ravenow.ui.composables.rememberDebouncer
 
 /**
  * 动态列表
@@ -63,8 +66,8 @@ fun MomentsList() {
     val navigationBarPaddings =
         WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() + 48.dp
     val statusBarPaddingValues = WindowInsets.systemBars.asPaddingValues()
-    // 游客模式下不显示timeline，只显示3个tab：Explore、Dynamic、Hot
-    val tabCount = if (AppStore.isGuest) 3 else 4
+    // 游客模式下不显示timeline，只显示2个tab：Dynamic、Hot    // 游客模式下不显示timeline，只显示3个tab：Explore、Dynamic、Hot
+    val tabCount = if (AppStore.isGuest) 2 else 3        // val tabCount = if (AppStore.isGuest) 3 else 4
     var pagerState = rememberPagerState { tabCount }
     var scope = rememberCoroutineScope()
     Column(
@@ -79,154 +82,143 @@ fun MomentsList() {
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .height(44.dp),
+                .height(44.dp)
+                .padding(horizontal = 16.dp),
             // center the tabs
             horizontalArrangement = Arrangement.Start,
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Column(
+            //原探索//
+//            Column(
+//                modifier = Modifier
+//                    .noRippleClickable {
+//                        scope.launch {
+//                            pagerState.animateScrollToPage(0)
+//                        }
+//                    }.padding(start = 16.dp),
+//                verticalArrangement = Arrangement.Center,
+//                horizontalAlignment = Alignment.CenterHorizontally
+//
+//            ) {
+//                Text(
+//                    text = stringResource(R.string.index_worldwide),
+//                    fontSize = if (pagerState.currentPage == 0)18.sp else 16.sp,
+//                    color = if (pagerState.currentPage == 0) AppColors.text else AppColors.nonActiveText,
+//                    fontWeight = FontWeight.W600)
+//                Spacer(modifier = Modifier.height(4.dp))
+//
+//                Image(
+//                    painter = painterResource(
+//                        if (pagerState.currentPage == 0) R.mipmap.tab_indicator_selected
+//                        else R.drawable.tab_indicator_unselected
+//                    ),
+//                    contentDescription = "tab indicator",
+//                    modifier = Modifier
+//                        .width(34.dp)
+//                        .height(4.dp)
+//                )
+//
+//            }
+//            Spacer(modifier = Modifier.width(16.dp))
+            Text(
+                text = stringResource(R.string.moment),
+                fontSize = 20.sp,
+                fontWeight = FontWeight.W900,
+                color = AppColors.text,
                 modifier = Modifier
-                    .noRippleClickable {
-                        scope.launch {
-                            pagerState.animateScrollToPage(0)
-                        }
-                    }.padding(start = 16.dp),
-                verticalArrangement = Arrangement.Center,
-                horizontalAlignment = Alignment.CenterHorizontally
+                    .align(Alignment.CenterVertically)
+            )
 
-            ) {
-                Text(
-                    text = stringResource(R.string.index_worldwide),
-                    fontSize = if (pagerState.currentPage == 0)18.sp else 16.sp,
-                    color = if (pagerState.currentPage == 0) AppColors.text else AppColors.nonActiveText,
-                    fontWeight = FontWeight.W600)
-                Spacer(modifier = Modifier.height(4.dp))
+            Spacer(modifier = Modifier.weight(1f))
 
-                Image(
-                    painter = painterResource(
-                        if (pagerState.currentPage == 0) R.mipmap.tab_indicator_selected
-                        else R.drawable.tab_indicator_unselected
-                    ),
-                    contentDescription = "tab indicator",
-                    modifier = Modifier
-                        .width(34.dp)
-                        .height(4.dp)
-                )
-
-            }
-            Spacer(modifier = Modifier.width(16.dp))
-            Column(
+            Image(
+                painter = painterResource(id = R.drawable.rider_pro_nav_search),
+                contentDescription = "search",
                 modifier = Modifier
+                    .size(24.dp)
                     .noRippleClickable {
-                        scope.launch {
-                            pagerState.animateScrollToPage(1)
-                        }
+                        navController.navigate(NavigationRoute.Search.route)
                     },
-                verticalArrangement = Arrangement.Center,
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                Text(
-                    text = stringResource(R.string.index_dynamic),
-                    fontSize = if (pagerState.currentPage == 1)18.sp else 16.sp,
-                    color = if (pagerState.currentPage == 1) AppColors.text else AppColors.nonActiveText,
-                    fontWeight = FontWeight.W600)
-                Spacer(modifier = Modifier.height(4.dp))
+                colorFilter = ColorFilter.tint(AppColors.text)
+            )
+        }
 
-                Image(
-                    painter = painterResource(
-                        if (pagerState.currentPage == 1) R.mipmap.tab_indicator_selected
-                        else R.drawable.tab_indicator_unselected
-                    ),
-                    contentDescription = "tab indicator",
-                    modifier = Modifier
-                        .width(34.dp)
-                        .height(4.dp)
+        Spacer(modifier = Modifier.height(23.dp))
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight()
+                .padding(start = 16.dp, bottom = 16.dp),
+            horizontalArrangement = Arrangement.Start,
+            verticalAlignment = Alignment.Bottom
+        ) {
+            val tabDebouncer = rememberDebouncer()
+
+            // 新探索标签
+            Box {
+                CustomTabItem(
+                    text = stringResource(R.string.index_worldwide),
+                    isSelected = pagerState.currentPage == 0,
+                    onClick = {
+                        tabDebouncer {
+                            scope.launch {
+                                pagerState.animateScrollToPage(0)
+                            }
+                        }
+                    }
                 )
-
             }
-            
+
+            TabSpacer()
+
             // 只有非游客用户才显示"关注"tab
             if (!AppStore.isGuest) {
-                //关注tab
-                Spacer(modifier = Modifier.width(16.dp))
-                Column(
-                    modifier = Modifier
-                        .noRippleClickable {
-                            scope.launch {
-                                pagerState.animateScrollToPage(2)
-                            }
-                        },
-                    verticalArrangement = Arrangement.Center,
-                    horizontalAlignment = Alignment.CenterHorizontally
-                ) {
-                    Text(
+                Box {
+                    CustomTabItem(
                         text = stringResource(R.string.index_following),
-                        fontSize = if (pagerState.currentPage == 2)18.sp else 16.sp,
-                        color = if (pagerState.currentPage == 2) AppColors.text else AppColors.nonActiveText,
-                        fontWeight = FontWeight.W600)
-                    Spacer(modifier = Modifier.height(4.dp))
-
-                    Image(
-                        painter = painterResource(
-                            if (pagerState.currentPage == 2) R.mipmap.tab_indicator_selected
-                            else R.drawable.tab_indicator_unselected
-                        ),
-                        contentDescription = "tab indicator",
-                        modifier = Modifier
-                            .width(34.dp)
-                            .height(4.dp)
+                        isSelected = pagerState.currentPage == 1,
+                        onClick = {
+                            tabDebouncer {
+                                scope.launch {
+                                    pagerState.animateScrollToPage(1)
+                                }
+                            }
+                        }
                     )
-
                 }
-            }
-            //热门tab
-            Spacer(modifier = Modifier.width(16.dp))
-            Column(
-                modifier = Modifier
-                    .noRippleClickable {
-                        scope.launch {
-                            val targetPage = if (AppStore.isGuest) 2 else 3
-                            pagerState.animateScrollToPage(targetPage)
-                        }
-                    },
-                verticalArrangement = Arrangement.Center,
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                Text(
-                    text = stringResource(R.string.index_hot),
-                    fontSize = if ((AppStore.isGuest && pagerState.currentPage == 2) || (!AppStore.isGuest && pagerState.currentPage == 3)) 18.sp else 16.sp,
-                    color = if ((AppStore.isGuest && pagerState.currentPage == 2) || (!AppStore.isGuest && pagerState.currentPage == 3)) AppColors.text else AppColors.nonActiveText,
-                    fontWeight = FontWeight.W600)
-                Spacer(modifier = Modifier.height(4.dp))
 
-                Image(
-                    painter = painterResource(
-                        if ((AppStore.isGuest && pagerState.currentPage == 2) || (!AppStore.isGuest && pagerState.currentPage == 3)) R.mipmap.tab_indicator_selected
-                        else R.drawable.tab_indicator_unselected
-                    ),
-                    contentDescription = "tab indicator",
-                    modifier = Modifier
-                        .width(34.dp)
-                        .height(4.dp)
-                )
+                TabSpacer()
 
-            }
-            //搜索按钮
-            Column(
-                modifier = Modifier
-                    .padding(bottom = 8.dp, end = 16.dp)
-                    .fillMaxWidth(),
-                horizontalAlignment = Alignment.End
-            ) {
-                Icon(
-                    ImageVector.vectorResource(R.drawable.rider_pro_nav_search),
-                    contentDescription = "Clickable Icon",
-                    tint = AppColors.text,
-                    modifier = Modifier.size(24.dp)
-                        .noRippleClickable {
-                            navController.navigate(NavigationRoute.Search.route)
+                // 热门标签
+                Box {
+                    CustomTabItem(
+                        text = stringResource(R.string.index_hot),
+                        isSelected = pagerState.currentPage == 2,
+                        onClick = {
+                            tabDebouncer {
+                                scope.launch {
+                                    pagerState.animateScrollToPage(2)
+                                }
+                            }
                         }
-                )
+                    )
+                }
+            } else {
+                // 热门标签 (游客模式)
+                Box {
+                    CustomTabItem(
+                        text = stringResource(R.string.index_hot),
+                        isSelected = pagerState.currentPage == 1,
+                        onClick = {
+                            tabDebouncer {
+                                scope.launch {
+                                    pagerState.animateScrollToPage(1)
+                                }
+                            }
+                        }
+                    )
+                }
             }
         }
 
@@ -237,31 +229,25 @@ fun MomentsList() {
                 .weight(1f)
         ) {
             if (AppStore.isGuest) {
-                // 游客模式：Explore(0), Dynamic(1), Hot(2)
+                // 游客模式：Dynamic(0), Hot(1)
                 when (it) {
                     0 -> {
-                        Explore()
-                    }
-                    1 -> {
                         Dynamic()
                     }
-                    2 -> {
+                    1 -> {
                         HotMomentsList()
                     }
                 }
             } else {
-                // 正常用户：Explore(0), Dynamic(1), Timeline(2), Hot(3)
+                // 正常用户：Dynamic(0), Timeline(1), Hot(2)
                 when (it) {
                     0 -> {
-                        Explore()
-                    }
-                    1 -> {
                         Dynamic()
                     }
-                    2 -> {
+                    1 -> {
                         TimelineMomentsList()
                     }
-                    3 -> {
+                    2 -> {
                         HotMomentsList()
                     }
                 }
@@ -269,5 +255,30 @@ fun MomentsList() {
         }
     }
 }
+@Composable
+fun CustomTabItem(
+    text: String,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val AppColors = LocalAppTheme.current
 
+    Column(
+        modifier = modifier
+            .noRippleClickable { onClick() },
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = text,
+            fontSize = 15.sp,
+            color = if (isSelected) AppColors.tabSelectedText else AppColors.tabUnselectedText,
+            modifier = Modifier
+                .clip(RoundedCornerShape(12.dp))
+                .background(if (isSelected) AppColors.tabSelectedBackground else AppColors.tabUnselectedBackground)
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+        )
+    }
+}
 

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/GalleryItem.kt

@@ -93,7 +93,7 @@ fun GalleryItem(
 
                 Text(
                     text = "故事还没开始",
-                    fontSize = 12.sp,
+                    fontSize = 16.sp,
                     color = AppColors.text,
                     fontWeight = FontWeight.W600
                 )
@@ -150,7 +150,7 @@ fun GalleryGrid(
 
             Text(
                 text = "故事还没开始",
-                fontSize = 12.sp,
+                fontSize = 16.sp,
                 color = AppColors.text,
                 fontWeight = FontWeight.W600
             )

app/src/main/java/com/aiosman/ravenow/ui/login/login.kt

@@ -275,7 +275,7 @@ fun LoginPage() {
         ) {
             Spacer(modifier = Modifier.weight(1f))
             Image(
-                painter = painterResource(id = R.mipmap.rider_pro_color_logo_next),
+                painter = painterResource(id = R.mipmap.invalid_name),
                 contentDescription = "Rave Now",
                 modifier = Modifier
                     .size(52.dp)

app/src/main/java/com/aiosman/ravenow/ui/post/NewPost.kt

@@ -96,7 +96,7 @@ fun NewPostScreen() {
     var isAiEnabled by remember { mutableStateOf(false) }
     var isRotating by remember { mutableStateOf(false) }
     var isRequesting by remember { mutableStateOf(false) }
-    val keyboardController = LocalSoftwareKeyboardController.current // 添加这行
+    val keyboardController = LocalSoftwareKeyboardController.current
 
     val model = NewPostViewModel
     val systemUiController = rememberSystemUiController()

app/src/main/java/com/aiosman/ravenow/utils/MessageParser.kt

@@ -0,0 +1,69 @@
+package com.aiosman.ravenow.utils
+
+import com.aiosman.ravenow.AppState
+import com.google.gson.Gson
+import com.google.gson.JsonSyntaxException
+import io.openim.android.sdk.models.Message
+
+/**
+ * OpenIM 消息解析工具类
+ * 用于解析 ConversationInfo 中的 latestMsg JSON 字符串
+ */
+object MessageParser {
+    
+    /**
+     * 解析最新消息的显示文本和发送者信息
+     * @param latestMsgJson 最新消息的JSON字符串
+     * @return Pair<displayText, isSelf> 显示文本和是否是自己发送的消息
+     */
+    fun parseLatestMessage(latestMsgJson: String?): Pair<String, Boolean> {
+        var displayText = ""
+        var isSelf = false
+        
+        try {
+            if (!latestMsgJson.isNullOrEmpty()) {
+                val gson = Gson()
+                val message = gson.fromJson(latestMsgJson, Message::class.java)
+                
+                // 判断是否是自己发送的消息
+                isSelf = message.sendID == AppState.profile?.trtcUserId
+                
+                // 根据消息类型生成显示文本
+                displayText = getMessageDisplayText(message)
+            } else {
+                displayText = "[暂无消息]"
+            }
+        } catch (e: JsonSyntaxException) {
+            // JSON 解析失败，使用原始文本
+            displayText = latestMsgJson ?: "[消息解析失败]"
+        } catch (e: Exception) {
+            // 其他异常
+            displayText = "[消息]"
+        }
+        
+        return Pair(displayText, isSelf)
+    }
+    
+    /**
+     * 根据消息类型获取显示文本
+     * @param message OpenIM Message 对象
+     * @return 消息的显示文本
+     */
+    private fun getMessageDisplayText(message: Message): String {
+        return when (message.contentType) {
+            101 -> { // TEXT
+                message.textElem?.content ?: "[文本消息]"
+            }
+            102 -> "[图片]" // IMAGE
+            103 -> "[语音]" // AUDIO
+            104 -> "[视频]" // VIDEO
+            105 -> "[文件]" // FILE
+            106 -> "[位置]" // LOCATION
+            107 -> "[自定义消息]" // CUSTOM
+            108 -> "[合并消息]" // MERGE
+            109 -> "[名片]" // CARD
+            110 -> "[引用消息]" // QUOTE
+            else -> "[消息]"
+        }
+    }
+}

gradle/libs.versions.toml

@@ -5,7 +5,8 @@ animation = "1.7.0-beta05"
 coil = "2.7.0"
 composeImageBlurhash = "3.0.2"
 converterGson = "2.11.0"
-coreSdk = "3.8.3"
+imSdk = "3.8.3.2"
+imcoreSdk = "3.8.3-patch10"
 coreSplashscreen = "1.0.1"
 credentialsPlayServicesAuth = "1.2.2"
 eventbus = "3.3.1"
@@ -42,7 +43,6 @@ zoomable = "1.6.1"
 
 [libraries]
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanistSystemuicontroller" }
-im-sdk = { module = "io.openim:android-sdk", version.ref = "coreSdk" }
 androidx-animation = { module = "androidx.compose.animation:animation", version.ref = "animation" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
@@ -60,7 +60,6 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 compose-image-blurhash = { module = "com.github.orlando-dev-code:compose-image-blurhash", version.ref = "composeImageBlurhash" }
 converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "converterGson" }
-im-core-sdk = { module = "io.openim:core-sdk", version.ref = "coreSdk" }
 eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbus" }
 firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
@@ -84,6 +83,8 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
+im-sdk = { module = "io.openim:android-sdk", version.ref = "imSdk" }
+im-core-sdk = { module = "io.openim:core-sdk", version.ref = "imcoreSdk" }
 jwtdecode = { module = "com.auth0.android:jwtdecode", version.ref = "jwtdecode" }
 kotlin-faker = { module = "io.github.serpro69:kotlin-faker", version.ref = "kotlinFaker" }
 maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "mapsCompose" }