Reapply "增加英文日语翻译 修改编辑资料界面无法更改星座mbit"

This reverts commit a057f7f7fd.

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-17T06:25:35.585100400Z">
+        <DropdownSelection timestamp="2025-11-05T12:24:27.034893100Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.0.216:5555;connection=698a7727" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=c328a150" />
             </handle>
           </Target>
         </DropdownSelection>

app/build.gradle.kts

@@ -125,7 +125,7 @@ dependencies {
     // 添加 lifecycle-runtime-ktx 依赖
     implementation(libs.androidx.lifecycle.runtime.ktx.v262)
     implementation (libs.eventbus)
-
+    implementation(libs.lottie)
 
 }
 

app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.RaveNow"
         android:usesCleartextTraffic="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="31">
         <meta-data
             android:name="com.google.android.geo.API_KEY"

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

@@ -45,6 +45,8 @@ object AppState {
     var googleClientId: String? = null
     var enableGoogleLogin: Boolean = false
     var enableChat = false
+    var agentCreatedSuccess by mutableStateOf(false)
+    var chatBackgroundUrl by mutableStateOf<String?>(null)
     suspend fun initWithAccount(scope: CoroutineScope, context: Context) {
         // 如果是游客模式，使用简化的初始化流程
         if (AppStore.isGuest) {

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

@@ -5,7 +5,8 @@ object ConstVars {
     // 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环境
+       //  "http://47.109.137.67:6363"  // Debug环境
+        "https://rider-pro.aiosman.com/beta_api"  // Release环境
     } else {
         "https://rider-pro.aiosman.com/beta_api"  // Release环境
     }

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

@@ -43,7 +43,12 @@ import com.google.firebase.analytics.analytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import com.aiosman.ravenow.ui.splash.SplashScreen
 
 class MainActivity : ComponentActivity() {
     // Firebase Analytics
@@ -122,11 +127,22 @@ class MainActivity : ComponentActivity() {
             }
 
             setContent {
+                var showSplash by remember { mutableStateOf(true) }
+
+                LaunchedEffect(Unit) {
+                    kotlinx.coroutines.delay(2000)
+                    showSplash = false
+                }
+
+                if (showSplash) {
+                    SplashScreen()
+                } else {
                     CompositionLocalProvider(
                         LocalAppTheme provides AppState.appTheme
                     ) {
                         CheckUpdateDialog()
                         Navigation(startDestination) { navController ->
+
                             // 处理带有 postId 的通知点击
                             val postId = intent.getStringExtra("POST_ID")
                             var commentId = intent.getStringExtra("COMMENT_ID")
@@ -179,17 +195,15 @@ class MainActivity : ComponentActivity() {
                                 }
                                 NewPostViewModel.asNewPostWithImageUris(imageUris!!.map { it.toString() })
                                 navController.navigate(NavigationRoute.NewPost.route)
-
+                            }
+                        }
+                    }
+                }
             }
         }
     }
 
 
-            }
-
-        }
-    }
-
 
     /**
      * 请求通知权限

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

@@ -2,8 +2,16 @@ package com.aiosman.ravenow.data
 
 import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.data.api.ApiClient
+import com.aiosman.ravenow.data.api.AgentRule
+import com.aiosman.ravenow.data.api.AgentRuleListResponse
+import com.aiosman.ravenow.data.api.AgentRuleQuota
+import com.aiosman.ravenow.data.api.AgentRuleAgent
+import com.aiosman.ravenow.data.api.CreateAgentRuleRequestBody
+import com.aiosman.ravenow.data.api.InsufficientBalanceError
+import com.aiosman.ravenow.data.api.UpdateAgentRuleRequestBody
 import com.aiosman.ravenow.entity.AgentEntity
 import com.aiosman.ravenow.entity.ProfileEntity
+import com.google.gson.Gson
 import com.google.gson.annotations.SerializedName
 
 data class Agent(
@@ -83,9 +91,16 @@ data class Profile(
         )
     }
 }
+/**
+ * 智能体服务
+ */
 interface AgentService {
     /**
      * 获取智能体列表
+     * @param pageNumber 页码
+     * @param pageSize 每页数量，默认 20
+     * @param authorId 作者ID，可选参数，用于筛选特定作者的智能体
+     * @return 智能体列表容器，包含分页信息和智能体列表，失败时返回 null
      */
     suspend fun getAgent(
     pageNumber: Int,
@@ -96,3 +111,206 @@ interface AgentService {
 }
 
 
+// ========== Agent 规则 - 领域实体 ==========
+
+data class AgentRuleAgentInfo(
+    val id: Int,
+    val title: String,
+    val avatar: String,
+)
+
+data class AgentRuleEntity(
+    val id: Int,
+    val rule: String,
+    val creator: String,
+    val creatorType: String,
+    val scope: String,
+    val agent: AgentRuleAgentInfo,
+    val createdAt: String,
+    val updatedAt: String,
+)
+
+data class AgentRuleListResult(
+    val page: Int,
+    val pageSize: Int,
+    val total: Int,
+    val list: List<AgentRuleEntity>,
+)
+
+data class AgentRuleQuotaEntity(
+    val agentId: Int,
+    val agentTitle: String,
+    val baseMaxCount: Int,
+    val purchasedCount: Int,
+    val totalMaxCount: Int,
+    val currentCount: Int,
+    val remainingCount: Int,
+    val usagePercent: Double,
+)
+
+// ========== Agent 规则 - Service 接口 ==========
+
+/**
+ * Agent 规则服务
+ */
+interface AgentRuleService {
+    /**
+     * 根据 OpenId 创建 Agent 规则
+     * @param openId Agent 的 OpenId
+     * @param rule 规则内容，不能为空
+     * @throws ServiceException 创建失败时抛出异常（包括余额不足等情况）
+     */
+    suspend fun createAgentRuleByOpenId(openId: String, rule: String)
+    
+    /**
+     * 修改 Agent 规则
+     * @param id 规则ID
+     * @param rule 新的规则内容，不能为空
+     * @param openId Agent 的 OpenId，可选参数
+     * @throws ServiceException 修改失败时抛出异常（包括余额不足等情况）
+     */
+    suspend fun updateAgentRule(id: Int, rule: String, openId: String? = null)
+    
+    /**
+     * 删除 Agent 规则
+     * @param id 规则ID
+     * @throws ServiceException 删除失败时抛出异常
+     */
+    suspend fun deleteAgentRule(id: Int)
+    
+    /**
+     * 查询 Agent 规则列表
+     * @param openId Agent 的 OpenId
+     * @param keyword 关键词搜索，可选参数
+     * @param page 页码，默认 1
+     * @param pageSize 每页数量，默认 10
+     * @return 规则列表响应，包含分页信息和规则列表
+     * @throws ServiceException 查询失败时抛出异常
+     */
+    suspend fun getAgentRuleList(
+        openId: String,
+        keyword: String? = null,
+        page: Int = 1,
+        pageSize: Int = 10
+    ): AgentRuleListResult
+    
+    /**
+     * 查询 Agent 规则配额使用情况
+     * @param openId Agent 的 OpenId
+     * @return 规则配额信息，包含基础配额、已购买配额、当前使用量等
+     * @throws ServiceException 查询失败时抛出异常
+     */
+    suspend fun getAgentRuleQuota(openId: String): AgentRuleQuotaEntity
+}
+
+class AgentRuleServiceImpl : AgentRuleService {
+    private val gson = Gson()
+
+    override suspend fun createAgentRuleByOpenId(openId: String, rule: String) {
+        val body = CreateAgentRuleRequestBody(
+            rule = rule,
+            promptId = null,
+            openId = openId
+        )
+        val resp = ApiClient.api.createAgentRule(body)
+        if (!resp.isSuccessful) {
+            val errorText = resp.errorBody()?.string()
+            try {
+                val err = gson.fromJson(errorText, InsufficientBalanceError::class.java)
+                if (err != null && err.code == 35600) {
+                    throw ServiceException(err.message)
+                }
+            } catch (_: Exception) {
+                // ignore parse error
+            }
+            throw ServiceException("创建 Agent 规则失败: HTTP ${resp.code()}")
+        }
+    }
+
+    override suspend fun updateAgentRule(id: Int, rule: String, openId: String?) {
+        val body = UpdateAgentRuleRequestBody(
+            id = id,
+            rule = rule,
+            promptId = null,
+            openId = openId
+        )
+        val resp = ApiClient.api.updateAgentRule(body)
+        if (!resp.isSuccessful) {
+            val errorText = resp.errorBody()?.string()
+            try {
+                val err = gson.fromJson(errorText, InsufficientBalanceError::class.java)
+                if (err != null && err.code == 35600) {
+                    throw ServiceException(err.message)
+                }
+            } catch (_: Exception) {
+                // ignore parse error
+            }
+            throw ServiceException("更新 Agent 规则失败: HTTP ${resp.code()}")
+        }
+    }
+
+    override suspend fun deleteAgentRule(id: Int) {
+        val resp = ApiClient.api.deleteAgentRule(id)
+        if (!resp.isSuccessful) {
+            throw ServiceException("删除 Agent 规则失败: HTTP ${resp.code()}")
+        }
+    }
+
+    override suspend fun getAgentRuleList(
+        openId: String,
+        keyword: String?,
+        page: Int,
+        pageSize: Int
+    ): AgentRuleListResult {
+        val resp = ApiClient.api.getAgentRuleList(
+            promptId = openId,
+            rule = keyword,
+            page = page,
+            pageSize = pageSize
+        )
+        val data = resp.body()?.data ?: throw ServiceException("获取 Agent 规则列表失败")
+        return data.toEntity()
+    }
+
+    override suspend fun getAgentRuleQuota(openId: String): AgentRuleQuotaEntity {
+        val resp = ApiClient.api.getAgentRuleQuota(openId)
+        val data = resp.body()?.data ?: throw ServiceException("获取 Agent 规则配额失败")
+        return data.toEntity()
+    }
+
+    private fun AgentRuleListResponse.toEntity(): AgentRuleListResult = AgentRuleListResult(
+        page = page,
+        pageSize = pageSize,
+        total = total,
+        list = list.map { it.toEntity() }
+    )
+
+    private fun AgentRule.toEntity(): AgentRuleEntity = AgentRuleEntity(
+        id = id,
+        rule = rule,
+        creator = creator,
+        creatorType = creatorType,
+        scope = scope,
+        agent = prompt.toEntity(),
+        createdAt = createdAt,
+        updatedAt = updatedAt,
+    )
+
+    private fun AgentRuleAgent.toEntity(): AgentRuleAgentInfo = AgentRuleAgentInfo(
+        id = id,
+        title = title,
+        avatar = avatar,
+    )
+
+    private fun AgentRuleQuota.toEntity(): AgentRuleQuotaEntity = AgentRuleQuotaEntity(
+        agentId = promptId,
+        agentTitle = promptTitle,
+        baseMaxCount = baseMaxCount,
+        purchasedCount = purchasedCount,
+        totalMaxCount = totalMaxCount,
+        currentCount = currentCount,
+        remainingCount = remainingCount,
+        usagePercent = usagePercent,
+    )
+}
+

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

@@ -9,7 +9,7 @@ import com.google.gson.annotations.SerializedName
 data class ListContainer<T>(
     // 总数
     @SerializedName("total")
-    val total: Int,
+    val total: Long,
     // 当前页
     @SerializedName("page")
     val page: Int,

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

@@ -32,6 +32,21 @@ data class Moment(
     val time: String,
     @SerializedName("isFollowed")
     val isFollowed: Boolean,
+    // 新闻相关字段
+    @SerializedName("isNews")
+    val isNews: Boolean = false,
+    @SerializedName("newsTitle")
+    val newsTitle: String? = null,
+    @SerializedName("newsUrl")
+    val newsUrl: String? = null,
+    @SerializedName("newsSource")
+    val newsSource: String? = null,
+    @SerializedName("newsCategory")
+    val newsCategory: String? = null,
+    @SerializedName("newsLanguage")
+    val newsLanguage: String? = null,
+    @SerializedName("newsContent")
+    val newsContent: String? = null,
 ) {
     fun toMomentItem(): MomentEntity {
         return MomentEntity(
@@ -60,6 +75,14 @@ data class Moment(
             authorId = user.id.toInt(),
             liked = isLiked,
             isFavorite = isFavorite,
+            // 新闻相关字段
+            isNews = isNews,
+            newsTitle = newsTitle ?: "",
+            newsUrl = newsUrl ?: "",
+            newsSource = newsSource ?: "",
+            newsCategory = newsCategory ?: "",
+            newsLanguage = newsLanguage ?: "",
+            newsContent = newsContent ?: ""
         )
     }
 }

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

@@ -1,11 +1,16 @@
 package com.aiosman.ravenow.data
 
-import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.data.api.ApiClient
-import com.aiosman.ravenow.entity.AgentEntity
+import com.aiosman.ravenow.data.api.CreateRoomRuleRequestBody
+import com.aiosman.ravenow.data.api.UpdateRoomRuleRequestBody
+import com.aiosman.ravenow.data.api.RoomRuleQuota
+import com.aiosman.ravenow.data.api.RoomRule
+import com.aiosman.ravenow.data.api.RoomRuleCreator
 import com.aiosman.ravenow.entity.CreatorEntity
-import com.aiosman.ravenow.entity.ProfileEntity
 import com.aiosman.ravenow.entity.RoomEntity
+import com.aiosman.ravenow.entity.RoomRuleEntity
+import com.aiosman.ravenow.entity.RoomRuleCreatorEntity
+import com.aiosman.ravenow.entity.RoomRuleQuotaEntity
 import com.aiosman.ravenow.entity.UsersEntity
 import com.google.gson.annotations.SerializedName
 
@@ -106,6 +111,190 @@ data class Users(
     }
 }
 
+/**
+ * 房间规则相关服务
+ */
+interface RoomService {
+    /**
+     * 创建房间规则
+     * @param rule 规则内容，不能为空
+     * @param roomId 房间ID，与 trtcId 二选一
+     * @param trtcId TRTC房间ID，与 roomId 二选一
+     * @throws ServiceException 创建失败时抛出异常
+     */
+    suspend fun createRoomRule(
+        rule: String,
+        roomId: Int? = null,
+        trtcId: String? = null
+    )
+
+    /**
+     * 修改房间规则
+     * @param id 规则ID
+     * @param rule 新的规则内容，不能为空
+     * @throws ServiceException 修改失败时抛出异常
+     */
+    suspend fun updateRoomRule(
+        id: Int,
+        rule: String
+    )
+
+    /**
+     * 删除房间规则
+     * @param id 规则ID
+     * @throws ServiceException 删除失败时抛出异常
+     */
+    suspend fun deleteRoomRule(id: Int)
+
+    /**
+     * 查询房间规则列表
+     * @param roomId 房间ID，与 trtcId 二选一
+     * @param trtcId TRTC房间ID，与 roomId 二选一
+     * @param page 页码，默认 1
+     * @param pageSize 每页数量，默认 10
+     * @return 规则列表响应，包含分页信息和规则列表
+     * @throws ServiceException 查询失败时抛出异常
+     */
+    suspend fun getRoomRuleList(
+        roomId: Int? = null,
+        trtcId: String? = null,
+        page: Int = 1,
+        pageSize: Int = 10
+    ): ListContainer<RoomRuleEntity>
+
+    /**
+     * 查询规则配额使用情况
+     * @param roomId 房间ID，与 trtcId 二选一
+     * @param trtcId TRTC房间ID，与 roomId 二选一
+     * @return 规则配额信息
+     * @throws ServiceException 查询失败时抛出异常
+     */
+    suspend fun getRoomRuleQuota(
+        roomId: Int? = null,
+        trtcId: String? = null
+    ): RoomRuleQuotaEntity
+}
+
+/**
+ * 房间规则服务实现类
+ */
+class RoomServiceImpl : RoomService {
+    override suspend fun createRoomRule(
+        rule: String,
+        roomId: Int?,
+        trtcId: String?
+    ) {
+        val resp = ApiClient.api.createRoomRule(
+            CreateRoomRuleRequestBody(
+                rule = rule,
+                roomId = roomId,
+                trtcId = trtcId
+            )
+        )
+        if (!resp.isSuccessful) {
+            throw ServiceException("创建房间规则失败")
+        }
+    }
+
+    override suspend fun updateRoomRule(
+        id: Int,
+        rule: String
+    ) {
+        val resp = ApiClient.api.updateRoomRule(
+            UpdateRoomRuleRequestBody(
+                id = id,
+                rule = rule
+            )
+        )
+        if (!resp.isSuccessful) {
+            throw ServiceException("修改房间规则失败")
+        }
+    }
+
+    override suspend fun deleteRoomRule(id: Int) {
+        val resp = ApiClient.api.deleteRoomRule(id)
+        if (!resp.isSuccessful) {
+            throw ServiceException("删除房间规则失败")
+        }
+    }
+
+    override suspend fun getRoomRuleList(
+        roomId: Int?,
+        trtcId: String?,
+        page: Int,
+        pageSize: Int
+    ): ListContainer<RoomRuleEntity> {
+        val resp = ApiClient.api.getRoomRuleList(
+            roomId = roomId,
+            trtcId = trtcId,
+            page = page,
+            pageSize = pageSize
+        )
+        val body = resp.body() ?: throw ServiceException("获取房间规则列表失败")
+        
+        return ListContainer(
+            list = body.list.map { it.toRoomRuleEntity() },
+            page = body.page,
+            total = body.total,
+            pageSize = body.pageSize
+        )
+    }
+
+    override suspend fun getRoomRuleQuota(
+        roomId: Int?,
+        trtcId: String?
+    ): RoomRuleQuotaEntity {
+        val resp = ApiClient.api.getRoomRuleQuota(
+            roomId = roomId,
+            trtcId = trtcId
+        )
+        val body = resp.body() ?: throw ServiceException("获取规则配额信息失败")
+        val data = body.data ?: throw ServiceException("规则配额数据为空")
+        
+        return data.toRoomRuleQuotaEntity()
+    }
+}
+
+/**
+ * RoomRule 扩展函数，转换为 RoomRuleEntity
+ */
+fun RoomRule.toRoomRuleEntity(): RoomRuleEntity {
+    return RoomRuleEntity(
+        id = id,
+        rule = rule,
+        creator = creator?.toRoomRuleCreatorEntity(),
+        creatorType = creatorType,
+        roomId = roomId,
+        createdAt = createdAt,
+        updatedAt = updatedAt
+    )
+}
+
+/**
+ * RoomRuleCreator 扩展函数，转换为 RoomRuleCreatorEntity
+ */
+fun RoomRuleCreator.toRoomRuleCreatorEntity(): RoomRuleCreatorEntity {
+    return RoomRuleCreatorEntity(
+        id = id,
+        nickname = nickname,
+        avatar = avatar
+    )
+}
+
+/**
+ * RoomRuleQuota 扩展函数，转换为 RoomRuleQuotaEntity
+ */
+fun RoomRuleQuota.toRoomRuleQuotaEntity(): RoomRuleQuotaEntity {
+    return RoomRuleQuotaEntity(
+        baseMaxCount = baseMaxCount,
+        purchasedCount = purchasedCount,
+        totalMaxCount = totalMaxCount,
+        currentCount = currentCount,
+        remainingCount = remainingCount,
+        usagePercent = usagePercent
+    )
+}
+
 
 
 

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

@@ -97,7 +97,8 @@ class UserServiceImpl : UserService {
             pageSize = pageSize,
             search = nickname,
             followerId = followerId,
-            followingId = followingId
+            followingId = followingId,
+            includeAI = true
         )
         val body = resp.body() ?: throw ServiceException("Failed to get account")
         return ListContainer<AccountProfileEntity>(

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

@@ -81,7 +81,9 @@ data class CreateGroupChatRequestBody(
 
 data class JoinGroupChatRequestBody(
     @SerializedName("trtcId")
-    val trtcId: String,
+    val trtcId: String? = null,
+    @SerializedName("roomId")
+    val roomId: Int? = null,
 )
 
 data class LoginUserRequestBody(
@@ -271,6 +273,134 @@ data class RemoveAccountRequestBody(
     val password: String,
 )
 
+// API 错误响应（用于加入房间等接口的错误处理）
+data class ApiErrorResponse(
+    @SerializedName("err")
+    val error: String,
+    @SerializedName("success")
+    val success: Boolean
+)
+
+// 群聊中的用户信息
+data class GroupChatUser(
+    @SerializedName("ID")
+    val id: Int,
+    @SerializedName("CreatedAt")
+    val createdAt: String,
+    @SerializedName("UpdatedAt")
+    val updatedAt: String,
+    @SerializedName("DeletedAt")
+    val deletedAt: String?,
+    @SerializedName("userSessionId")
+    val userSessionId: String,
+    @SerializedName("sessions")
+    val sessions: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("prompts")
+    val prompts: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("isAgent")
+    val isAgent: Boolean
+)
+
+// 智能体角色信息
+data class GroupChatPrompt(
+    @SerializedName("ID")
+    val id: Int,
+    @SerializedName("CreatedAt")
+    val createdAt: String,
+    @SerializedName("UpdatedAt")
+    val updatedAt: String,
+    @SerializedName("DeletedAt")
+    val deletedAt: String?,
+    @SerializedName("Title")
+    val title: String,
+    @SerializedName("Desc")
+    val desc: String,
+    @SerializedName("Value")
+    val value: String,
+    @SerializedName("Enable")
+    val enable: Boolean,
+    @SerializedName("UserSessions")
+    val userSessions: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("Avatar")
+    val avatar: String,
+    @SerializedName("AuthorId")
+    val authorId: Int?,
+    @SerializedName("Author")
+    val author: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("TokenCount")
+    val tokenCount: Int,
+    @SerializedName("OpenId")
+    val openId: String,
+    @SerializedName("Public")
+    val public: Boolean,
+    @SerializedName("BreakMode")
+    val breakMode: Boolean,
+    @SerializedName("DocNamespace")
+    val docNamespace: String,
+    @SerializedName("UseRag")
+    val useRag: Boolean,
+    @SerializedName("RagThreshold")
+    val ragThreshold: Double,
+    @SerializedName("WorkflowId")
+    val workflowId: Int?,
+    @SerializedName("Workflow")
+    val workflow: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("WorkflowInputs")
+    val workflowInputs: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("Source")
+    val source: String,
+    @SerializedName("categories")
+    val categories: Any? // 根据实际需要可以定义具体类型
+)
+
+// 群聊详细信息响应
+data class GroupChatResponse(
+    @SerializedName("ID")
+    val id: Int,
+    @SerializedName("CreatedAt")
+    val createdAt: String,
+    @SerializedName("UpdatedAt")
+    val updatedAt: String,
+    @SerializedName("DeletedAt")
+    val deletedAt: String?,
+    @SerializedName("name")
+    val name: String,
+    @SerializedName("description")
+    val description: String,
+    @SerializedName("creatorId")
+    val creatorId: Int,
+    @SerializedName("creator")
+    val creator: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("trtcRoomId")
+    val trtcRoomId: String,
+    @SerializedName("trtcType")
+    val trtcType: String,
+    @SerializedName("cover")
+    val cover: String,
+    @SerializedName("avatar")
+    val avatar: String,
+    @SerializedName("recommendBanner")
+    val recommendBanner: String,
+    @SerializedName("isRecommended")
+    val isRecommended: Boolean,
+    @SerializedName("allowInHot")
+    val allowInHot: Boolean,
+    @SerializedName("users")
+    val users: List<GroupChatUser>,
+    @SerializedName("prompts")
+    val prompts: List<GroupChatPrompt>,
+    @SerializedName("source")
+    val source: String
+)
+
+
+data class CategoryTranslation(
+    @SerializedName("name")
+    val name: String?,
+    @SerializedName("description")
+    val description: String?
+)
+
 data class CategoryTemplate(
     @SerializedName("id")
     val id: Int,
@@ -295,8 +425,58 @@ data class CategoryTemplate(
     @SerializedName("createdAt")
     val createdAt: String,
     @SerializedName("updatedAt")
-    val updatedAt: String
+    val updatedAt: String,
-)
+    @SerializedName("translations")
+    val translations: Map<String, CategoryTranslation>?
+) {
+    /**
+     * 根据语言代码获取翻译后的名称，如果没有翻译则返回默认名称
+     */
+    fun getLocalizedName(lang: String): String {
+        // 尝试获取完整的语言标记（如 "zh-CN"）
+        val translation = translations?.get(lang)
+        if (translation?.name != null && translation.name.isNotEmpty()) {
+            return translation.name
+        }
+        
+        // 如果没有找到，尝试语言代码的前缀（如 "zh"）
+        val langPrefix = lang.split("-", "_").firstOrNull()
+        if (langPrefix != null) {
+            translations?.entries?.forEach { (key, value) ->
+                if (key.startsWith(langPrefix) && value.name != null && value.name.isNotEmpty()) {
+                    return value.name
+                }
+            }
+        }
+        
+        // 如果没有翻译，返回默认名称
+        return name
+    }
+    
+    /**
+     * 根据语言代码获取翻译后的描述，如果没有翻译则返回默认描述
+     */
+    fun getLocalizedDescription(lang: String): String {
+        // 尝试获取完整的语言标记（如 "zh-CN"）
+        val translation = translations?.get(lang)
+        if (translation?.description != null && translation.description.isNotEmpty()) {
+            return translation.description
+        }
+        
+        // 如果没有找到，尝试语言代码的前缀（如 "zh"）
+        val langPrefix = lang.split("-", "_").firstOrNull()
+        if (langPrefix != null) {
+            translations?.entries?.forEach { (key, value) ->
+                if (key.startsWith(langPrefix) && value.description != null && value.description.isNotEmpty()) {
+                    return value.description
+                }
+            }
+        }
+        
+        // 如果没有翻译，返回默认描述
+        return description
+    }
+}
 
 data class CategoryListResponse(
     @SerializedName("page")
@@ -309,6 +489,278 @@ data class CategoryListResponse(
     val list: List<CategoryTemplate>
 )
 
+// ========== Agent Rule 相关数据类 ==========
+
+/**
+ * 创建规则请求体
+ * @param rule 规则内容，不能为空
+ * @param promptId 智能体ID，与 openId 二选一，promptId 优先
+ * @param openId 智能体的 OpenID（UUID格式），与 promptId 二选一
+ */
+data class CreateAgentRuleRequestBody(
+    @SerializedName("rule")
+    val rule: String,
+    @SerializedName("promptId")
+    val promptId: Int? = null,
+    @SerializedName("openId")
+    val openId: String? = null
+)
+
+/**
+ * 修改规则请求体
+ * @param id 规则ID，必填
+ * @param rule 新的规则内容，不能为空
+ * @param promptId 要更改关联的智能体ID（可选）
+ * @param openId 要更改关联的智能体 OpenID（可选）
+ */
+data class UpdateAgentRuleRequestBody(
+    @SerializedName("id")
+    val id: Int,
+    @SerializedName("rule")
+    val rule: String,
+    @SerializedName("promptId")
+    val promptId: Int? = null,
+    @SerializedName("openId")
+    val openId: String? = null
+)
+
+/**
+ * 规则关联的智能体信息
+ * @param id 智能体ID
+ * @param title 智能体标题
+ * @param avatar 智能体头像URL
+ */
+data class AgentRuleAgent(
+    @SerializedName("id")
+    val id: Int,
+    @SerializedName("title")
+    val title: String,
+    @SerializedName("avatar")
+    val avatar: String
+)
+
+/**
+ * 规则详情
+ * @param id 规则ID
+ * @param rule 规则内容
+ * @param creator 创建者名称
+ * @param creatorType 创建者类型（如 "user"）
+ * @param scope 作用域（如 "personal"）
+ * @param prompt 关联的智能体信息
+ * @param createdAt 创建时间（ISO 8601 格式）
+ * @param updatedAt 更新时间（ISO 8601 格式）
+ */
+data class AgentRule(
+    @SerializedName("id")
+    val id: Int,
+    @SerializedName("rule")
+    val rule: String,
+    @SerializedName("creator")
+    val creator: String,
+    @SerializedName("creator_type")
+    val creatorType: String,
+    @SerializedName("scope")
+    val scope: String,
+    @SerializedName("prompt")
+    val prompt: AgentRuleAgent,
+    @SerializedName("created_at")
+    val createdAt: String,
+    @SerializedName("updated_at")
+    val updatedAt: String
+)
+
+/**
+ * 规则列表响应
+ * @param page 当前页码
+ * @param pageSize 每页数量
+ * @param total 总记录数
+ * @param list 规则列表
+ */
+data class AgentRuleListResponse(
+    @SerializedName("page")
+    val page: Int,
+    @SerializedName("pageSize")
+    val pageSize: Int,
+    @SerializedName("total")
+    val total: Int,
+    @SerializedName("list")
+    val list: List<AgentRule>
+)
+
+/**
+ * 规则配额信息
+ * @param promptId 智能体ID
+ * @param promptTitle 智能体标题
+ * @param baseMaxCount 基础条数限制（免费配额）
+ * @param purchasedCount 用户购买的额外条数
+ * @param totalMaxCount 总可用条数（基础+购买）
+ * @param currentCount 当前已创建的规则条数
+ * @param remainingCount 剩余可用条数
+ * @param usagePercent 使用百分比（0-100）
+ */
+data class AgentRuleQuota(
+    @SerializedName("promptId")
+    val promptId: Int,
+    @SerializedName("promptTitle")
+    val promptTitle: String,
+    @SerializedName("baseMaxCount")
+    val baseMaxCount: Int,
+    @SerializedName("purchasedCount")
+    val purchasedCount: Int,
+    @SerializedName("totalMaxCount")
+    val totalMaxCount: Int,
+    @SerializedName("currentCount")
+    val currentCount: Int,
+    @SerializedName("remainingCount")
+    val remainingCount: Int,
+    @SerializedName("usagePercent")
+    val usagePercent: Double
+)
+
+// ========== Room Rule 相关数据类 ==========
+
+/**
+ * 创建房间规则请求体
+ * @param rule 规则内容，不能为空
+ * @param roomId 房间ID，与 trtcId 二选一
+ * @param trtcId TRTC房间ID（字符串格式），与 roomId 二选一
+ */
+data class CreateRoomRuleRequestBody(
+    @SerializedName("rule")
+    val rule: String,
+    @SerializedName("roomId")
+    val roomId: Int? = null,
+    @SerializedName("trtcId")
+    val trtcId: String? = null
+)
+
+/**
+ * 修改房间规则请求体
+ * @param id 规则ID，必填
+ * @param rule 新的规则内容，不能为空
+ */
+data class UpdateRoomRuleRequestBody(
+    @SerializedName("id")
+    val id: Int,
+    @SerializedName("rule")
+    val rule: String
+)
+
+/**
+ * 房间规则创建者信息
+ * @param id 创建者ID
+ * @param nickname 创建者昵称
+ * @param avatar 创建者头像文件名
+ */
+data class RoomRuleCreator(
+    @SerializedName("id")
+    val id: Int,
+    @SerializedName("nickname")
+    val nickname: String,
+    @SerializedName("avatar")
+    val avatar: String
+)
+
+/**
+ * 房间规则详情
+ * @param id 规则ID
+ * @param rule 规则内容
+ * @param creator 创建者信息（可能为 null）
+ * @param creatorType 创建者类型（如 "user"）
+ * @param roomId 所属房间ID
+ * @param createdAt 创建时间（ISO 8601 格式）
+ * @param updatedAt 更新时间（ISO 8601 格式）
+ */
+data class RoomRule(
+    @SerializedName("id")
+    val id: Int,
+    @SerializedName("rule")
+    val rule: String,
+    @SerializedName("creator")
+    val creator: RoomRuleCreator?,
+    @SerializedName("creatorType")
+    val creatorType: String,
+    @SerializedName("roomId")
+    val roomId: Int,
+    @SerializedName("createdAt")
+    val createdAt: String,
+    @SerializedName("updatedAt")
+    val updatedAt: String
+)
+
+/**
+ * 房间规则列表响应
+ * @param page 当前页码
+ * @param pageSize 每页数量
+ * @param total 总记录数
+ * @param list 规则列表
+ */
+data class RoomRuleListResponse(
+    @SerializedName("page")
+    val page: Int,
+    @SerializedName("pageSize")
+    val pageSize: Int,
+    @SerializedName("total")
+    val total: Long,
+    @SerializedName("list")
+    val list: List<RoomRule>
+)
+
+/**
+ * 房间规则配额信息
+ * @param baseMaxCount 基础条数限制（系统配置的免费配额）
+ * @param purchasedCount 用户购买的额外条数（通过自动扩容机制）
+ * @param totalMaxCount 总可用条数（baseMaxCount + purchasedCount）
+ * @param currentCount 当前已创建的规则条数（该用户在该房间）
+ * @param remainingCount 剩余可用条数（totalMaxCount - currentCount）
+ * @param usagePercent 使用百分比（0-100）
+ */
+data class RoomRuleQuota(
+    @SerializedName("baseMaxCount")
+    val baseMaxCount: Int,
+    @SerializedName("purchasedCount")
+    val purchasedCount: Int,
+    @SerializedName("totalMaxCount")
+    val totalMaxCount: Int,
+    @SerializedName("currentCount")
+    val currentCount: Int,
+    @SerializedName("remainingCount")
+    val remainingCount: Int,
+    @SerializedName("usagePercent")
+    val usagePercent: Double
+)
+
+/**
+ * 积分不足错误响应
+ * 
+ * 当创建房间规则时积分不足，服务器会返回此特殊错误格式。
+ * 包含当前余额和所需金额信息，便于客户端提示用户。
+ * 
+ * @param success 是否成功，固定为 false
+ * @param code 错误码，固定为 35600（积分不足）
+ * @param message 错误消息，包含所需积分和当前余额的详细说明
+ * @param err 错误类型，固定为 "InsufficientBalance"
+ * @param currentBalance 当前积分余额
+ * @param requiredAmount 所需积分数量
+ * @param traceId 追踪ID（可选）
+ */
+data class InsufficientBalanceError(
+    @SerializedName("success")
+    val success: Boolean,
+    @SerializedName("code")
+    val code: Int,
+    @SerializedName("message")
+    val message: String,
+    @SerializedName("err")
+    val err: String,
+    @SerializedName("currentBalance")
+    val currentBalance: Int,
+    @SerializedName("requiredAmount")
+    val requiredAmount: Int,
+    @SerializedName("traceId")
+    val traceId: String?
+)
+
 interface RaveNowAPI {
     @GET("membership/config")
     @retrofit2.http.Headers("X-Requires-Auth: true")
@@ -347,6 +799,7 @@ interface RaveNowAPI {
         @Query("trend") trend: String? = null,
         @Query("favouriteUserId") favouriteUserId: Int? = null,
         @Query("explore") explore: String? = null,
+        @Query("newsFilter") newsFilter: String? = null,
     ): Response<ListContainer<Moment>>
 
     @Multipart
@@ -501,7 +954,7 @@ interface RaveNowAPI {
         @Query("nickname") search: String? = null,
         @Query("followerId") followerId: Int? = null,
         @Query("followingId") followingId: Int? = null,
-        @Query("includeAI") includeAI: Boolean? = false,
+        @Query("includeAI") includeAI: Boolean? = true,
         @Query("chatSessionIdNotNull") chatSessionIdNotNull: Boolean? = true,
     ): Response<ListContainer<AccountProfile>>
 
@@ -591,6 +1044,7 @@ interface RaveNowAPI {
         @Query("withWorkflow") withWorkflow: Int = 1,
         @Query("authorId") authorId: Int? = null,
         @Query("categoryIds") categoryIds: List<Int>? = null,
+        @Query("random") random: Int? = null,
     ): Response<DataContainer<ListContainer<Agent>>>
 
     @GET("outside/my/prompts")
@@ -619,7 +1073,10 @@ interface RaveNowAPI {
     suspend fun agentMoment(@Body body: AgentMomentRequestBody): Response<DataContainer<String>>
 
     @GET("outside/rooms/open")
-    suspend fun createGroupChatAi(@Query("trtcGroupId") trtcGroupId: String): Response<DataContainer<Unit>>
+    suspend fun createGroupChatAi(
+        @Query("trtcGroupId") trtcGroupId: String? = null,
+        @Query("roomId") roomId: Int? = null
+    ): Response<DataContainer<GroupChatResponse>>
 
     @POST("outside/rooms/create-single-chat")
     suspend fun createSingleChat(@Body body: SingleChatRequestBody): Response<DataContainer<Unit>>
@@ -634,6 +1091,7 @@ interface RaveNowAPI {
     suspend fun getRooms(@Query("page") page: Int = 1,
                          @Query("pageSize") pageSize: Int = 20,
                          @Query("isRecommended") isRecommended: Int = 1,
+                         @Query("random") random: Int? = null,
     ): Response<ListContainer<Room>>
 
     @GET("outside/rooms/detail")
@@ -654,8 +1112,9 @@ interface RaveNowAPI {
         @Query("withChildren") withChildren: Boolean? = null,
         @Query("withParent") withParent: Boolean? = null,
         @Query("withCount") withCount: Boolean? = null,
-        @Query("hideEmpty") hideEmpty: Boolean? = null
+        @Query("hideEmpty") hideEmpty: Boolean? = null,
-    ): Response<DataContainer<CategoryListResponse>>
+        @Query("lang") lang: String? = null
+    ): Response<CategoryListResponse>
 
     @GET("outside/categories/tree")
     suspend fun getCategoryTree(
@@ -677,5 +1136,461 @@ interface RaveNowAPI {
         @Query("pageSize") pageSize: Int? = null
     ): Response<ListContainer<Agent>>
 
+// ========== Agent Rule API ==========
+
+    /**
+     * 创建智能体规则
+     * 
+     * 功能说明：
+     * - 为指定的智能体创建一条新规则
+     * - 规则必须关联到存在的智能体（通过 promptId 或 openId 指定）
+     * - 创建前会自动检查配额限制，如果超出会尝试自动扩容
+     * - 只有创建者可以修改和删除该规则
+     * 
+     * @param body 创建规则请求体
+     *   - rule: 规则内容，不能为空
+     *   - promptId: 智能体ID（与 openId 二选一，promptId 优先）
+     *   - openId: 智能体的 OpenID（UUID格式，与 promptId 二选一）
+     * 
+     * @return 成功时返回空 Unit，失败时返回错误信息
+     * 
+     * 示例：
+     * ```kotlin
+     * val request = CreatePromptRuleRequestBody(
+     *     rule = "禁止讨论政治话题",
+     *     promptId = 123
+     * )
+     * val response = api.createPromptRule(request)
+     * ```
+     */
+    @POST("outside/prompt/rule")
+    suspend fun createAgentRule(
+        @Body body: CreateAgentRuleRequestBody
+    ): Response<Unit>
+
+    /**
+     * 修改智能体规则
+     * 
+     * 功能说明：
+     * - 修改已存在的规则内容或关联的智能体
+     * - 只有规则的创建者可以修改
+     * - 可以同时修改规则内容和关联的智能体
+     * - 修改关联智能体时会重新验证配额限制
+     * 
+     * @param body 修改规则请求体
+     *   - id: 规则ID，必填
+     *   - rule: 新的规则内容，不能为空
+     *   - promptId: 要更改关联的智能体ID（可选）
+     *   - openId: 要更改关联的智能体 OpenID（可选）
+     * 
+     * @return 成功时返回空 Unit，失败时返回错误信息
+     * 
+     * 权限要求：
+     * - 必须是规则的创建者（creator_type 为 "user" 且 create_id 匹配）
+     * 
+     * 示例：
+     * ```kotlin
+     * val request = UpdatePromptRuleRequestBody(
+     *     id = 456,
+     *     rule = "禁止讨论政治和敏感话题"
+     * )
+     * val response = api.updatePromptRule(request)
+     * ```
+     */
+    @retrofit2.http.PUT("outside/prompt/rule")
+    suspend fun updateAgentRule(
+        @Body body: UpdateAgentRuleRequestBody
+    ): Response<Unit>
+
+    /**
+     * 删除智能体规则
+     * 
+     * 功能说明：
+     * - 删除指定的规则
+     * - 只有规则的创建者可以删除
+     * - 删除操作不可恢复，请谨慎操作
+     * 
+     * @param id 规则ID
+     * 
+     * @return 成功时返回空 Unit，失败时返回错误信息
+     * 
+     * 权限要求：
+     * - 必须是规则的创建者（creator_type 为 "user" 且 create_id 匹配）
+     * 
+     * 示例：
+     * ```kotlin
+     * val response = api.deletePromptRule(456)
+     * ```
+     */
+    @DELETE("outside/prompt/rule/{id}")
+    suspend fun deleteAgentRule(
+        @Path("id") id: Int
+    ): Response<Unit>
+
+    /**
+     * 查询智能体规则列表
+     * 
+     * 功能说明：
+     * - 查询指定智能体下当前用户创建的规则列表
+     * - 支持分页和关键词模糊搜索
+     * - 只返回当前用户创建的规则，不会返回其他用户的规则
+     * 
+     * @param promptId 智能体ID，支持数字ID或UUID格式的 openId
+     * @param rule 规则内容关键词（模糊搜索），可选
+     * @param page 页码，默认 1
+     * @param pageSize 每页数量，默认 10
+     * 
+     * @return 返回分页的规则列表，包含规则详情和关联的智能体信息
+     * 
+     * 响应数据说明：
+     * - page: 当前页码
+     * - pageSize: 每页数量
+     * - total: 总记录数
+     * - list: 规则列表
+     *   - id: 规则ID
+     *   - rule: 规则内容
+     *   - creator: 创建者名称
+     *   - creator_type: 创建者类型
+     *   - scope: 作用域
+     *   - prompt: 关联的智能体信息（id, title, avatar）
+     *   - created_at: 创建时间
+     *   - updated_at: 更新时间
+     * 
+     * 示例：
+     * ```kotlin
+     * // 使用数字ID查询
+     * val response1 = api.getPromptRuleList("123", page = 1, pageSize = 10)
+     * 
+     * // 使用 OpenID 查询
+     * val response2 = api.getPromptRuleList(
+     *     "550e8400-e29b-41d4-a716-446655440000",
+     *     page = 1,
+     *     pageSize = 10
+     * )
+     * 
+     * // 带关键词搜索
+     * val response3 = api.getPromptRuleList(
+     *     "123",
+     *     rule = "政治",
+     *     page = 1,
+     *     pageSize = 10
+     * )
+     * ```
+     */
+    @GET("outside/prompt/{promptId}/rule/list")
+    suspend fun getAgentRuleList(
+        @Path("promptId") promptId: String,
+        @Query("rule") rule: String? = null,
+        @Query("page") page: Int = 1,
+        @Query("pageSize") pageSize: Int = 10
+    ): Response<DataContainer<AgentRuleListResponse>>
+
+    /**
+     * 查询智能体规则配额信息
+     * 
+     * 功能说明：
+     * - 查询指定智能体的规则条数使用情况
+     * - 包括基础配额、已购买配额、已使用数量等完整信息
+     * - 用于判断是否还能创建新规则
+     * 
+     * @param promptId 智能体ID，支持数字ID或UUID格式的 openId
+     * 
+     * @return 返回配额详细信息
+     * 
+     * 响应数据说明：
+     * - promptId: 智能体ID
+     * - promptTitle: 智能体标题
+     * - baseMaxCount: 基础条数限制（免费配额，由智能体等级决定）
+     * - purchasedCount: 用户购买的额外条数
+     * - totalMaxCount: 总可用条数（baseMaxCount + purchasedCount）
+     * - currentCount: 当前已创建的规则条数（只统计当前用户创建的）
+     * - remainingCount: 剩余可用条数（totalMaxCount - currentCount）
+     * - usagePercent: 使用百分比，0-100（currentCount / totalMaxCount * 100）
+     * 
+     * 使用场景：
+     * 1. 创建规则前检查是否有足够配额
+     * 2. 展示规则使用情况统计
+     * 3. 提示用户购买额外配额
+     * 
+     * 示例：
+     * ```kotlin
+     * // 使用数字ID查询
+     * val response1 = api.getPromptRuleQuota("123")
+     * 
+     * // 使用 OpenID 查询
+     * val response2 = api.getPromptRuleQuota("550e8400-e29b-41d4-a716-446655440000")
+     * 
+     * // 处理响应
+     * response1.body()?.data?.let { quota ->
+     *     if (quota.remainingCount > 0) {
+     *         // 可以创建新规则
+     *         println("还可以创建 ${quota.remainingCount} 条规则")
+     *     } else {
+     *         // 配额已用完
+     *         println("规则配额已用完，已使用 ${quota.currentCount}/${quota.totalMaxCount}")
+     *     }
+     * }
+     * ```
+     */
+    @GET("outside/prompt/{promptId}/rule/count")
+    suspend fun getAgentRuleQuota(
+        @Path("promptId") promptId: String
+    ): Response<DataContainer<AgentRuleQuota>>
+
+    // ========== Room Rule API ==========
+
+    /**
+     * 创建房间规则
+     * 
+     * 功能说明：
+     * - 为指定的房间创建一条新规则
+     * - 规则会被添加到AI对话上下文中，用于约束房间内的行为和交互方式
+     * - 必须是房间成员或房间创建者才能创建规则
+     * - 每个用户在每个房间有基础条数限制，达到限制后会自动扣费扩容
+     * - 如果积分不足，会返回特殊的错误响应（错误码 35600）
+     * 
+     * @param body 创建规则请求体
+     *   - rule: 规则内容，不能为空
+     *   - roomId: 房间ID（与 trtcId 二选一）
+     *   - trtcId: TRTC房间ID（与 roomId 二选一）
+     * 
+     * @return 成功时返回空 Unit，失败时返回错误信息
+     * 
+     * 错误响应说明：
+     * - 400 (40001): 缺少房间标识（必须提供 roomId 或 trtcId）
+     * - 400 (40002): 规则内容为空
+     * - 400 (40003): 规则内容超出字数限制
+     * - 400 (35600): 积分不足（自动扩容失败），返回 InsufficientBalanceError 格式
+     * - 401 (40101): 未登录
+     * - 403 (40301): 无权限为该房间创建规则
+     * - 400 (40005): 房间不存在
+     * 
+     * 示例：
+     * ```kotlin
+     * // 使用 roomId 创建规则
+     * val request1 = CreateRoomRuleRequestBody(
+     *     rule = "禁止在房间内讨论政治话题",
+     *     roomId = 123
+     * )
+     * val response1 = api.createRoomRule(request1)
+     * 
+     * // 使用 trtcId 创建规则
+     * val request2 = CreateRoomRuleRequestBody(
+     *     rule = "请使用文明用语",
+     *     trtcId = "room_trtc_123"
+     * )
+     * val response2 = api.createRoomRule(request2)
+     * 
+     * // 处理积分不足错误
+     * if (!response1.isSuccessful && response1.code() == 400) {
+     *     val errorBody = response1.errorBody()?.string()
+     *     // 解析为 InsufficientBalanceError 获取余额信息
+     * }
+     * ```
+     */
+    @POST("outside/room/rule")
+    suspend fun createRoomRule(
+        @Body body: CreateRoomRuleRequestBody
+    ): Response<Unit>
+
+    /**
+     * 修改房间规则
+     * 
+     * 功能说明：
+     * - 修改指定的房间规则内容
+     * - 只能修改自己创建的规则（creator_type 为 "user"）
+     * - 修改不会增加规则条数，因此不会触发扣费
+     * 
+     * @param body 修改规则请求体
+     *   - id: 规则ID，必填
+     *   - rule: 新的规则内容，不能为空
+     * 
+     * @return 成功时返回空 Unit，失败时返回错误信息
+     * 
+     * 权限要求：
+     * - 必须是规则的创建者
+     * - 规则必须是用户类型（creator_type = "user"）
+     * 
+     * 错误响应说明：
+     * - 400 (40002): 规则内容为空
+     * - 400 (40003): 规则内容超出字数限制
+     * - 401 (40101): 未登录
+     * - 403 (40301): 无权限修改该规则
+     * - 404 (40401): 规则不存在
+     * 
+     * 示例：
+     * ```kotlin
+     * val request = UpdateRoomRuleRequestBody(
+     *     id = 456,
+     *     rule = "请保持友善交流"
+     * )
+     * val response = api.updateRoomRule(request)
+     * ```
+     */
+    @retrofit2.http.PUT("outside/room/rule")
+    suspend fun updateRoomRule(
+        @Body body: UpdateRoomRuleRequestBody
+    ): Response<Unit>
+
+    /**
+     * 删除房间规则
+     * 
+     * 功能说明：
+     * - 删除指定的房间规则
+     * - 只能删除自己创建的规则（creator_type 为 "user"）
+     * - 删除操作不可恢复，请谨慎操作
+     * - 删除规则不会退还已扣除的积分
+     * 
+     * @param id 规则ID
+     * 
+     * @return 成功时返回空 Unit，失败时返回错误信息
+     * 
+     * 权限要求：
+     * - 必须是规则的创建者
+     * - 规则必须是用户类型（creator_type = "user"）
+     * 
+     * 错误响应说明：
+     * - 400 (40006): 无效的规则ID
+     * - 401 (40101): 未登录
+     * - 403 (40301): 无权限删除该规则
+     * 
+     * 示例：
+     * ```kotlin
+     * val response = api.deleteRoomRule(456)
+     * ```
+     */
+    @DELETE("outside/room/rule/{id}")
+    suspend fun deleteRoomRule(
+        @Path("id") id: Int
+    ): Response<Unit>
+
+    /**
+     * 查询房间规则列表
+     * 
+     * 功能说明：
+     * - 查询指定房间的规则列表，支持分页
+     * - 返回该房间所有用户创建的规则，包含创建者信息
+     * - 必须是房间成员或房间创建者才能查询
+     * 
+     * @param roomId 房间ID，与 trtcId 二选一
+     * @param trtcId TRTC房间ID，与 roomId 二选一
+     * @param page 页码，默认 1
+     * @param pageSize 每页数量，默认 10
+     * 
+     * @return 返回分页的规则列表，包含规则详情和创建者信息
+     * 
+     * 响应数据说明：
+     * - page: 当前页码
+     * - pageSize: 每页数量
+     * - total: 总记录数
+     * - list: 规则列表
+     *   - id: 规则ID
+     *   - rule: 规则内容
+     *   - creator: 创建者信息（id, nickname, avatar）
+     *   - creatorType: 创建者类型（"user" 等）
+     *   - roomId: 所属房间ID
+     *   - createdAt: 创建时间（ISO 8601格式）
+     *   - updatedAt: 更新时间（ISO 8601格式）
+     * 
+     * 错误响应说明：
+     * - 400 (40001): 缺少房间标识（必须提供 roomId 或 trtcId）
+     * - 401 (40101): 未登录
+     * - 403 (40301): 无权限查看该房间的规则
+     * 
+     * 示例：
+     * ```kotlin
+     * // 使用 roomId 查询
+     * val response1 = api.getRoomRuleList(
+     *     roomId = 123,
+     *     page = 1,
+     *     pageSize = 10
+     * )
+     * 
+     * // 使用 trtcId 查询
+     * val response2 = api.getRoomRuleList(
+     *     trtcId = "room_trtc_123",
+     *     page = 1,
+     *     pageSize = 10
+     * )
+     * 
+     * // 处理响应
+     * response1.body()?.let { result ->
+     *     println("共 ${result.total} 条规则，当前第 ${result.page} 页")
+     *     result.list.forEach { rule ->
+     *         println("规则: ${rule.rule}, 创建者: ${rule.creator?.nickname}")
+     *     }
+     * }
+     * ```
+     */
+    @GET("outside/room/rule")
+    suspend fun getRoomRuleList(
+        @Query("roomId") roomId: Int? = null,
+        @Query("trtcId") trtcId: String? = null,
+        @Query("page") page: Int = 1,
+        @Query("pageSize") pageSize: Int = 10
+    ): Response<RoomRuleListResponse>
+
+    /**
+     * 查询规则额度使用情况
+     * 
+     * 功能说明：
+     * - 查询当前用户在指定房间的规则额度使用情况
+     * - 包括基础条数、已购买条数、当前使用数等完整信息
+     * - 用于判断用户是否还能创建新规则
+     * - 必须是房间成员或房间创建者才能查询
+     * 
+     * @param roomId 房间ID，与 trtcId 二选一
+     * @param trtcId TRTC房间ID，与 roomId 二选一
+     * 
+     * @return 返回配额详细信息
+     * 
+     * 响应数据说明：
+     * - baseMaxCount: 基础条数限制（系统配置的免费配额）
+     * - purchasedCount: 用户购买的额外条数（通过自动扩容机制）
+     * - totalMaxCount: 总可用条数（baseMaxCount + purchasedCount）
+     * - currentCount: 当前已创建的规则条数（该用户在该房间）
+     * - remainingCount: 剩余可用条数（totalMaxCount - currentCount）
+     * - usagePercent: 使用百分比，0-100（currentCount / totalMaxCount * 100）
+     * 
+     * 使用场景：
+     * 1. 创建规则前检查是否有足够配额
+     * 2. 展示规则使用情况统计
+     * 3. 提示用户即将达到配额上限
+     * 
+     * 错误响应说明：
+     * - 400 (40001): 缺少房间标识（必须提供 roomId 或 trtcId）
+     * - 401 (40101): 未登录
+     * - 403 (40301): 无权限查看该房间的规则条数信息
+     * 
+     * 示例：
+     * ```kotlin
+     * // 使用 roomId 查询
+     * val response1 = api.getRoomRuleQuota(roomId = 123)
+     * 
+     * // 使用 trtcId 查询
+     * val response2 = api.getRoomRuleQuota(trtcId = "room_trtc_123")
+     * 
+     * // 处理响应
+     * response1.body()?.data?.let { quota ->
+     *     if (quota.remainingCount > 0) {
+     *         // 可以创建新规则
+     *         println("还可以创建 ${quota.remainingCount} 条规则")
+     *         println("使用率: ${quota.usagePercent}%")
+     *     } else {
+     *         // 配额已用完，需要扩容
+     *         println("规则配额已用完，已使用 ${quota.currentCount}/${quota.totalMaxCount}")
+     *         println("创建新规则将自动扣除积分进行扩容")
+     *     }
+     * }
+     * ```
+     */
+    @GET("outside/room/rule/length-info")
+    suspend fun getRoomRuleQuota(
+        @Query("roomId") roomId: Int? = null,
+        @Query("trtcId") trtcId: String? = null
+    ): Response<DataContainer<RoomRuleQuota>>
+
+    
+
 }
 

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

@@ -7,18 +7,13 @@ import com.aiosman.ravenow.data.Agent
 import com.aiosman.ravenow.data.ListContainer
 import com.aiosman.ravenow.data.AgentService
 import com.aiosman.ravenow.data.DataContainer
-import com.aiosman.ravenow.data.MomentService
 import com.aiosman.ravenow.data.ServiceException
 import com.aiosman.ravenow.data.UploadImage
-import com.aiosman.ravenow.data.UserService
 import com.aiosman.ravenow.data.api.ApiClient
-import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
-import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
-import retrofit2.http.Part
 import java.io.File
 import java.io.IOException
 
@@ -160,7 +155,7 @@ class AgentBackend {
         return if (authorId != null) {
             // getAgent 返回 DataContainer<ListContainer<Agent>>
             val dataContainer =
-                body as com.aiosman.ravenow.data.DataContainer<com.aiosman.ravenow.data.ListContainer<com.aiosman.ravenow.data.Agent>>
+                body as DataContainer<ListContainer<Agent>>
             val listContainer = dataContainer.data
             ListContainer(
                 total = listContainer.total,
@@ -171,7 +166,7 @@ class AgentBackend {
         } else {
             // getMyAgent 返回 ListContainer<Agent>
             val listContainer =
-                body as com.aiosman.ravenow.data.ListContainer<com.aiosman.ravenow.data.Agent>
+                body as ListContainer<Agent>
             ListContainer(
                 total = listContainer.total,
                 page = pageNumber,
@@ -251,7 +246,7 @@ class AgentLoader : DataLoader<AgentEntity, AgentLoaderExtraArgs>() {
         } else {
             // getMyAgent 返回 ListContainer<Agent>
             val listContainer =
-                body as com.aiosman.ravenow.data.ListContainer<com.aiosman.ravenow.data.Agent>
+                body as ListContainer<Agent>
             ListContainer(
                 list = listContainer.list.map { it.toAgentEntity() },
                 total = listContainer.total,

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

@@ -9,7 +9,7 @@ import com.aiosman.ravenow.data.ListContainer
 abstract class DataLoader<T,ET> {
     var list: MutableList<T> = mutableListOf()
     var page by mutableStateOf(1)
-    var total by mutableStateOf(0)
+    var total by mutableStateOf(0L)
     var pageSize by mutableStateOf(10)
     var hasNext by mutableStateOf(true)
     var isLoading by mutableStateOf(false)

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

@@ -299,12 +299,21 @@ data class MomentEntity(
     // 关联动态
     var relMoment: MomentEntity? = null,
     // 是否收藏
-    var isFavorite: Boolean = false
+    var isFavorite: Boolean = false,
+    // 新闻相关字段
+    val isNews: Boolean = false,
+    val newsTitle: String = "",
+    val newsUrl: String = "",
+    val newsSource: String = "",
+    val newsCategory: String = "",
+    val newsLanguage: String = "",
+    val newsContent: String = ""
 )
 class MomentLoaderExtraArgs(
     val explore: Boolean? = false,
     val timelineId: Int? = null,
-    val authorId : Int? = null
+    val authorId : Int? = null,
+    val newsOnly: Boolean? = null
 )
 class MomentLoader : DataLoader<MomentEntity,MomentLoaderExtraArgs>() {
     override suspend fun fetchData(
@@ -317,7 +326,8 @@ class MomentLoader : DataLoader<MomentEntity,MomentLoaderExtraArgs>() {
             pageSize = pageSize,
             explore = if (extra.explore == true) "true" else "",
             timelineId = extra.timelineId,
-            authorId = extra.authorId
+            authorId = extra.authorId,
+            newsFilter = if (extra.newsOnly == true) "news_only" else ""
         )
         val data =  result.body()?.let {
             ListContainer(
@@ -355,6 +365,18 @@ class MomentLoader : DataLoader<MomentEntity,MomentLoaderExtraArgs>() {
         onListChanged?.invoke(this.list)
     }
 
+    fun updateCommentCount(id: Int, delta: Int) {
+        this.list = this.list.map { momentItem ->
+            if (momentItem.id == id) {
+                val newCount = (momentItem.commentCount + delta).coerceAtLeast(0)
+                momentItem.copy(commentCount = newCount)
+            } else {
+                momentItem
+            }
+        }.toMutableList()
+        onListChanged?.invoke(this.list)
+    }
+
     fun removeMoment(id: Int) {
         this.list = this.list.filter { it.id != id }.toMutableList()
         onListChanged?.invoke(this.list)

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

@@ -3,10 +3,6 @@ package com.aiosman.ravenow.entity
 import com.aiosman.ravenow.data.ListContainer
 import com.aiosman.ravenow.data.ServiceException
 import com.aiosman.ravenow.data.api.ApiClient
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.asRequestBody
-import java.io.File
 
 /**
  * 群聊房间
@@ -56,6 +52,40 @@ data class ProfileEntity(
     val aiAccount: Boolean,
 )
 
+/**
+ * 房间规则创建者信息
+ */
+data class RoomRuleCreatorEntity(
+    val id: Int,
+    val nickname: String,
+    val avatar: String
+)
+
+/**
+ * 房间规则详情
+ */
+data class RoomRuleEntity(
+    val id: Int,
+    val rule: String,
+    val creator: RoomRuleCreatorEntity?,
+    val creatorType: String,
+    val roomId: Int,
+    val createdAt: String,
+    val updatedAt: String
+)
+
+/**
+ * 房间规则配额信息
+ */
+data class RoomRuleQuotaEntity(
+    val baseMaxCount: Int,
+    val purchasedCount: Int,
+    val totalMaxCount: Int,
+    val currentCount: Int,
+    val remainingCount: Int,
+    val usagePercent: Double
+)
+
 class RoomLoader : DataLoader<AgentEntity,AgentLoaderExtraArgs>() {
     override suspend fun fetchData(
         page: Int,

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

@@ -30,6 +30,12 @@ object AppStore {
             AppState.appTheme = DarkThemeColors()
         }
         
+        // load chat background
+        val savedBgUrl = sharedPreferences.getString("chatBackgroundUrl", null)
+        if (savedBgUrl != null) {
+            AppState.chatBackgroundUrl = savedBgUrl
+        }
+
     }
 
     suspend fun saveData() {
@@ -54,5 +60,40 @@ object AppStore {
         }.apply()
     }
 
+    fun saveChatBackgroundUrl(url: String?) {
+        sharedPreferences.edit().apply {
+            if (url != null) {
+                putString("chatBackgroundUrl", url)
+            } else {
+                remove("chatBackgroundUrl")
+            }
+        }.apply()
+        AppState.chatBackgroundUrl = url
+    }
+
+    // ===================== 用户本地扩展信息 =====================
+    // 后端暂未提供 MBTI 与星座字段，使用本地持久化按用户维度进行存储
+    private fun mbtiKey(userId: Int) = "mbti_user_$userId"
+    private fun zodiacKey(userId: Int) = "zodiac_user_$userId"
+
+    fun getUserMbti(userId: Int): String? {
+        return sharedPreferences.getString(mbtiKey(userId), null)
+    }
+
+    fun setUserMbti(userId: Int, mbti: String?) {
+        sharedPreferences.edit().apply {
+            if (mbti.isNullOrEmpty()) remove(mbtiKey(userId)) else putString(mbtiKey(userId), mbti)
+        }.apply()
+    }
+
+    fun getUserZodiac(userId: Int): String? {
+        return sharedPreferences.getString(zodiacKey(userId), null)
+    }
+
+    fun setUserZodiac(userId: Int, zodiac: String?) {
+        sharedPreferences.edit().apply {
+            if (zodiac.isNullOrEmpty()) remove(zodiacKey(userId)) else putString(zodiacKey(userId), zodiac)
+        }.apply()
+    }
 
 }

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

@@ -35,16 +35,20 @@ import com.aiosman.ravenow.LocalSharedTransitionScope
 import com.aiosman.ravenow.ui.about.AboutScreen
 import com.aiosman.ravenow.ui.account.AccountEditScreen2
 import com.aiosman.ravenow.ui.account.AccountSetting
+import com.aiosman.ravenow.ui.account.MbtiSelectScreen
 import com.aiosman.ravenow.ui.account.RemoveAccountScreen
 import com.aiosman.ravenow.ui.account.ResetPasswordScreen
+import com.aiosman.ravenow.ui.account.ZodiacSelectScreen
 import com.aiosman.ravenow.ui.agent.AddAgentScreen
 import com.aiosman.ravenow.ui.agent.AgentImageCropScreen
 import com.aiosman.ravenow.ui.group.CreateGroupChatScreen
 import com.aiosman.ravenow.ui.chat.ChatAiScreen
+import com.aiosman.ravenow.ui.chat.ChatSettingScreen
 import com.aiosman.ravenow.ui.chat.ChatScreen
 import com.aiosman.ravenow.ui.chat.GroupChatScreen
 import com.aiosman.ravenow.ui.comment.CommentsScreen
 import com.aiosman.ravenow.ui.comment.notice.CommentNoticeScreen
+import com.aiosman.ravenow.ui.composables.AgentCreatedSuccessIndicator
 import com.aiosman.ravenow.ui.crop.ImageCropScreen
 import com.aiosman.ravenow.ui.favourite.FavouriteListPage
 import com.aiosman.ravenow.ui.favourite.FavouriteNoticeScreen
@@ -70,6 +74,7 @@ import com.aiosman.ravenow.ui.post.NewPostScreen
 import com.aiosman.ravenow.ui.post.PostScreen
 import com.aiosman.ravenow.ui.profile.AccountProfileV2
 import com.aiosman.ravenow.ui.index.tabs.profile.vip.VipSelPage
+import com.aiosman.ravenow.ui.notification.NotificationScreen
 
 sealed class NavigationRoute(
     val route: String,
@@ -104,6 +109,7 @@ sealed class NavigationRoute(
     data object FavouriteList : NavigationRoute("FavouriteList")
     data object Chat : NavigationRoute("Chat/{id}")
     data object ChatAi : NavigationRoute("ChatAi/{id}")
+    data object ChatSetting : NavigationRoute("ChatSetting")
     data object ChatGroup : NavigationRoute("ChatGroup/{id}/{name}/{avatar}")
     data object CommentNoticeScreen : NavigationRoute("CommentNoticeScreen")
     data object ImageCrop : NavigationRoute("ImageCrop")
@@ -115,6 +121,9 @@ sealed class NavigationRoute(
     data object GroupInfo : NavigationRoute("GroupInfo/{id}")
     data object VipSelPage : NavigationRoute("VipSelPage")
     data object RemoveAccountScreen: NavigationRoute("RemoveAccount")
+    data object NotificationScreen : NavigationRoute("NotificationScreen")
+    data object MbtiSelect : NavigationRoute("MbtiSelect")
+    data object ZodiacSelect : NavigationRoute("ZodiacSelect")
 }
 
 
@@ -416,6 +425,12 @@ fun NavigationController(
         composable(route = NavigationRoute.RemoveAccountScreen.route) {
             RemoveAccountScreen()
         }
+        composable(route = NavigationRoute.MbtiSelect.route) {
+            MbtiSelectScreen()
+        }
+        composable(route = NavigationRoute.ZodiacSelect.route) {
+            ZodiacSelectScreen()
+        }
         composable(route = NavigationRoute.VipSelPage.route) {
             VipSelPage()
         }
@@ -488,6 +503,14 @@ fun NavigationController(
             }
         }
 
+        composable(route = NavigationRoute.ChatSetting.route) {
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                ChatSettingScreen()
+            }
+        }
+
         composable(
             route = NavigationRoute.ChatGroup.route,
             arguments = listOf(navArgument("id") { type = NavType.StringType },
@@ -590,6 +613,13 @@ fun NavigationController(
             }
         }
 
+        composable(route = NavigationRoute.NotificationScreen.route) {
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                NotificationScreen()
+            }
+        }
 
     }
 
@@ -615,6 +645,7 @@ fun Navigation(
                     navController = navController,
                     startDestination = startDestination
                 )
+                AgentCreatedSuccessIndicator()
             }
         }
     }

app/src/main/java/com/aiosman/ravenow/ui/account/AccountEditViewModel.kt

@@ -26,6 +26,9 @@ object AccountEditViewModel : ViewModel() {
     var croppedBitmap by mutableStateOf<Bitmap?>(null)
     var isUpdating by mutableStateOf(false)
     var isLoading by mutableStateOf(false)
+    // 本地扩展字段
+    var mbti by mutableStateOf<String?>(null)
+    var zodiac by mutableStateOf<String?>(null)
     suspend fun reloadProfile(updateTrtcProfile:Boolean = false) {
         Log.d("AccountEditViewModel", "reloadProfile: 开始加载用户资料")
         isLoading = true
@@ -38,6 +41,12 @@ object AccountEditViewModel : ViewModel() {
                 bio = it.bio
                 // 清除之前裁剪的图片
                 croppedBitmap = null
+                // 读取本地扩展字段
+                try {
+                    val uid = it.id // 使用 profile 的 id，确保非空
+                    mbti = com.aiosman.ravenow.AppStore.getUserMbti(uid)
+                    zodiac = com.aiosman.ravenow.AppStore.getUserZodiac(uid)
+                } catch (_: Exception) { }
                 if (updateTrtcProfile) {
                     TrtcHelper.updateTrtcProfile(
                         it.nickName,
@@ -84,6 +93,13 @@ object AccountEditViewModel : ViewModel() {
             nickName = newName,
             bio = cleanBio
         )
+        // 保存本地扩展字段
+        try {
+            profile?.id?.let { uid ->
+                com.aiosman.ravenow.AppStore.setUserMbti(uid, mbti)
+                com.aiosman.ravenow.AppStore.setUserZodiac(uid, zodiac)
+            }
+        } catch (_: Exception) { }
         // 刷新用户资料
         reloadProfile()
         // 刷新个人资料页面的用户资料

app/src/main/java/com/aiosman/ravenow/ui/account/AccountSetting.kt

@@ -1,117 +1,177 @@
 package com.aiosman.ravenow.ui.account
 
-import android.widget.Toast
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Text
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.aiosman.ravenow.AppState
-import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.LocalNavController
-import com.aiosman.ravenow.Messaging
 import com.aiosman.ravenow.R
-import com.aiosman.ravenow.data.AccountServiceImpl
 import com.aiosman.ravenow.ui.NavigationRoute
-import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
-import com.aiosman.ravenow.ui.composables.ActionButton
 import com.aiosman.ravenow.ui.composables.StatusBarSpacer
-import com.aiosman.ravenow.ui.index.NavItem
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
-import kotlinx.coroutines.launch
+
+private object AccountSettingConstants {
+    const val BACK_BUTTON_SIZE = 36
+    const val BACK_BUTTON_ICON_SIZE = 24
+    const val BACK_BUTTON_START_PADDING = 19
+    const val OPTION_ITEM_HEIGHT = 56
+    const val OPTION_ITEM_ICON_SIZE = 24
+    const val OPTION_ITEM_HORIZONTAL_PADDING = 16
+    const val OPTION_ITEM_ICON_TEXT_SPACING = 12
+    const val OPTION_ITEM_TEXT_SIZE = 17
+    const val HEADER_VERTICAL_PADDING = 16
+    const val TITLE_OFFSET_X = 19
+    const val CARD_CORNER_RADIUS = 16
+}
+
+@Composable
+private fun CircularBackButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val appColors = LocalAppTheme.current
+    Box(
+        modifier = modifier
+            .size(AccountSettingConstants.BACK_BUTTON_SIZE.dp)
+            .background(
+                color = appColors.secondaryBackground,
+                shape = CircleShape
+            )
+            .noRippleClickable { onClick() },
+        contentAlignment = Alignment.Center
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.rider_pro_back_icon),
+            contentDescription = "返回",
+            modifier = Modifier.size(AccountSettingConstants.BACK_BUTTON_ICON_SIZE.dp),
+            colorFilter = ColorFilter.tint(appColors.text)
+        )
+    }
+}
+
+@Composable
+private fun SecurityOptionItem(
+    iconRes: Int,
+    label: String,
+    onClick: () -> Unit,
+    applyColorFilter: Boolean = true
+) {
+    val appColors = LocalAppTheme.current
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(AccountSettingConstants.OPTION_ITEM_HEIGHT.dp)
+            .padding(horizontal = AccountSettingConstants.OPTION_ITEM_HORIZONTAL_PADDING.dp)
+            .noRippleClickable { onClick() },
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Image(
+            painter = painterResource(id = iconRes),
+            contentDescription = null,
+            modifier = Modifier.size(AccountSettingConstants.OPTION_ITEM_ICON_SIZE.dp),
+            colorFilter = if (applyColorFilter) ColorFilter.tint(appColors.text) else null
+        )
+        Text(
+            text = label,
+            modifier = Modifier
+                .padding(start = AccountSettingConstants.OPTION_ITEM_ICON_TEXT_SPACING.dp)
+                .weight(1f),
+            color = appColors.text,
+            fontSize = AccountSettingConstants.OPTION_ITEM_TEXT_SIZE.sp,
+            fontWeight = FontWeight.Medium
+        )
+        Image(
+            painter = painterResource(id = R.drawable.rave_now_nav_right),
+            contentDescription = null,
+            modifier = Modifier.size(AccountSettingConstants.OPTION_ITEM_ICON_SIZE.dp),
+            colorFilter = ColorFilter.tint(appColors.secondaryText)
+        )
+    }
+}
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AccountSetting() {
     val appColors = LocalAppTheme.current
     val navController = LocalNavController.current
-    val scope = rememberCoroutineScope()
-    val context = LocalContext.current
     Column(
         modifier = Modifier
             .fillMaxSize()
             .background(appColors.background),
     ) {
         StatusBarSpacer()
+        
+        // 顶部标题栏
         Box(
-            modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp)
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = AccountSettingConstants.HEADER_VERTICAL_PADDING.dp)
         ) {
-            NoticeScreenHeader(
+            CircularBackButton(
-                title = stringResource(R.string.account_and_security),
+                onClick = { navController.navigateUp() },
-                moreIcon = false
+                modifier = Modifier.padding(start = AccountSettingConstants.BACK_BUTTON_START_PADDING.dp)
+            )
+            Text(
+                text = stringResource(R.string.account_and_security),
+                fontWeight = FontWeight.W800,
+                fontSize = AccountSettingConstants.OPTION_ITEM_TEXT_SIZE.sp,
+                color = appColors.text,
+                modifier = Modifier
+                    .align(Alignment.Center)
+                    .offset(x = AccountSettingConstants.TITLE_OFFSET_X.dp)
             )
         }
+        
+        // 安全选项卡片
         Column(
-            modifier = Modifier.padding(start = 24.dp)
-        ) {
-            Box(
             modifier = Modifier
                 .fillMaxWidth()
-                    .padding(vertical = 8.dp)
+                .background(
+                    color = appColors.background,
+                    shape = RoundedCornerShape(AccountSettingConstants.CARD_CORNER_RADIUS.dp)
+                )
         ) {
-                NavItem(
+            SecurityOptionItem(
-                    iconRes = R.mipmap.rider_pro_change_password,
+                iconRes = R.mipmap.icons_padlock,
                 label = stringResource(R.string.change_password),
-                    modifier = Modifier.noRippleClickable {
+                onClick = { navController.navigate(NavigationRoute.ChangePasswordScreen.route) }
-                        navController.navigate(NavigationRoute.ChangePasswordScreen.route)
-                    }
             )
-            }
 
-            // 分割线
+            SecurityOptionItem(
-            Box(
+                iconRes = R.mipmap.icons_block,
-                modifier = Modifier
+                label = stringResource(R.string.blocked_users),
-                    .fillMaxWidth()
+                onClick = {
-                    .height(1.dp)
+                    // TODO: 导航到屏蔽用户页面
-                    .background(appColors.divider)
+                }
             )
-            Box(
+
-                modifier = Modifier
+            SecurityOptionItem(
-                    .fillMaxWidth()
+                iconRes = R.mipmap.icons_remove,
-                    .padding(vertical = 8.dp)
-            ) {
-                NavItem(
-                    iconRes = R.drawable.rider_pro_moment_delete,
                 label = stringResource(R.string.remove_account),
-                    modifier = Modifier.noRippleClickable {
+                onClick = { navController.navigate(NavigationRoute.RemoveAccountScreen.route) },
-                        navController.navigate(NavigationRoute.RemoveAccountScreen.route)
+                applyColorFilter = false
-                    }
             )
         }
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(appColors.divider)
-            )
-        }
-
     }
 }

app/src/main/java/com/aiosman/ravenow/ui/account/MbtiSelectScreen.kt

@@ -0,0 +1,141 @@
+package com.aiosman.ravenow.ui.account
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+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.ColorFilter
+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.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import com.aiosman.ravenow.AppState
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
+
+// MBTI类型列表
+val MBTI_TYPES = listOf(
+    "INTJ", "INTP", "ENTJ", "ENTP",
+    "INFJ", "INFP", "ENFJ", "ENFP",
+    "ISTJ", "ISFJ", "ESTJ", "ESFJ",
+    "ISTP", "ISFP", "ESTP", "ESFP"
+)
+
+@Composable
+fun MbtiSelectScreen() {
+    val navController = LocalNavController.current
+    val appColors = LocalAppTheme.current
+    val model = AccountEditViewModel
+    val currentMbti = model.mbti
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(appColors.profileBackground)
+    ) {
+        // 头部
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 16.dp)
+        ) {
+            NoticeScreenHeader(
+                title = stringResource(R.string.choose_mbti),
+                moreIcon = false
+            )
+        }
+
+        // 列表
+        LazyColumn(
+            modifier = Modifier.fillMaxSize(),
+            contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 16.dp, vertical = 8.dp)
+        ) {
+            items(MBTI_TYPES) { mbti ->
+                MBTIItem(
+                    mbti = mbti,
+                    isSelected = mbti == currentMbti,
+                    onClick = {
+                        model.mbti = mbti
+                        // 立即保存到本地存储，确保选择后立即生效
+                        AppState.UserId?.let { uid ->
+                            com.aiosman.ravenow.AppStore.setUserMbti(uid, mbti)
+                        }
+                        navController.navigateUp()
+                    }
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+            }
+        }
+    }
+}
+
+@Composable
+fun MBTIItem(
+    mbti: String,
+    isSelected: Boolean,
+    onClick: () -> Unit
+) {
+    val appColors = LocalAppTheme.current
+    
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(16.dp))
+            .background(if (isSelected) appColors.main.copy(alpha = 0.1f) else Color.White)
+            .clickable(
+                indication = null,
+                interactionSource = remember { MutableInteractionSource() }
+            ) {
+                onClick()
+            }
+            .padding(16.dp)
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = mbti,
+                fontSize = 17.sp,
+                fontWeight = FontWeight.Normal,
+                color = if (isSelected) appColors.main else appColors.text,
+                modifier = Modifier.weight(1f)
+            )
+            
+            if (isSelected) {
+                Icon(
+                    imageVector = Icons.Default.Check,
+                    contentDescription = "Selected",
+                    modifier = Modifier.size(20.dp),
+                    tint = appColors.main
+                )
+            }
+        }
+    }
+}
+

app/src/main/java/com/aiosman/ravenow/ui/account/ZodiacSelectScreen.kt

@@ -0,0 +1,172 @@
+package com.aiosman.ravenow.ui.account
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+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.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import com.aiosman.ravenow.AppState
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
+
+// 星座资源ID列表
+val ZODIAC_SIGN_RES_IDS = listOf(
+    R.string.zodiac_aries,
+    R.string.zodiac_taurus,
+    R.string.zodiac_gemini,
+    R.string.zodiac_cancer,
+    R.string.zodiac_leo,
+    R.string.zodiac_virgo,
+    R.string.zodiac_libra,
+    R.string.zodiac_scorpio,
+    R.string.zodiac_sagittarius,
+    R.string.zodiac_capricorn,
+    R.string.zodiac_aquarius,
+    R.string.zodiac_pisces
+)
+
+/**
+ * 根据存储的星座字符串（可能是任何语言）找到对应的资源ID
+ * 如果找不到，返回null
+ */
+@Composable
+fun findZodiacResId(storedZodiac: String?): Int? {
+    if (storedZodiac.isNullOrEmpty()) return null
+    
+    // 尝试在所有语言的资源中查找匹配
+    ZODIAC_SIGN_RES_IDS.forEachIndexed { index, resId ->
+        val zodiacText = stringResource(resId)
+        if (zodiacText == storedZodiac) {
+            return resId
+        }
+    }
+    
+    // 如果找不到精确匹配，尝试通过资源ID索引查找（兼容旧数据）
+    // 这里可以根据需要添加更多兼容逻辑
+    return null
+}
+
+@Composable
+fun ZodiacSelectScreen() {
+    val navController = LocalNavController.current
+    val appColors = LocalAppTheme.current
+    val model = AccountEditViewModel
+    val currentZodiacResId = findZodiacResId(model.zodiac)
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(appColors.profileBackground)
+    ) {
+        // 头部
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(vertical = 16.dp)
+        ) {
+            NoticeScreenHeader(
+                title = stringResource(R.string.choose_zodiac),
+                moreIcon = false
+            )
+        }
+
+        // 列表
+        LazyColumn(
+            modifier = Modifier.fillMaxSize(),
+            contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 16.dp, vertical = 8.dp)
+        ) {
+            items(ZODIAC_SIGN_RES_IDS.size) { index ->
+                val zodiacResId = ZODIAC_SIGN_RES_IDS[index]
+                val zodiacText = stringResource(zodiacResId)
+                ZodiacItem(
+                    zodiac = zodiacText,
+                    zodiacResId = zodiacResId,
+                    isSelected = zodiacResId == currentZodiacResId,
+                    onClick = {
+                        // 保存当前语言的星座文本
+                        model.zodiac = zodiacText
+                        // 立即保存到本地存储，确保选择后立即生效
+                        AppState.UserId?.let { uid ->
+                            com.aiosman.ravenow.AppStore.setUserZodiac(uid, zodiacText)
+                        }
+                        navController.navigateUp()
+                    }
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+            }
+        }
+    }
+}
+
+@Composable
+fun ZodiacItem(
+    zodiac: String,
+    zodiacResId: Int,
+    isSelected: Boolean,
+    onClick: () -> Unit
+) {
+    val appColors = LocalAppTheme.current
+    
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(16.dp))
+            .background(if (isSelected) appColors.main.copy(alpha = 0.1f) else Color.White)
+            .clickable(
+                indication = null,
+                interactionSource = remember { MutableInteractionSource() }
+            ) {
+                onClick()
+            }
+            .padding(16.dp)
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = zodiac,
+                fontSize = 17.sp,
+                fontWeight = FontWeight.Normal,
+                color = if (isSelected) appColors.main else appColors.text,
+                modifier = Modifier.weight(1f)
+            )
+            
+            if (isSelected) {
+                Icon(
+                    imageVector = Icons.Default.Check,
+                    contentDescription = "Selected",
+                    modifier = Modifier.size(20.dp),
+                    tint = appColors.main
+                )
+            }
+        }
+    }
+}
+

app/src/main/java/com/aiosman/ravenow/ui/account/edit2.kt

@@ -1,19 +1,29 @@
 package com.aiosman.ravenow.ui.account
 
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.ArrowForward
 import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Edit as EditIcon
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -25,10 +35,14 @@ 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.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+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.viewModelScope
 import com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.AppStore
@@ -36,23 +50,35 @@ import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.LocalNavController
 import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.NavigationRoute
-import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
-import com.aiosman.ravenow.ui.composables.StatusBarSpacer
-import com.aiosman.ravenow.ui.composables.form.FormTextInput
 import com.aiosman.ravenow.ui.composables.debouncedClickable
 import com.aiosman.ravenow.ui.composables.rememberDebouncedNavigation
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import android.util.Log
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.SolidColor
+import com.aiosman.ravenow.ConstVars
+import com.aiosman.ravenow.ui.composables.pickupAndCompressLauncher
+import java.io.File
 
 /**
  * 编辑用户资料界面
  */
 @Composable
-fun AccountEditScreen2() {
+fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,) {
     val model = AccountEditViewModel
     val navController = LocalNavController.current
     val context = LocalContext.current
@@ -61,14 +87,27 @@ fun AccountEditScreen2() {
     
     // 防抖导航器
     val debouncedNavigation = rememberDebouncedNavigation()
+
+    // 添加图片选择启动器
+    val scope = rememberCoroutineScope()
+    val pickBannerImageLauncher = pickupAndCompressLauncher(
+        context,
+        scope,
+        maxSize = ConstVars.BANNER_IMAGE_MAX_SIZE,
+        quality = 100
+    ) { uri, file ->
+        // 处理选中的图片
+        onUpdateBanner?.invoke(uri, file, context)
+    }
+
     fun onNicknameChange(value: String) {
         // 去除换行符，确保昵称不包含换行
         val cleanValue = value.replace("\n", "").replace("\r", "")
         model.name = cleanValue
         usernameError = when {
-            cleanValue.trim().isEmpty() -> "昵称不能为空"
+            cleanValue.trim().isEmpty() -> context.getString(R.string.error_nickname_empty)
-            cleanValue.length < 3 -> "昵称长度不能小于3"
+            cleanValue.length < 3 -> context.getString(R.string.error_nickname_too_short)
-            cleanValue.length > 20 -> "昵称长度不能大于20"
+            cleanValue.length > 20 -> context.getString(R.string.error_nickname_too_long)
             else -> null
         }
     }
@@ -80,7 +119,7 @@ fun AccountEditScreen2() {
         val cleanValue = value.replace("\n", "").replace("\r", "")
         model.bio = cleanValue
         bioError = when {
-            cleanValue.length > 100 -> "个人简介长度不能大于100"
+            cleanValue.length > 100 -> context.getString(R.string.error_bio_too_long)
             else -> null
         }
     }
@@ -106,29 +145,313 @@ fun AccountEditScreen2() {
         // 确保显示的是当前登录用户的信息，而不是之前用户的缓存数据
         model.reloadProfile()
     }
+    
+    // 设置状态栏为透明，使用浅色图标（因为顶部背景是深色图片）
+    val systemUiController = rememberSystemUiController()
+    LaunchedEffect(Unit) {
+        systemUiController.setStatusBarColor(Color.Transparent, darkIcons = false)
+    }
+    
     StatusBarMaskLayout(
-        modifier = Modifier.background(color = appColors.background).padding(horizontal = 16.dp),
+        modifier = Modifier.background(Color(0xFFFAF9FB)),
-        darkIcons = !AppState.darkMode,
+        darkIcons = false, // 浅色图标（白色），因为顶部背景是深色
-        maskBoxBackgroundColor = appColors.background
+        maskBoxBackgroundColor = Color.Transparent
     ) {
-    Column(
+    Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(color = appColors.background),
+            .background(Color(0xFFFAF9FB))
-        horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        //StatusBarSpacer()
+        when {
+            model.isLoading -> {
+                // 加载中状态
                 Box(
-            modifier = Modifier.padding(horizontal = 0.dp, vertical = 16.dp)
+                    modifier = Modifier.fillMaxSize(),
+                    contentAlignment = Alignment.Center
                 ) {
-            NoticeScreenHeader(
+                    androidx.compose.material3.CircularProgressIndicator(
-                title = stringResource(R.string.edit_profile),
+                        color = appColors.main
-                moreIcon = false
+                    )
+                }
+            }
+            model.profile != null -> {
+                Column(
+                    modifier = Modifier.fillMaxSize()
                 ) {
-
+                    // 顶部背景区域（圆角在底部，覆盖状态栏）
-                Icon(
+                    val banner = model.profile?.banner
+                    val statusBarPadding = WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
+                    Box(
                         modifier = Modifier
-                        .size(24.dp)
+                            .fillMaxWidth()
+                            .offset(y = -statusBarPadding)
+                    ) {
+                        Box(
+                            modifier = Modifier
+                                .width(402.dp)
+                                .height(206.dp)
+                                .align(Alignment.TopCenter)
+                                .clip(RoundedCornerShape(bottomStart = 32.dp, bottomEnd = 32.dp))
+                        ) {
+                        if (banner != null) {
+                            CustomAsyncImage(
+                                context = context,
+                                imageUrl = banner,
+                                modifier = Modifier.fillMaxSize(),
+                                contentDescription = "Banner",
+                                contentScale = ContentScale.Crop
+                            )
+                        } else {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxSize()
+                                    .background(Color.Gray.copy(alpha = 0.2f))
+                            )
+                        }
+                        
+                        // 更换封面按钮（位于壁纸右下方）
+                        Box(
+                            modifier = Modifier
+                                .align(Alignment.BottomEnd)
+                                .padding(end = 16.dp, bottom = 20.dp)
+                                .clip(RoundedCornerShape(12.dp))
+                                .background(Color(0x5C7D7C80)) // RGB(125, 120, 128, 0.36)
+                                .padding(horizontal = 8.dp, vertical = 4.dp)
+                                .noRippleClickable {
+                                    Intent(Intent.ACTION_PICK).apply {
+                                        type = "image/*"
+                                        pickBannerImageLauncher.launch(this)
+                                    }
+                                }
+                        ) {
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = Arrangement.spacedBy(4.dp)
+                            ) {
+                                // 更换封面图标
+                                Icon(
+                                    painter = painterResource(
+                                        id = if (AppState.darkMode) {
+                                            // TODO: 添加更换封面暗色模式图标
+                                            R.mipmap.frame_4 // 临时占位，需替换为实际图标
+                                        } else {
+                                            // TODO: 添加更换封面亮色模式图标
+                                            R.mipmap.fengm // 临时占位，需替换为实际图标
+                                        }
+                                    ),
+                                    contentDescription = null,
+                                    modifier = Modifier.size(16.dp),
+                                    tint = Color.White
+                                )
+                                Text(
+                                    text = stringResource(R.string.change_cover),
+                                    fontSize = 12.sp,
+                                    color = Color.White
+                                )
+                            }
+                        }
+                        
+                        // 状态栏区域（时间、信号、电池）
+                        // 这里使用系统状态栏，不单独实现
+                        
+                        // 导航栏区域
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(horizontal = 16.dp)
+                        ) {
+                            Spacer(modifier = Modifier.height(statusBarPadding + 12.dp))
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(bottom = 12.dp)
+                            ) {
+                            // 返回按钮
+                            Box(
+                                modifier = Modifier
+                                    .size(44.dp)
+                                    .clip(CircleShape)
+                                    .background(Color.White.copy(alpha = 0.3f))
+                                    .noRippleClickable {
+                                        navController.navigateUp()
+                                    }
+                                    .align(Alignment.CenterStart),
+                                contentAlignment = Alignment.Center
+                            ) {
+                                Image(
+                                    painter = painterResource(id = R.drawable.rider_pro_back_icon),
+                                    contentDescription = "Back",
+                                    modifier = Modifier.size(24.dp),
+                                    colorFilter = ColorFilter.tint(Color.White)
+                                )
+                            }
+                            
+                            // 标题
+                            Text(
+                                text = stringResource(R.string.edit_profile_info),
+                                fontSize = 17.sp,
+                                fontWeight = FontWeight.SemiBold,
+                                color = Color.White,
+                                modifier = Modifier.align(Alignment.Center)
+                            )
+                            }
+                        }
+                        }
+                    }
+                    
+                    // 用户头像区域（距离顶部-50dp，包含状态栏高度，左右居中）
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .offset(y = (-50).dp - statusBarPadding),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        val it = model.profile!!
+                        Box(
+                            modifier = Modifier.size(96.dp),
+                            contentAlignment = Alignment.BottomEnd
+                        ) {
+                            // 头像
+                            CustomAsyncImage(
+                                context,
+                                model.croppedBitmap ?: it.avatar,
+                                modifier = Modifier
+                                    .size(96.dp)
+                                    .clip(CircleShape)
+                                    .border(2.4.dp, Color(0xFFFAF9FB), CircleShape),
+                                contentDescription = "",
+                                contentScale = ContentScale.Crop
+                            )
+                            
+                            // 编辑头像按钮
+                            Box(
+                                modifier = Modifier
+                                    .size(28.dp)
+                                    .clip(CircleShape)
+                                    .background(Color(0xFF110C13))
+                                    .border(2.dp, Color.White, CircleShape)
+                                    .debouncedClickable(debounceTime = 800L) {
+                                        debouncedNavigation {
+                                            navController.navigate(NavigationRoute.ImageCrop.route)
+                                        }
+                                    },
+                                contentAlignment = Alignment.Center
+                            ) {
+                                Icon(
+                                    painter = painterResource(
+                                        id = if (AppState.darkMode) {
+                                            // TODO: 添加编辑头像暗色模式图标
+                                            R.mipmap.frame_4 // 临时占位，需替换为实际图标
+                                        } else {
+                                            // TODO: 添加编辑头像亮色模式图标
+                                            R.mipmap.bi // 临时占位，需替换为实际图标
+                                        }
+                                    ),
+                                    contentDescription = "Edit Avatar",
+                                    modifier = Modifier.size(16.dp),
+                                    tint = Color.White
+                                )
+                            }
+                        }
+                    }
+                    
+
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1f)
+                            .padding(horizontal = 16.dp)
+                            .offset(y = (-74).dp)// 
+                    ) {
+                        // 昵称输入框
+                        ProfileInfoCard(
+                            label = stringResource(R.string.nickname),
+                            value = model.name,
+                            placeholder = "Value",
+                            onValueChange = { onNicknameChange(it) },
+                            isMultiline = false
+                        )
+                        
+                        Spacer(modifier = Modifier.height(16.dp))
+                        
+                        // 个人简介输入框
+                        ProfileInfoCard(
+                            label = stringResource(R.string.personal_intro),
+                            value = model.bio,
+                            placeholder = "Welcome to my fantiac word i will show you something about magic",
+                            onValueChange = { onBioChange(it) },
+                            isMultiline = true
+                        )
+                        
+                        Spacer(modifier = Modifier.height(16.dp))
+                        
+                        // MBTI 类型和星座
+                        Column(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .clip(RoundedCornerShape(16.dp))
+                                .background(Color.White)
+                        ) {
+                            // MBTI 类型
+                            ProfileSelectItem(
+                                label = stringResource(R.string.mbti_type),
+                                value = model.mbti ?: "ENFP",
+                                iconColor = Color(0xFF7C45ED),
+                                iconResDark = null, // TODO: 添加MBTI暗色模式图标
+                                iconResLight = null, // TODO: 添加MBTI亮色模式图标
+                                onClick = {
+                                    debouncedNavigation {
+                                        navController.navigate(NavigationRoute.MbtiSelect.route)
+                                    }
+                                }
+                            )
+                            
+                            // 分隔线
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .height(0.3.dp)
+                                    .background(Color(0x41413C43).copy(alpha = 0.2f))
+                                    .padding(horizontal = 16.dp)
+                            )
+                            
+                            // 星座（使用当前图标）
+                            ProfileSelectItem(
+                                label = stringResource(R.string.zodiac),
+                                value = model.zodiac?.let { storedZodiac ->
+                                    // 尝试找到对应的资源ID并显示当前语言的文本
+                                    findZodiacResId(storedZodiac)?.let { resId ->
+                                        stringResource(resId)
+                                    } ?: storedZodiac // 如果找不到，显示原始存储的值
+                                } ?: stringResource(R.string.zodiac_aries),
+                                iconColor = Color(0xFFFFCC00),
+                                iconResDark = R.mipmap.frame_4, // 星座暗色模式图标
+                                iconResLight = R.mipmap.xingzuo, // 星座亮色模式图标
+                                onClick = {
+                                    debouncedNavigation {
+                                        navController.navigate(NavigationRoute.ZodiacSelect.route)
+                                    }
+                                }
+                            )
+                        }
+                        
+                        Spacer(modifier = Modifier.weight(1f))
+                        
+                        // 保存按钮
+                        Box(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(50.dp)
+                                .clip(RoundedCornerShape(1000.dp))
+                                .background(
+                                    brush = Brush.horizontalGradient(
+                                        colors = listOf(
+                                            Color(0xFF7C45ED), // RGB(124, 69, 237) - 左侧
+                                            Color(0xFF7C57EE), // RGB(124, 87, 238) - 中间
+                                            Color(0xFF7BD8F8)  // RGB(123, 216, 248) - 右侧
+                                        )
+                                    )
+                                )
                                 .debouncedClickable(
                                     enabled = validate() && !model.isUpdating,
                                     debounceTime = 1000L
@@ -146,116 +469,170 @@ fun AccountEditScreen2() {
                                         }
                                     }
                                 },
-                    imageVector = Icons.Default.Check,
-                    contentDescription = "保存",
-                    tint = if (validate() && !model.isUpdating) appColors.text else appColors.nonActiveText
-                )
-            }
-        }
-        Spacer(modifier = Modifier.height(44.dp))
-        
-        // 显示内容或加载状态
-        Log.d("AccountEditScreen2", "UI状态 - profile: ${model.profile?.nickName}, isLoading: ${model.isLoading}")
-        when {
-            model.profile != null -> {
-                Log.d("AccountEditScreen2", "显示用户资料内容")
-                // 有数据时显示内容
-                val it = model.profile!!
-                Box(
-                    modifier = Modifier.size(88.dp),
                             contentAlignment = Alignment.Center
                         ) {
-                    CustomAsyncImage(
+                            Text(
-                        context,
+                                text = stringResource(R.string.save),
-                        model.croppedBitmap ?: it.avatar,
+                                fontSize = 17.sp,
-                        modifier = Modifier
+                                fontWeight = FontWeight.Normal,
-                            .size(88.dp)
+                                color = Color.White
-                            .clip(
-                                RoundedCornerShape(88.dp)
-                            ),
-                        contentDescription = "",
-                        contentScale = ContentScale.Crop
-                    )
-                    Box(
-                        modifier = Modifier
-                            .size(32.dp)
-                            .clip(CircleShape)
-                            .background(appColors.main)
-                            .align(Alignment.BottomEnd)
-                            .debouncedClickable(
-                                debounceTime = 800L
-                            ) {
-                                debouncedNavigation {
-                                    navController.navigate(NavigationRoute.ImageCrop.route)
-                                }
-                            },
-                        contentAlignment = Alignment.Center
-                    ) {
-                        Icon(
-                            Icons.Default.Add,
-                            contentDescription = "Add",
-                            tint = Color.White,
                             )
                         }
                     }
-                Spacer(modifier = Modifier.height(58.dp))
-                Column(
-                    modifier = Modifier
-                        .weight(1f)
-                        .padding(horizontal = 16.dp)
-                ) {
-                    FormTextInput(
-                        value = model.name,
-                        label = stringResource(R.string.nickname),
-                        hint = "Input nickname",
-                        modifier = Modifier.fillMaxWidth(),
-                        error = usernameError
-                    ) { value ->
-                        onNicknameChange(value)
-                    }
-                    FormTextInput(
-                        value = model.bio,
-                        label = stringResource(R.string.bio),
-                        hint = "Input bio",
-                        modifier = Modifier.fillMaxWidth(),
-                        error = bioError
-                    ) { value ->
-                        onBioChange(value)
-                    }
-                }
-            }
-            model.isLoading -> {
-                Log.d("AccountEditScreen2", "显示加载指示器")
-                // 加载中状态
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(16.dp),
-                    contentAlignment = Alignment.Center
-                ) {
-                    androidx.compose.material3.CircularProgressIndicator(
-                        color = appColors.main
-                    )
                 }
             }
             else -> {
-                Log.d("AccountEditScreen2", "显示错误信息 - 没有数据且不在加载中")
                 // 没有数据且不在加载中，显示错误信息
                 Box(
-                    modifier = Modifier
+                    modifier = Modifier.fillMaxSize(),
-                        .fillMaxSize()
-                        .padding(16.dp),
                     contentAlignment = Alignment.Center
                 ) {
-                    androidx.compose.material3.Text(
+                    Text(
-                        text = "加载用户资料失败，请重试",
+                        text = stringResource(R.string.error_load_profile_failed),
                         color = appColors.text
                     )
                 }
             }
         }
-
+    }
-    }}
+    }
-
+}
-
+
+/**
+ * 信息输入卡片组件
+ */
+@Composable
+fun ProfileInfoCard(
+    label: String,
+    value: String,
+    placeholder: String,
+    onValueChange: (String) -> Unit,
+    isMultiline: Boolean = false
+) {
+    val appColors = LocalAppTheme.current
+    
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(if (isMultiline) 66.dp else 56.dp) // 昵称框高度56dp，个人简介66dp
+            .clip(RoundedCornerShape(16.dp))
+            .background(Color.White),
+        contentAlignment = if (isMultiline) Alignment.TopStart else Alignment.CenterStart
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp)
+                .padding(vertical = if (isMultiline) 11.dp else 0.dp),
+            verticalAlignment = if (isMultiline) Alignment.Top else Alignment.CenterVertically
+        ) {
+            // 标签
+            Text(
+                text = label,
+                fontSize = 17.sp,
+                fontWeight = FontWeight.Normal,
+                color = Color.Black,
+                modifier = Modifier.width(100.dp)
+            )
+            
+            Spacer(modifier = Modifier.width(16.dp))
+            
+            // 输入框
+            Box(
+                modifier = Modifier.weight(1f)
+            ) {
+                if (value.isEmpty()) {
+                    Text(
+                        text = placeholder,
+                        fontSize = if (isMultiline) 15.sp else 17.sp,
+                        fontWeight = FontWeight.Normal,
+                        color = Color(0x993C3C43),
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                }
+                
+                BasicTextField(
+                    value = value,
+                    onValueChange = onValueChange,
+                    modifier = Modifier.fillMaxWidth(),
+                    textStyle = androidx.compose.ui.text.TextStyle(
+                        fontSize = if (isMultiline) 15.sp else 17.sp,
+                        fontWeight = FontWeight.Normal,
+                        color = Color.Black
+                    ),
+                    cursorBrush = SolidColor(Color.Black),
+                    maxLines = if (isMultiline) Int.MAX_VALUE else 1,
+                    singleLine = !isMultiline
+                )
+            }
+        }
+    }
+}
+
+/**
+ * 选择项组件（MBTI、星座）
+ */
+@Composable
+fun ProfileSelectItem(
+    label: String,
+    value: String,
+    iconColor: Color,
+    onClick: () -> Unit,
+    iconResDark: Int? = null,
+    iconResLight: Int? = null
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(56.dp)
+            .clickable(onClick = onClick)
+            .padding(horizontal = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            // 自定义图标
+            Icon(
+                painter = painterResource(
+                    id = if (AppState.darkMode) {
+                        iconResDark ?: R.mipmap.frame_4 // 使用传入的暗色模式图标，或默认占位
+                    } else {
+                        iconResLight ?: R.mipmap.naoz // 使用传入的亮色模式图标，或默认占位
+                    }
+                ),
+                contentDescription = null,
+                modifier = Modifier.size(24.dp),
+                tint = iconColor
+            )
+            
+            Text(
+                text = label,
+                fontSize = 17.sp,
+                fontWeight = FontWeight.Normal,
+                color = Color.Black
+            )
+        }
+        
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            Text(
+                text = value,
+                fontSize = 17.sp,
+                fontWeight = FontWeight.Normal,
+                color = Color(0x993C3C43)
+            )
+            
+            Icon(
+                imageVector = Icons.Default.ArrowForward,
+                contentDescription = null,
+                modifier = Modifier.size(8.dp),
+                tint = Color(0x4D3C3C43)
+            )
+        }
+    }
 }

app/src/main/java/com/aiosman/ravenow/ui/agent/AddAgent.kt

@@ -74,6 +74,17 @@ import androidx.compose.animation.core.infiniteRepeatable
 import androidx.compose.animation.core.rememberInfiniteTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.offset
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.text.TextStyle
+import com.aiosman.ravenow.ui.agent.AddAgentViewModel.showManualCreation
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.LottieConstants
+import com.airbnb.lottie.compose.rememberLottieComposition
 /**
  * 添加智能体界面
  */
@@ -87,7 +98,10 @@ fun AddAgentScreen() {
     var errorMessage by remember { mutableStateOf<String?>(null) }
     var isProcessing by remember { mutableStateOf(false) }
     var showWaveAnimation by remember { mutableStateOf(false) }
-
+    var isCreatingAgent by remember { mutableStateOf(false) } // 控制是否处于创建状态
+    var showManualCreationForm by remember { mutableStateOf(false) } // 控制是否显示手动创建表单
+    var tempDesc by remember { mutableStateOf("") } // 独立的临时描述变量
+    val keyboardController = LocalSoftwareKeyboardController.current
 
     fun onNameChange(value: String) {
         model.name = value.trim()
@@ -101,15 +115,37 @@ fun AddAgentScreen() {
     fun onDescChange(value: String) {
         model.desc = value.trim()
         agnetDescError = when {
-            value.length > 100 -> "简介长度不能大于100"
+            value.length > 512 -> "简介长度不能大于512"
+            else -> null
+        }
+    }
+    fun onTempDescChange(value: String) {
+        tempDesc = value.trim()
+        agnetDescError = when {
+            value.length > 512 -> "简介长度不能大于512"
             else -> null
         }
     }
-
     fun validate(): Boolean {
         return agnetNameError == null && agnetDescError == null
     }
 
+    // AI文案优化
+    suspend fun optimizeTextWithAI(content: String): String? {
+        return try {
+            val sessionId = ""
+            val response = com.aiosman.ravenow.data.api.ApiClient.api.agentMoment(
+                com.aiosman.ravenow.data.api.AgentMomentRequestBody(
+                    generateText = content,
+                    sessionId = sessionId
+                )
+            )
+            response.body()?.data
+        } catch (e: Exception) {
+            e.printStackTrace()
+            null
+        }
+    }
 
     // 处理系统返回键
     BackHandler {
@@ -123,7 +159,22 @@ fun AddAgentScreen() {
     // 页面进入时重置头像选择状态
     LaunchedEffect(Unit) {
         model.isSelectingAvatar = false
+        // 根据标记恢复相应的状态
+        if (model.isAutoModeManualForm) {
+            // 恢复自动模式下的手动表单状态
+            showManualCreationForm = model.showManualCreationForm
+            isCreatingAgent = model.isCreatingAgent
+            showWaveAnimation = model.showWaveAnimation
+            showManualCreation = model.showManualCreation
+        } else {
+            // 恢复手动模式下的状态
+            showManualCreation = model.showManualCreation
+            showManualCreationForm = model.showManualCreationForm
+            isCreatingAgent = model.isCreatingAgent
+            showWaveAnimation = model.showWaveAnimation
         }
+    }
+
 
     Column(
         modifier = Modifier
@@ -131,7 +182,9 @@ fun AddAgentScreen() {
             .background(color = appColors.decentBackground),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        var showManualCreation by remember { mutableStateOf(false) }
+        var showManualCreation by remember {
+            mutableStateOf(model.showManualCreation)
+        }
         StatusBarSpacer()
         Box(
             modifier = Modifier.padding(horizontal = 14.dp, vertical = 16.dp)
@@ -168,6 +221,8 @@ fun AddAgentScreen() {
             }
         }
         Spacer(modifier = Modifier.height(1.dp))
+
+        if (!isCreatingAgent) {
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -185,17 +240,20 @@ fun AddAgentScreen() {
                     contentScale = ContentScale.Crop
                 )
             }
+        }
             Spacer(modifier = Modifier.height(16.dp))
             Column(
                 modifier = Modifier.fillMaxWidth()
                     .padding(start = 20.dp)
             ) {
                 Text(
-                text = "${AppState.profile?.nickName ?: "User"} 你好呀！今天想创造什么？",
+                    text = "${AppState.profile?.nickName ?: "User"} ${stringResource(R.string.welcome_1)}",
                     fontSize = 16.sp,
+                    color = appColors.text,
                     fontWeight = FontWeight.W600
                 )
             }
+        if (!isCreatingAgent) {
             Spacer(modifier = Modifier.height(8.dp))
             Column(
                 modifier = Modifier.fillMaxWidth()
@@ -203,16 +261,17 @@ fun AddAgentScreen() {
             ) {
                 if (!showManualCreation) {
                     Text(
-                    text = "只需要一句话，你的专属AI将在这里诞生。",
+                        text = stringResource(R.string.welcome_2),
                         fontSize = 14.sp,
-                    color = LocalAppTheme.current.text.copy(alpha = 0.6f),
+                        color = appColors.text.copy(alpha = 0.6f),
                     )
                 }
             }
+        }
             Spacer(modifier = Modifier.height(24.dp))
 
-
         if (!showManualCreation) {
+            //自动创造AI界面
             Column(
                 modifier = Modifier
                     .padding(horizontal = 20.dp)
@@ -245,7 +304,6 @@ fun AddAgentScreen() {
                         )
                 ) {
                     val focusRequester = remember { FocusRequester() }
-                    val keyboardController = LocalSoftwareKeyboardController.current
 
                     Box(
                         modifier = Modifier
@@ -258,36 +316,71 @@ fun AddAgentScreen() {
                             }
                     )
 
-                    FormTextInput2(
+                    TextField(
-                        value = model.desc,
+                        value = tempDesc,
-                        hint = "一个会写诗的AI，一个懂你笑点的AI...",
+                        onValueChange = { value -> onTempDescChange(value) },
-                        background = appColors.inputBackground2,
-                        focusRequester = focusRequester,
                         modifier = Modifier
                             .fillMaxWidth()
                             .height(95.dp)
-                    ) { value ->
+                            .focusRequester(focusRequester),
-                        onDescChange(value)
+                        placeholder = {
-                    }
+                            Text(
+                                text = stringResource(R.string.agent_desc_hint_auto),
+                                color = Color.Gray
+                            )
+                        },
+                        textStyle = TextStyle(
+                            color = LocalAppTheme.current.text,
+                            fontSize = 16.sp
+                        ),
+                        colors = TextFieldDefaults.colors(
+                            focusedIndicatorColor = Color.Transparent,
+                            unfocusedIndicatorColor = Color.Transparent,
+                            disabledIndicatorColor = Color.Transparent,
+                            focusedContainerColor = appColors.inputBackground2,
+                            unfocusedContainerColor = appColors.inputBackground2,
+                        ),
+                        shape = RoundedCornerShape(10.dp),
+                        supportingText = null,
+                        trailingIcon = null,
+                        leadingIcon = null
+                    )
 
                     Row(
                         modifier = Modifier
                             .align(Alignment.BottomEnd)
                             .padding(end = 12.dp, bottom = 12.dp)
                             .noRippleClickable {
-                                if (!isProcessing && model.desc.isNotEmpty()) {
+                                // 只有在有内容且未处理中且未创建中时才可点击
+                                if (tempDesc.isNotEmpty() && !isProcessing && !isCreatingAgent) {
                                     isProcessing = true
+                                    showWaveAnimation = true // 显示构思动画
+                                    keyboardController?.hide()
                                     model.viewModelScope.launch {
                                         try {
-                                            //AI美化功能待实现
+                                            val optimizedText = optimizeTextWithAI(tempDesc)
+                                            if (optimizedText != null) {
+                                                onTempDescChange(optimizedText)
+                                            }
                                         } catch (e: Exception) {
                                             e.printStackTrace()
                                         } finally {
                                             isProcessing = false
+                                            showWaveAnimation = false
+                                            isCreatingAgent = true
+                                            showManualCreationForm = true
+                                            onDescChange(tempDesc)
                                         }
                                     }
                                 }
-                            },
+                            }
+                            .then(
+                                if (tempDesc.isEmpty() || isProcessing || isCreatingAgent) {
+                                    Modifier.alpha(0.5f)
+                                } else {
+                                    Modifier
+                                }
+                            ),
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         Icon(
@@ -298,7 +391,7 @@ fun AddAgentScreen() {
                         )
                         Spacer(modifier = Modifier.width(5.dp))
                         Text(
-                            text = "AI美化",
+                            text = stringResource(R.string.agent_text_beautify),
                             color = Color(0xFF6246FF),
                             fontSize = 14.sp
                         )
@@ -306,7 +399,8 @@ fun AddAgentScreen() {
                 }
             }
             Spacer(modifier = Modifier.height(24.dp))
-            if (showWaveAnimation) {
+            if ((isCreatingAgent && showWaveAnimation) || (isProcessing && showWaveAnimation)) {
+                // 显示构思动画
                 Row(
                     modifier = Modifier
                         .align(Alignment.Start)
@@ -314,83 +408,113 @@ fun AddAgentScreen() {
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     Box(
-                        modifier = Modifier.size(18.dp)
+                        modifier = Modifier.size(32.dp)
                     ) {
-                        val infiniteTransition = rememberInfiniteTransition()
+                        LottieAnimation(
-                        val dot1Translation by infiniteTransition.animateFloat(
+                            composition = rememberLottieComposition(LottieCompositionSpec.Asset("loading.lottie")).value,
-                            initialValue = 0f,
+                            iterations = LottieConstants.IterateForever,
-                            targetValue = -12f,
+                            modifier = Modifier.matchParentSize()
-                            animationSpec = infiniteRepeatable(
-                                animation = tween(
-                                    durationMillis = 1000,
-                                    easing = FastOutSlowInEasing
-                                ),
-                                repeatMode = RepeatMode.Reverse,
-                                initialStartOffset = StartOffset(0)
-                            )
-                        )
-
-                        val dot2Translation by infiniteTransition.animateFloat(
-                            initialValue = 0f,
-                            targetValue = -12f,
-                            animationSpec = infiniteRepeatable(
-                                animation = tween(
-                                    durationMillis = 1000,
-                                    easing = FastOutSlowInEasing
-                                ),
-                                repeatMode = RepeatMode.Reverse,
-                                initialStartOffset = StartOffset(333)
-                            )
-                        )
-
-                        val dot3Translation by infiniteTransition.animateFloat(
-                            initialValue = 0f,
-                            targetValue = -12f,
-                            animationSpec = infiniteRepeatable(
-                                animation = tween(
-                                    durationMillis = 1000,
-                                    easing = FastOutSlowInEasing
-                                ),
-                                repeatMode = RepeatMode.Reverse,
-                                initialStartOffset = StartOffset(666)
-                            )
-                        )
-
-                        // 三个彩色圆点
-                        Box(
-                            modifier = Modifier
-                                .size(6.dp)
-                                .align(Alignment.BottomStart)
-                                .offset(y = dot1Translation.dp)
-                                .background(Color(0xFFFFD400), CircleShape)
-                        )
-
-                        Box(
-                            modifier = Modifier
-                                .size(6.dp)
-                                .align(Alignment.BottomCenter)
-                                .offset(y = dot2Translation.dp)
-                                .background(Color(0xFF2F80FF), CircleShape)
-                        )
-
-                        Box(
-                            modifier = Modifier
-                                .size(6.dp)
-                                .align(Alignment.BottomEnd)
-                                .offset(y = dot3Translation.dp)
-                                .background(Color(0xFF27C84D), CircleShape)
                         )
                     }
-
-                    Spacer(modifier = Modifier.width(8.dp))
-
                     Text(
-                        text = "正在为你构思",
+                        text = stringResource(R.string.ideaing),
-                        color = Color.Black.copy(alpha = 0.6f),
+                        color = appColors.text.copy(alpha = 0.6f),
                         fontSize = 14.sp
                     )
                 }
+            } else if (isCreatingAgent && !showWaveAnimation && showManualCreationForm) {
+                Column(
+                    modifier = Modifier
+                        .padding(horizontal = 16.dp)
+                        .align(Alignment.Start)
+                ) {
+                    Text(
+                        text = stringResource(R.string.avatar),
+                        fontSize = 12.sp,
+                        color = appColors.text,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Box(
+                        modifier = Modifier
+                            .size(72.dp)
+                            .clip(CircleShape)
+                            .background(
+                                brush = Brush.linearGradient(
+                                    colors = listOf(
+                                        Color(0x777c45ed),
+                                        Color(0x777c68ef),
+                                        Color(0x557bd8f8)
+                                    )
+                                )
+                            )
+                            .align(Alignment.Start)
+                            .noRippleClickable {
+                                // 保存当前状态
+                                model.showManualCreationForm = showManualCreationForm
+                                model.isCreatingAgent = isCreatingAgent
+                                model.showWaveAnimation = showWaveAnimation
+                                model.showManualCreation = showManualCreation
+                                model.isAutoModeManualForm = true // 标记为自动模式下的手动表单
+                                // 设置正在选择头像的标志
+                                model.isSelectingAvatar = true
+                                navController.navigate(NavigationRoute.AgentImageCrop.route)
+                            },
+                        contentAlignment = Alignment.Center
+                    ){
+                        // 如果已有裁剪后的头像，则显示头像，否则显示编辑图标
+                        if (model.croppedBitmap != null) {
+                            Image(
+                                bitmap = model.croppedBitmap!!.asImageBitmap(),
+                                contentDescription = "Avatar",
+                                modifier = Modifier
+                                    .size(72.dp)
+                                    .clip(CircleShape),
+                                contentScale = ContentScale.Crop
+                            )
                         } else {
+                            Icon(
+                                painter = painterResource(id = R.mipmap.icons_infor_edit),
+                                contentDescription = "Edit",
+                                tint = Color.White,
+                                modifier = Modifier.size(20.dp),
+                            )
+                        }
+                    }
+                    Spacer(modifier = Modifier.height(18.dp))
+                    // 原版两个输入框
+                    Text(
+                        text = stringResource(R.string.agent_name),
+                        fontSize = 12.sp,
+                        color = appColors.text,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    FormTextInput(
+                        value = model.name,
+                        hint = stringResource(R.string.agent_name_hint_1),
+                        background = appColors.inputBackground2,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { value ->
+                        onNameChange(value)
+                    }
+                    Text(
+                        text = stringResource(R.string.agent_desc),
+                        fontSize = 12.sp,
+                        color = appColors.text,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    FormTextInput2(
+                        value = model.desc,
+                        hint = stringResource(R.string.agent_desc_hint),
+                        background = appColors.inputBackground2,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { value ->
+                        onDescChange(value)
+                    }
+                }
+            } else if (!isCreatingAgent && !showWaveAnimation) {
                 Box(
                     modifier = Modifier
                         .align(Alignment.Start)
@@ -408,6 +532,8 @@ fun AddAgentScreen() {
                         )
                         .noRippleClickable {
                             showManualCreation = true
+                            tempDesc = ""
+                            agnetDescError = null
                         }
                 ) {
                     Row(
@@ -419,12 +545,13 @@ fun AddAgentScreen() {
                         Icon(
                             painter = painterResource(id = R.mipmap.icons_infor_edit),
                             contentDescription = null,
+                            tint = appColors.text,
                             modifier = Modifier.size(18.dp),
                         )
                         Spacer(modifier = Modifier.width(8.dp))
                         Text(
-                            text = "手动创造Ai",
+                            text =  stringResource(R.string.create_agent_hand),
-                            color = Color.Black,
+                            color = appColors.text,
                             fontWeight = FontWeight.W600,
                             fontSize = 14.sp
                         )
@@ -432,12 +559,12 @@ fun AddAgentScreen() {
                 }
             }
         }else {
+            //手动创造AI界面
             Column(
                 modifier = Modifier
                     .padding(horizontal = 16.dp)
                     .align(Alignment.Start)
             ) {
-                // 添加新的一句话创造AI按钮
                 Box(
                     modifier = Modifier
                         .align(Alignment.Start)
@@ -466,6 +593,13 @@ fun AddAgentScreen() {
                         )
                         .noRippleClickable {
                             showManualCreation = false
+                            model.name = ""
+                            model.desc = ""
+                            model.croppedBitmap = null
+                            isCreatingAgent = false
+                            showManualCreationForm = false
+                            showWaveAnimation = false
+                            isProcessing = false
                         }
                 ) {
                     Row(
@@ -477,13 +611,13 @@ fun AddAgentScreen() {
                         Icon(
                             painter = painterResource(id = R.mipmap.icons_info_magic),
                             contentDescription = null,
-                            tint = Color.Black,
+                            tint = appColors.text,
                             modifier = Modifier.size(18.dp),
                         )
                         Spacer(modifier = Modifier.width(8.dp))
                         Text(
-                            text = "一句话创造AI",
+                            text =  stringResource(R.string.create_agent_auto),
-                            color = Color.Black,
+                            color = appColors.text,
                             fontWeight = FontWeight.W600,
                             fontSize = 14.sp
                         )
@@ -492,8 +626,9 @@ fun AddAgentScreen() {
 
                 Spacer(modifier = Modifier.height(16.dp))
                 Text(
-                text = "头像",
+                    text = stringResource(R.string.avatar),
                     fontSize = 12.sp,
+                    color = appColors.text,
                     fontWeight = FontWeight.W600
                 )
                 Spacer(modifier = Modifier.height(4.dp))
@@ -512,12 +647,29 @@ fun AddAgentScreen() {
                         )
                         .align(Alignment.Start)
                         .noRippleClickable {
+                            // 保存当前状态
+                            model.showManualCreation = showManualCreation
+                            model.showManualCreationForm = showManualCreationForm
+                            model.isCreatingAgent = isCreatingAgent
+                            model.showWaveAnimation = showWaveAnimation
+                            model.isAutoModeManualForm = false // 标记为手动模式下的手动表单
                             // 设置正在选择头像的标志
                             model.isSelectingAvatar = true
                             navController.navigate(NavigationRoute.AgentImageCrop.route)
                         },
                     contentAlignment = Alignment.Center
                 ) {
+                    // 如果已有裁剪后的头像，则显示头像，否则显示编辑图标
+                    if (model.croppedBitmap != null) {
+                        Image(
+                            bitmap = model.croppedBitmap!!.asImageBitmap(),
+                            contentDescription = "Avatar",
+                            modifier = Modifier
+                                .size(72.dp)
+                                .clip(CircleShape),
+                            contentScale = ContentScale.Crop
+                        )
+                    } else {
                         Icon(
                             painter = painterResource(id = R.mipmap.icons_infor_edit),
                             contentDescription = "Edit",
@@ -526,6 +678,7 @@ fun AddAgentScreen() {
                         )
                     }
                 }
+            }
             Spacer(modifier = Modifier.height(18.dp))
             // 原版两个输入框
             Column(
@@ -535,12 +688,13 @@ fun AddAgentScreen() {
                 Text(
                     text = stringResource(R.string.agent_name),
                     fontSize = 12.sp,
+                    color = appColors.text,
                     fontWeight = FontWeight.W600
                 )
                 Spacer(modifier = Modifier.height(4.dp))
                 FormTextInput(
                     value = model.name,
-                    hint = "给它取个名字，让它成为独一无二的你",
+                    hint = stringResource(R.string.agent_name_hint_1),
                     background = appColors.inputBackground2,
                     modifier = Modifier.fillMaxWidth(),
                 ) { value ->
@@ -549,6 +703,7 @@ fun AddAgentScreen() {
                 Text(
                     text = stringResource(R.string.agent_desc),
                     fontSize = 12.sp,
+                    color = appColors.text,
                     fontWeight = FontWeight.W600
                 )
                 Spacer(modifier = Modifier.height(4.dp))
@@ -561,6 +716,7 @@ fun AddAgentScreen() {
                     onDescChange(value)
                 }
             }
+            //手动创造AI界面
         }
 
         // 错误信息显示
@@ -577,7 +733,6 @@ fun AddAgentScreen() {
                 )
             }
         }
-
         ActionButton(
             modifier = Modifier
                 .width(345.dp)
@@ -613,9 +768,6 @@ fun AddAgentScreen() {
             // 清除之前的错误信息
             errorMessage = null
 
-            // 显示波动动画
-            showWaveAnimation = true
-
             // 调用创建智能体API
             model.viewModelScope.launch {
                 try {
@@ -624,14 +776,15 @@ fun AddAgentScreen() {
                         // 创建成功，清空数据并关闭页面
                         model.clearData()
                         navController.popBackStack()
+                        AppState.agentCreatedSuccess = true
                     }
                 } catch (e: Exception) {
-                    // 隐藏波动动画
-                    showWaveAnimation = false
-
                     // 显示错误信息
                     errorMessage = "创建智能体失败: ${e.message}"
                     e.printStackTrace()
+                    // 3秒后清除错误信息
+                    kotlinx.coroutines.delay(3000)
+                    errorMessage = null
                 }
             }
         }

app/src/main/java/com/aiosman/ravenow/ui/agent/AddAgentViewModel.kt

@@ -24,7 +24,12 @@ object AddAgentViewModel : ViewModel() {
     var croppedBitmap by mutableStateOf<Bitmap?>(null)
     var isUpdating by mutableStateOf(false)
     var isSelectingAvatar by mutableStateOf(false) // 标记是否正在选择头像
-
+    var showManualCreationForm by mutableStateOf(false)
+    var isCreatingAgent by mutableStateOf(false)
+    var showWaveAnimation by mutableStateOf(false)
+    var showManualCreation by mutableStateOf(false)
+    // 添加一个标志来区分两种手动表单状态
+    var isAutoModeManualForm by mutableStateOf(false)
     suspend fun updateAgentAvatar(context: Context) {
         croppedBitmap?.let {
             val file = File(context.cacheDir, "agent_avatar.jpg")
@@ -66,11 +71,11 @@ object AddAgentViewModel : ViewModel() {
 
     fun validate(): String? {
         return when {
-//            name.isEmpty() -> "智能体名称不能为空"
+            name.isEmpty() -> "智能体名称不能为空"
-//            name.length < 2 -> "智能体名称长度不能少于2个字符"
+            name.length < 2 -> "智能体名称长度不能少于2个字符"
-//            name.length > 20 -> "智能体名称长度不能超过20个字符"
+            name.length > 20 -> "智能体名称长度不能超过20个字符"
             desc.isEmpty() -> "智能体描述不能为空"
-            desc.length > 100 -> "智能体描述长度不能超过100个字符"
+            desc.length > 512 -> "智能体描述长度不能超过512个字符"
             else -> null
         }
     }
@@ -84,5 +89,10 @@ object AddAgentViewModel : ViewModel() {
         croppedBitmap = null
         isUpdating = false
         isSelectingAvatar = false
+        showManualCreationForm = false
+        isCreatingAgent = false
+        showWaveAnimation = false
+        showManualCreation = false
+        isAutoModeManualForm = false
     }
 }

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

@@ -79,11 +79,12 @@ import com.aiosman.ravenow.R
 import com.aiosman.ravenow.entity.ChatItem
 import com.aiosman.ravenow.exp.formatChatTime
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
-import com.aiosman.ravenow.ui.composables.DropdownMenu
-import com.aiosman.ravenow.ui.composables.MenuItem
 import com.aiosman.ravenow.ui.composables.StatusBarSpacer
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.utils.NetworkUtils
+import com.aiosman.ravenow.ui.NavigationRoute
+import com.aiosman.ravenow.AppState
+import androidx.compose.ui.layout.ContentScale
 import io.openim.android.sdk.enums.MessageType
 import kotlinx.coroutines.launch
 import java.util.UUID
@@ -91,10 +92,10 @@ import java.util.UUID
 
 @Composable
 fun ChatAiScreen(userId: String) {
-    var isMenuExpanded by remember { mutableStateOf(false) }
     val navController = LocalNavController.current
     val context = LocalNavController.current.context
     val AppColors = LocalAppTheme.current
+    val chatBackgroundUrl = AppState.chatBackgroundUrl
     var goToNewCount by remember { mutableStateOf(0) }
     val viewModel = viewModel<ChatAiViewModel>(
         key = "ChatAiViewModel_$userId",
@@ -158,14 +159,25 @@ fun ChatAiScreen(userId: String) {
     }
 
 
+    Box(modifier = Modifier.fillMaxSize()) {
+        if (chatBackgroundUrl != null && chatBackgroundUrl.isNotEmpty()) {
+            CustomAsyncImage(
+                imageUrl = chatBackgroundUrl,
+                modifier = Modifier.fillMaxSize(),
+                contentDescription = "chat_background",
+                contentScale = ContentScale.Crop
+            )
+        }
+
         Scaffold(
             modifier = Modifier
                 .fillMaxSize(),
+            backgroundColor = Color.Transparent,
             topBar = {
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .background(AppColors.background)
+                    .background(Color.Transparent)
             ) {
                 StatusBarSpacer()
                 Row(
@@ -213,49 +225,24 @@ fun ChatAiScreen(userId: String) {
                             modifier = Modifier
                                 .size(28.dp)
                                 .noRippleClickable {
-                                    isMenuExpanded = true
+                                    navController.navigate(NavigationRoute.ChatSetting.route)
                                 },
                             contentDescription = null,
                             colorFilter = ColorFilter.tint(
                                 AppColors.text)
                         )
-                        DropdownMenu(
-                            expanded = isMenuExpanded,
-                            onDismissRequest = {
-                                isMenuExpanded = false
-                            },
-                            menuItems = listOf(
-                                MenuItem(
-                                    title = if (viewModel.notificationStrategy == "mute") "Unmute" else "Mute",
-                                    icon = if (viewModel.notificationStrategy == "mute") R.drawable.rider_pro_notice_mute else R.drawable.rider_pro_notice_active,
-                                ) {
-
-                                    isMenuExpanded = false
-                                    if (NetworkUtils.isNetworkAvailable(context)) {
-                                        viewModel.viewModelScope.launch {
-                                            if (viewModel.notificationStrategy == "mute") {
-                                                viewModel.updateNotificationStrategy("active")
-                                            } else {
-                                                viewModel.updateNotificationStrategy("mute")
-                                            }
-                                        }
-                                    } else {
-                                        android.widget.Toast.makeText(context, "网络连接异常，请检查网络设置", android.widget.Toast.LENGTH_SHORT).show()
-                                    }
-                                }
-                            ),
-
-                            )
                     }
                 }
             }
         },
         bottomBar = {
+            val hasChatBackground = AppState.chatBackgroundUrl != null && AppState.chatBackgroundUrl!!.isNotEmpty()
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
                     .imePadding()
             ) {
+                if (!hasChatBackground) {
                     Box(
                         modifier = Modifier
                             .fillMaxWidth()
@@ -263,6 +250,7 @@ fun ChatAiScreen(userId: String) {
                             .background(
                                 AppColors.decentBackground)
                     )
+                }
                 Spacer(modifier = Modifier.height(8.dp))
                 ChatAiInput(
                     onSendImage = {
@@ -283,7 +271,7 @@ fun ChatAiScreen(userId: String) {
         Box(
             modifier = Modifier
                 .fillMaxSize()
-                .background(Color.White)
+                .background(Color.Transparent)
                 .padding(paddingValues)
         ) {
             LazyColumn(
@@ -346,8 +334,7 @@ fun ChatAiScreen(userId: String) {
                 }
             }
         }
-
+        }
-
     }
 }
 
@@ -571,7 +558,8 @@ fun ChatAiInput(
     }
     Box( modifier = Modifier
         .fillMaxWidth()
-        .padding(start = 16.dp, end = 16.dp, bottom = 12.dp),){
+        .background(Color.Transparent)
+        .padding(start = 16.dp, end = 16.dp, bottom = 45.dp),){
 
         Row(
             modifier = Modifier

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

@@ -64,6 +64,7 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.SoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
@@ -74,10 +75,12 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.LocalNavController
 import com.aiosman.ravenow.R
 import com.aiosman.ravenow.entity.ChatItem
 import com.aiosman.ravenow.exp.formatChatTime
+import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.DropdownMenu
 import com.aiosman.ravenow.ui.composables.MenuItem
@@ -91,7 +94,6 @@ import java.util.UUID
 
 @Composable
 fun ChatScreen(userId: String) {
-    var isMenuExpanded by remember { mutableStateOf(false) }
     val navController = LocalNavController.current
     val context = LocalNavController.current.context
     val AppColors = LocalAppTheme.current
@@ -158,14 +160,37 @@ fun ChatScreen(userId: String) {
     }
 
 
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        // 背景图层
+        val bgUrl = AppState.chatBackgroundUrl
+        if (bgUrl != null) {
+            CustomAsyncImage(
+                imageUrl = bgUrl,
+                modifier = Modifier.fillMaxSize(),
+                contentDescription = "chat_background",
+                contentScale = ContentScale.Crop
+            )
+        } else {
+            // 无背景时使用主题背景色
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .background(AppColors.background)
+            )
+        }
+
         Scaffold(
             modifier = Modifier
                 .fillMaxSize(),
+            backgroundColor = Color.Transparent,
         topBar = {
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .background(AppColors.background)
+                    .background(Color.Transparent)
             ) {
                 StatusBarSpacer()
                 Row(
@@ -214,39 +239,12 @@ fun ChatScreen(userId: String) {
                             modifier = Modifier
                                 .size(28.dp)
                                 .noRippleClickable {
-                                    isMenuExpanded = true
+                                    navController.navigate(NavigationRoute.ChatSetting.route)
                                 },
                             contentDescription = null,
                             colorFilter = ColorFilter.tint(
                                 AppColors.text)
                         )
-                        DropdownMenu(
-                            expanded = isMenuExpanded,
-                            onDismissRequest = {
-                                isMenuExpanded = false
-                            },
-                            menuItems = listOf(
-                                MenuItem(
-                                    title = if (viewModel.notificationStrategy == "mute") "取消静音" else "静音",
-                                    icon = if (viewModel.notificationStrategy == "mute") R.drawable.rider_pro_notice_mute else R.drawable.rider_pro_notice_active,
-                                ) {
-
-                                    isMenuExpanded = false
-                                    if (NetworkUtils.isNetworkAvailable(context)) {
-                                        viewModel.viewModelScope.launch {
-                                            if (viewModel.notificationStrategy == "mute") {
-                                                viewModel.updateNotificationStrategy("active")
-                                            } else {
-                                                viewModel.updateNotificationStrategy("mute")
-                                            }
-                                        }
-                                    } else {
-                                        android.widget.Toast.makeText(context, "网络连接异常，请检查网络设置", android.widget.Toast.LENGTH_SHORT).show()
-                                    }
-                                }
-                            ),
-
-                            )
                     }
                 }
             }
@@ -283,7 +281,7 @@ fun ChatScreen(userId: String) {
         Box(
             modifier = Modifier
                 .fillMaxSize()
-                .background(AppColors.background)
+                .background(Color.Transparent)
                 .padding(paddingValues)
         ) {
             LazyColumn(
@@ -347,6 +345,7 @@ fun ChatScreen(userId: String) {
         }
 
 
+    }
     }
 }
 
@@ -572,7 +571,7 @@ fun ChatInput(
     }
     Box( modifier = Modifier
         .fillMaxWidth()
-        .padding(start = 16.dp, end = 16.dp, bottom = 12.dp),){
+        .padding(start = 16.dp, end = 16.dp, bottom = 45.dp),){
 
         Row(
             modifier = Modifier

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

@@ -0,0 +1,362 @@
+package com.aiosman.ravenow.ui.chat
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetState
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+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.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 com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.composables.StatusBarSpacer
+import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.IconButton
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.text.style.TextAlign
+import com.aiosman.ravenow.ui.composables.CustomAsyncImage
+
+@Composable
+fun ChatSettingScreen() {
+    val appColors = LocalAppTheme.current
+    val navController = LocalNavController.current
+    var showThemeSheet by remember { mutableStateOf(false) }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(appColors.secondaryBackground)
+    ) {
+        StatusBarSpacer()
+        Box(modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp)) {
+            NoticeScreenHeader(title = stringResource(R.string.chat_settings), moreIcon = false)
+        }
+
+        Column(modifier = Modifier.padding(horizontal = 16.dp)) {
+            SettingCard(
+                title = stringResource(R.string.chat_theme_settings),
+                onClick = { showThemeSheet = true }
+            )
+            Spacer(modifier = Modifier.height(12.dp))
+            SettingCard(
+                title = stringResource(R.string.report),
+                onClick = { /* TODO: 跳转举报 */ }
+            )
+        }
+    }
+
+    if (showThemeSheet) {
+        ThemePickerSheet(onClose = { showThemeSheet = false })
+    }
+}
+
+@Composable
+private fun SettingCard(title: String, onClick: () -> Unit) {
+    val appColors = LocalAppTheme.current
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(12.dp))
+            .background(appColors.background)
+            .clickable { onClick() }
+            .padding(horizontal = 12.dp, vertical = 14.dp)
+    ) {
+        Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+            Text(
+                text = title,
+                color = appColors.text,
+                fontSize = 16.sp,
+                fontWeight = FontWeight.W500,
+                modifier = Modifier.weight(1f)
+            )
+            Icon(
+                painter = painterResource(id = R.drawable.rave_now_nav_right),
+                contentDescription = null,
+                tint = appColors.text,
+                modifier = Modifier.size(20.dp)
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun ThemePickerSheet(onClose: () -> Unit) {
+    val appColors = LocalAppTheme.current
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val configuration = LocalConfiguration.current
+    val screenHeight = configuration.screenHeightDp.dp
+    val sheetHeight = screenHeight * 0.9f
+    var previewUrl by remember { mutableStateOf<String?>(null) }
+    ModalBottomSheet(
+        onDismissRequest = onClose,
+        sheetState = sheetState,
+        containerColor = appColors.secondaryBackground,
+        dragHandle = null,
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(sheetHeight),
+    ) {
+        Column(modifier = Modifier.padding(horizontal = 16.dp)) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 4.dp, bottom = 8.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Spacer(modifier = Modifier.size(24.dp))
+                Text(
+                    text = stringResource(R.string.custom_background),
+                    color = appColors.text,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.W600,
+                    modifier = Modifier.weight(1f).padding(start = 90.dp),
+                )
+                IconButton(onClick = onClose) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.rider_pro_close),
+                        contentDescription = "close",
+                        tint = appColors.text
+                    )
+                }
+            }
+
+            // 从相册选择
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(12.dp))
+                    .background(appColors.background)
+                    .clickable { /* TODO: 打开相册选择 */ }
+                    .padding(horizontal = 16.dp, vertical = 14.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(text = stringResource(R.string.select_from_gallery), color = appColors.text, fontSize = 15.sp, modifier = Modifier.weight(1f))
+                Icon(
+                    painter = painterResource(id = R.drawable.group_info_edit),
+                    contentDescription = null,
+                    tint = appColors.text,
+                    modifier = Modifier.size(20.dp)
+                )
+            }
+
+            Spacer(modifier = Modifier.height(12.dp))
+            Text(text = stringResource(R.string.featured_backgrounds), color = appColors.text, fontSize = 12.sp)
+            Spacer(modifier = Modifier.height(8.dp))
+
+            val presets = remember {
+                listOf(
+                    "https://picsum.photos/seed/ai1/400/600",
+                    "https://picsum.photos/seed/ai2/400/600",
+                    "https://picsum.photos/seed/ai3/400/600",
+                    "https://picsum.photos/seed/ai4/400/600",
+                    "https://picsum.photos/seed/ai5/400/600",
+                    "https://picsum.photos/seed/ai6/400/600",
+                    "https://picsum.photos/seed/ai7/400/600",
+                    "https://picsum.photos/seed/ai8/400/600",
+                    "https://picsum.photos/seed/ai9/400/600",
+                    "https://picsum.photos/seed/ai10/400/600",
+                    "https://picsum.photos/seed/ai11/400/600",
+                    "https://picsum.photos/seed/ai12/400/600",
+                    "https://picsum.photos/seed/ai13/400/600",
+                    "https://picsum.photos/seed/ai14/400/600",
+                    "https://picsum.photos/seed/ai15/400/600",
+                )
+            }
+
+            LazyVerticalGrid(
+                columns = GridCells.Fixed(3),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+                verticalArrangement = Arrangement.spacedBy(12.dp),
+                modifier = Modifier
+                    .fillMaxWidth()
+            ) {
+                items(presets) { url ->
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable { previewUrl = url }
+                    ) {
+                        Box(
+                            modifier = Modifier
+                                .clip(RoundedCornerShape(12.dp))
+                                .background(appColors.decentBackground)
+                        ) {
+                            CustomAsyncImage(
+                                imageUrl = url,
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .aspectRatio(3f / 4f),
+                                contentDescription = "preset",
+                                contentScale = ContentScale.Crop
+                            )
+                        }
+                        Spacer(modifier = Modifier.height(6.dp))
+                        Text(
+                            text = "Heart Drive",
+                            color = appColors.text,
+                            fontSize = 12.sp
+                        )
+                    }
+                }
+            }
+
+            // 预览自定义背景弹窗
+            if (previewUrl != null) {
+                ModalBottomSheet(
+                    onDismissRequest = { previewUrl = null },
+                    sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+                    containerColor = appColors.secondaryBackground,
+                    dragHandle = null,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(sheetHeight)
+                ) {
+                    Box(modifier = Modifier.fillMaxSize()) {
+                        CustomAsyncImage(
+                            imageUrl = previewUrl!!,
+                            modifier = Modifier.fillMaxSize(),
+                            contentDescription = "preview_bg",
+                            contentScale = ContentScale.Crop
+                        )
+
+                        Column(modifier = Modifier
+                            .fillMaxSize()
+                            .padding(horizontal = 16.dp, vertical = 8.dp)) {
+                            Box(
+                                modifier = Modifier
+                                    .align(Alignment.CenterHorizontally)
+                                    .padding(horizontal = 12.dp, vertical = 16.dp)
+                            ) {
+                                Text(text = stringResource(R.string.previewing_custom_background), color = Color.White, fontSize = 15.sp)
+                            }
+
+
+                            Column(modifier = Modifier.padding(8.dp)) {
+                                Row {
+                                    Box(
+                                        modifier = Modifier
+                                            .clip(RoundedCornerShape(24.dp))
+                                            .background(Color.White)
+                                            .padding(horizontal = 14.dp, vertical = 8.dp)
+                                    ) {
+                                        Text(text = stringResource(R.string.each_theme_unique_experience), color = Color.Black, fontSize = 12.sp)
+                                    }
+                                }
+                                Spacer(modifier = Modifier.height(12.dp))
+                                Row {
+                                    Box(
+                                        modifier = Modifier
+                                            .clip(RoundedCornerShape(24.dp))
+                                            .background(Color.White)
+                                            .padding(horizontal = 14.dp, vertical = 8.dp)
+                                    ) {
+                                        Text(text = stringResource(R.string.select_apply_to_use_theme), color = Color.Black, fontSize = 12.sp)
+                                    }
+                                }
+                                Spacer(modifier = Modifier.height(12.dp))
+                                Row {
+                                    Spacer(modifier = Modifier.weight(1f))
+                                    Box(
+                                        modifier = Modifier
+                                            .clip(RoundedCornerShape(20.dp))
+                                            .background(Color(0xFF7C4DFF))
+                                            .padding(horizontal = 16.dp, vertical = 8.dp)
+                                    ) {
+                                        Text(text = stringResource(R.string.tap_cancel_to_preview_other_themes), color = Color.White, fontSize = 12.sp)
+                                    }
+                                }
+                            }
+
+                            Spacer(modifier = Modifier.weight(1f))
+
+                            // 底部按钮
+                            Row(
+                                modifier = Modifier.fillMaxWidth()
+                                    .padding(bottom = 60.dp),
+                                verticalAlignment = Alignment.CenterVertically
+                            ) {
+                                Box(
+                                    modifier = Modifier
+                                        .weight(1f)
+                                        .clip(RoundedCornerShape(12.dp))
+                                        .background(Color.White)
+                                        .clickable { previewUrl = null }
+                                        .padding(vertical = 12.dp),
+                                    contentAlignment = Alignment.Center
+                                ) {
+                                    Text(text = stringResource(R.string.cancel), color = Color.Black, fontSize = 14.sp)
+                                }
+                                Spacer(modifier = Modifier.size(12.dp))
+                                Box(
+                                    modifier = Modifier
+                                        .weight(1f)
+                                        .clip(RoundedCornerShape(12.dp))
+                                        .background(
+                                            brush = Brush.horizontalGradient(
+                                                colors = listOf(
+                                                    Color(0xFFEE2A33),
+                                                    Color(0xFFD80264),
+                                                    Color(0xFF664C92)
+                                                )
+                                            )
+                                        )
+                                        .clickable {
+                                            previewUrl?.let { url ->
+                                                com.aiosman.ravenow.AppStore.saveChatBackgroundUrl(url)
+                                                previewUrl = null
+                                                onClose()
+                                            }
+                                        }
+                                        .padding(vertical = 12.dp),
+                                    contentAlignment = Alignment.Center
+                                ) {
+                                    Text(text = stringResource(R.string.moment_ai_apply), color = Color.White, fontSize = 14.sp)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+

app/src/main/java/com/aiosman/ravenow/ui/comment/notice/CommentNotice.kt

@@ -47,7 +47,8 @@ import com.aiosman.ravenow.ui.composables.StatusBarSpacer
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
 import kotlinx.coroutines.launch
-
+import com.aiosman.ravenow.utils.NetworkUtils
+import com.aiosman.ravenow.ui.network.ReloadButton
 @Composable
 fun CommentNoticeScreen() {
     val viewModel = viewModel<CommentNoticeListViewModel>(
@@ -71,14 +72,47 @@ fun CommentNoticeScreen() {
         modifier = Modifier.fillMaxSize().background(color = AppColors.background)
     ) {
         StatusBarSpacer()
+        val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+        if (!isNetworkAvailable) {
             Box(
                 modifier = Modifier
-                .fillMaxWidth()
+                    .fillMaxSize()
-                .padding(16.dp)
+                    .padding(top = 149.dp),
+                contentAlignment = Alignment.TopCenter
             ) {
-            NoticeScreenHeader(stringResource(R.string.comment), moreIcon = false)
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    androidx.compose.foundation.Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(181.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = AppColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = AppColors.text,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            viewModel.initData(context, force = true)
                         }
-        if (comments.itemCount == 0 && comments.loadState.refresh is LoadState.NotLoading) {
+                    )
+                }
+            }
+        } else if (comments.itemCount == 0 && comments.loadState.refresh is LoadState.NotLoading) {
             Box(
                 modifier = Modifier
                     .fillMaxSize()
@@ -91,12 +125,13 @@ fun CommentNoticeScreen() {
                 ) {
                     androidx.compose.foundation.Image(
                         painter = painterResource(
-                            id =if(AppState.darkMode) R.mipmap.qst_pl_qs_as_img
+                            id = if(AppState.darkMode) R.mipmap.tietie_dark
-                            else R.mipmap.qst_pl_qs_img),
+                            else R.mipmap.invalid_name_11),
                         contentDescription = "No Comment",
-                        modifier = Modifier.size(181.dp)
+                        modifier = Modifier
+                            .size(width = 181.dp, height = 153.dp)
                     )
-                    Spacer(modifier = Modifier.size(24.dp))
+                    Spacer(modifier = Modifier.height(24.dp))
                     Text(
                         text = "等一位旅人～",
                         color = AppColors.text,

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

@@ -17,6 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -32,6 +33,7 @@ fun ActionButton(
     text: String,
     color: Color? = null,
     backgroundColor: Color? = null,
+    backgroundBrush: Brush? = null,
     leading: @Composable (() -> Unit)? = null,
     expandText: Boolean = false,
     contentPadding: PaddingValues = PaddingValues(vertical = 16.dp),
@@ -65,7 +67,11 @@ fun ActionButton(
     Box(
         modifier = modifier
             .clip(RoundedCornerShape(roundCorner.dp))
-            .background(animatedBackgroundColor)
+            .background(
+                brush = backgroundBrush ?: Brush.linearGradient(
+                    colors = listOf(animatedBackgroundColor, animatedBackgroundColor)
+                )
+            )
             .noRippleClickable {
                 if (enabled && !isLoading) {
                     click()

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

@@ -0,0 +1,75 @@
+package com.aiosman.ravenow.ui.composables
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.AppState
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.composables.toolbar.CollapsingToolbarScaffoldScopeInstance.align
+import kotlinx.coroutines.delay
+
+@Composable
+fun AgentCreatedSuccessIndicator() {
+    val appColors = LocalAppTheme.current
+    if (AppState.agentCreatedSuccess) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(bottom = 70.dp),
+            contentAlignment = Alignment.BottomCenter
+        ) {
+            Box(
+                modifier = Modifier
+                    .width(150.dp)
+                    .height(40.dp)
+                    .background(appColors.text.copy(alpha = 0.5f), shape = RoundedCornerShape(15.dp)),
+                contentAlignment = Alignment.CenterStart
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 6.dp)
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.mipmap.bars_x_buttons_home_n_copy_2),
+                        contentDescription = null,
+                        modifier = Modifier.size(20.dp),
+                        tint = Color.Unspecified
+                    )
+                    Spacer(modifier = Modifier.width(7.dp))
+                    Text(
+                        text = stringResource(R.string.create_success),
+                        color = appColors.background,
+                        fontSize = 13.sp
+                    )
+                }
+            }
+        }
+
+
+        LaunchedEffect(Unit) {
+            delay(3000)
+            AppState.agentCreatedSuccess = false
+        }
+    }
+}
+

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

@@ -56,15 +56,14 @@ fun AnimatedFavouriteIcon(
     }) {
         Image(
             painter =  if (isFavourite) {
-                painterResource(id = R.drawable.rider_pro_favourited)
+                painterResource(id = R.mipmap.icon_variant_2)
             } else {
-                painterResource(id = R.drawable.rider_pro_favourite)
+                painterResource(id = R.mipmap.icon_collect)
             },
             contentDescription = "Favourite",
             modifier = modifier.graphicsLayer {
                 rotationZ = animatableRotation.value
             },
-            colorFilter = ColorFilter.tint(AppColors.text)
         )
     }
 }

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

@@ -51,7 +51,8 @@ import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 @Composable
 fun EditCommentBottomModal(
     replyComment: CommentEntity? = null,
-    onSend: (String) -> Unit = {}
+    autoFocus: Boolean = false,
+    onSend: (String) -> Unit = {},
 ) {
     val AppColors = LocalAppTheme.current
     var text by remember { mutableStateOf("") }
@@ -59,9 +60,11 @@ fun EditCommentBottomModal(
     val focusRequester = remember { FocusRequester() }
     val context = LocalContext.current
 
-    LaunchedEffect(Unit) {
+    LaunchedEffect(autoFocus) {
+        if (autoFocus) {
             focusRequester.requestFocus()
         }
+    }
 
     Column(
         modifier = Modifier

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

@@ -10,6 +10,7 @@ import androidx.compose.runtime.Composable
 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.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -32,7 +33,7 @@ fun FollowButton(
             .wrapContentWidth()
             .clip(RoundedCornerShape(8.dp))
             .background(
-                color = if (isFollowing) AppColors.main else AppColors.nonActive
+                color = if (isFollowing) AppColors.nonActive else AppColors.nonActive
             )
             .padding(horizontal = 16.dp, vertical = 8.dp)
             .noRippleClickable {
@@ -41,11 +42,9 @@ fun FollowButton(
         contentAlignment = Alignment.Center
     ) {
         Text(
-            text = if (isFollowing) stringResource(R.string.following_upper) else stringResource(
+            text = if (isFollowing) stringResource(R.string.follow_upper_had) else stringResource(R.string.follow_upper),
-                R.string.follow_upper
-            ),
             fontSize = fontSize,
-            color = if (isFollowing) AppColors.mainText else AppColors.text,
+            color = if (isFollowing) AppColors.text else AppColors.text,
             style = TextStyle(fontWeight = FontWeight.Bold)
         )
     }

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

@@ -364,16 +364,6 @@ fun MomentContentGroup(
     onPageChange: (Int) -> Unit = {}
 ) {
     val AppColors = LocalAppTheme.current
-    if (momentEntity.momentTextContent.isNotEmpty()) {
-        Text(
-            text = momentEntity.momentTextContent,
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(start = 16.dp, end = 16.dp, bottom = 8.dp),
-            fontSize = 16.sp,
-            color = AppColors.text
-        )
-    }
     if (momentEntity.relMoment != null) {
         RelPostCard(
             momentEntity = momentEntity.relMoment!!,
@@ -389,6 +379,17 @@ fun MomentContentGroup(
             )
         }
     }
+    if (momentEntity.momentTextContent.isNotEmpty()) {
+        Text(
+            text = momentEntity.momentTextContent,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = 16.dp, end = 16.dp, top = 8.dp),
+            fontSize = 16.sp,
+            color = AppColors.text
+        )
+    }
+
 
 }
 
@@ -401,8 +402,8 @@ fun MomentOperateBtn(@DrawableRes icon: Int, count: String) {
                 .size(width = 24.dp, height = 24.dp),
             painter = painterResource(id = icon),
             contentDescription = "",
-            colorFilter = ColorFilter.tint(AppColors.text)
         )
+        if (count.isNotEmpty()) {
             Text(
                 text = count,
                 modifier = Modifier.padding(start = 7.dp),
@@ -410,6 +411,7 @@ fun MomentOperateBtn(@DrawableRes icon: Int, count: String) {
                 color = AppColors.text
             )
         }
+    }
 }
 
 @Composable
@@ -510,49 +512,11 @@ fun MomentBottomOperateRowGroup(
                     .weight(1f),
                 verticalAlignment = Alignment.CenterVertically
             ) {
-                Box(
+                Row(
-                    modifier = Modifier
+                    modifier = Modifier.weight(1f).fillMaxHeight(),
-                        .weight(1f)
+                    verticalAlignment = Alignment.CenterVertically
-                        .fillMaxHeight(),
-                    contentAlignment = Alignment.CenterStart
-                ) {
-                    MomentOperateBtn(count = momentEntity.favoriteCount.toString()) {
-                        AnimatedFavouriteIcon(
-                            modifier = Modifier.size(24.dp),
-                            isFavourite = momentEntity.isFavorite
-                        ) {
-                            onFavoriteClick()
-                        }
-                    }
-                }
-
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .fillMaxHeight()
-                        .noRippleClickable {
-                            val currentTime = System.currentTimeMillis()
-                            if (currentTime - lastClickTime.value > clickDelay) {
-                                lastClickTime.value = currentTime
-                                onCommentClick()
-                            }
-                        },
-                    contentAlignment = Alignment.CenterEnd
-                ) {
-                    MomentOperateBtn(
-                        icon = R.drawable.rider_pro_comment,
-                        count = momentEntity.commentCount.toString()
-                    )
-                }
-
-                Spacer(modifier = Modifier.width(24.dp))
-
-                Box(
-                    modifier = Modifier
-                        .wrapContentWidth()
-                        .fillMaxHeight(),
-                    contentAlignment = Alignment.CenterEnd
                 ) {
+                    // 点赞按钮
                     MomentOperateBtn(count = momentEntity.likeCount.toString()) {
                         AnimatedLikeIcon(
                             modifier = Modifier.size(24.dp),
@@ -561,6 +525,44 @@ fun MomentBottomOperateRowGroup(
                             onLikeClick()
                         }
                     }
+                    Spacer(modifier = Modifier.width(10.dp))
+                    // 评论按钮
+                    Box(
+                        modifier = Modifier.noRippleClickable {
+                            val currentTime = System.currentTimeMillis()
+                            if (currentTime - lastClickTime.value > clickDelay) {
+                                lastClickTime.value = currentTime
+                                onCommentClick()
+                            }
+                        }
+                    ) {
+                        MomentOperateBtn(
+                            icon = R.mipmap.icon_comment,
+                            count = momentEntity.commentCount.toString()
+                        )
+                    }
+                    Spacer(modifier = Modifier.width(28.dp))
+                    // 转发按钮
+                    Box(
+                        modifier = Modifier.noRippleClickable {
+                            // TODO: 实现转发功能
+                        }
+                    ) {
+                        MomentOperateBtn(
+                            icon = R.mipmap.icon_share,
+                            count = ""
+                        )
+                    }
+                }
+
+                // 收藏按钮
+                MomentOperateBtn(count = momentEntity.favoriteCount.toString()) {
+                    AnimatedFavouriteIcon(
+                        modifier = Modifier.size(24.dp),
+                        isFavourite = momentEntity.isFavorite
+                    ) {
+                        onFavoriteClick()
+                    }
                 }
             }
         }

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

@@ -1,10 +1,15 @@
 package com.aiosman.ravenow.ui.composables
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
@@ -12,11 +17,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
-
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.text.font.FontWeight
 /**
  * 可复用的标签页组件
  */
@@ -54,3 +62,43 @@ fun TabItem(
 fun TabSpacer() {
     Spacer(modifier = Modifier.width(8.dp))
 }
+
+
+@Composable
+fun UnderlineTabItem(
+    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,
+            fontWeight = FontWeight.ExtraBold,
+            color = if (isSelected) AppColors.text else AppColors.text.copy(alpha = 0.6f),
+            modifier = Modifier.padding(horizontal = 16.dp).padding(top = 13.dp)
+        )
+        
+        // 选中状态下显示图标
+        Box(
+            modifier = Modifier.size(24.dp),
+            contentAlignment = Alignment.Center
+        ) {
+            if (isSelected) {
+                Image(
+                    painter = painterResource(id = R.mipmap.underline),
+                    contentDescription = "selected indicator",
+
+                )
+            }
+        }
+    }
+}

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

@@ -43,6 +43,10 @@ import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 
+private val LabelTextColor = Color(red = 60f / 255f, green = 60f / 255f, blue = 67f / 255f, alpha = 0.6f)
+private val HintTextColor = Color(red = 60f / 255f, green = 60f / 255f, blue = 67f / 255f, alpha = 0.3f)
+private val PasswordIconColor = Color(red = 17f / 255f, green = 12f / 255f, blue = 19f / 255f)
+
 @Composable
 fun TextInputField(
     modifier: Modifier = Modifier,
@@ -52,67 +56,94 @@ fun TextInputField(
     label: String? = null,
     hint: String? = null,
     error: String? = null,
-    enabled: Boolean = true
+    enabled: Boolean = true,
+    leadingIcon: @Composable (() -> Unit)? = null,
+    customBackgroundColor: Color? = null,
+    customCornerRadius: Float = 24f
 ) {
     val AppColors = LocalAppTheme.current
     var showPassword by remember { mutableStateOf(!password) }
     var isFocused by remember { mutableStateOf(false) }
+    val backgroundColor = customBackgroundColor ?: AppColors.inputBackground
     Column(modifier = modifier) {
         label?.let {
-            Text(it, color = AppColors.secondaryText)
+            Text(
-            Spacer(modifier = Modifier.height(16.dp))
+                text = it,
+                color = LabelTextColor,
+                fontSize = 13.sp,
+                modifier = Modifier.padding(start = 8.dp, top = 8.dp, bottom = 8.dp)
+            )
         }
         Box(
             contentAlignment = Alignment.CenterStart,
             modifier = Modifier
-                .clip(RoundedCornerShape(24.dp))
+                .clip(RoundedCornerShape(customCornerRadius.dp))
-                .background(AppColors.inputBackground)
+                .background(backgroundColor)
                 .border(
                     width = 2.dp,
                     color = if (error == null) Color.Transparent  else AppColors.error,
-                    shape = RoundedCornerShape(24.dp)
+                    shape = RoundedCornerShape(customCornerRadius.dp)
                 )
                 .padding(horizontal = 16.dp, vertical = 16.dp)
         ) {
-            Row(verticalAlignment = Alignment.CenterVertically){
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxWidth()
+            ){
+                leadingIcon?.let {
+                    Box(modifier = Modifier.size(24.dp)) {
+                        it()
+                    }
+                    Spacer(modifier = Modifier.size(12.dp))
+                }
+                Box(modifier = Modifier.weight(1f)) {
                     BasicTextField(
                         value = text,
                         onValueChange = onValueChange,
                         modifier = Modifier
-                        .weight(1f)
+                            .fillMaxWidth()
                             .onFocusChanged { focusState ->
                                 isFocused = focusState.isFocused
                             },
                         textStyle = TextStyle(
                             fontSize = 16.sp,
-                        fontWeight = FontWeight.W500,
+                            fontWeight = FontWeight.W400,
                             color = AppColors.text
                         ),
                         keyboardOptions = KeyboardOptions(
-                        keyboardType = if (password) KeyboardType.Password else KeyboardType.Text
+                            keyboardType = if (password) KeyboardType.Password else KeyboardType.Email
                         ),
                         visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
                         singleLine = true,
                         enabled = enabled,
                         cursorBrush = SolidColor(AppColors.text),
                     )
-                if (password) {
+                    if (text.isEmpty() && hint != null) {
-                    Image(
+                        Text(
-                        painter = painterResource(id = R.drawable.rider_pro_eye),
+                            text = hint,
-                        contentDescription = "Password",
+                            color = HintTextColor,
-                        modifier = Modifier
+                            fontSize = 16.sp,
-                            .size(18.dp)
+                            fontWeight = FontWeight.W400
-                            .noRippleClickable {
-                                showPassword = !showPassword
-                            },
-                        colorFilter = ColorFilter.tint(AppColors.text)
                         )
                     }
                 }
-
+                if (password) {
-            if (text.isEmpty()) {
+                    Image(
-                hint?.let {
+                        painter = painterResource(
-                    Text(it, modifier = Modifier.padding(start = 5.dp), color = AppColors.inputHint, fontWeight = FontWeight.W600)
+                            id = if (showPassword) {
+                                R.drawable.rider_pro_eye
+                            } else {
+                                R.mipmap.icon_eyes_closed_light
+                            }
+                        ),
+                        contentDescription = "Password",
+                        modifier = Modifier
+                            .size(24.dp)
+                            .noRippleClickable {
+                                showPassword = !showPassword
+                            },
+                        colorFilter = ColorFilter.tint(PasswordIconColor)
+                    )
                 }
             }
         }

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

@@ -22,11 +22,15 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -34,6 +38,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 
 /**
  * 水平布局的输入框
@@ -49,6 +54,9 @@ fun FormTextInput(
     onValueChange: (String) -> Unit
 ) {
     val AppColors = LocalAppTheme.current
+    val focusRequester = remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
     Column(
         modifier = modifier
     ) {
@@ -63,7 +71,11 @@ fun FormTextInput(
                         it
                     }
                 }
-                .padding(17.dp),
+                .padding(17.dp)
+                .noRippleClickable {
+                    focusRequester.requestFocus()
+                    keyboardController?.show()
+                },
             verticalAlignment = Alignment.CenterVertically
         ) {
             label?.let {
@@ -88,7 +100,7 @@ fun FormTextInput(
                     modifier = Modifier
                         .size(16.dp)
                         .align(Alignment.TopStart),
-                    tint = Color.Unspecified.copy(alpha = 0.4f)
+                    tint = AppColors.text.copy(alpha = 0.4f)
                 )
                 Row(
                     verticalAlignment = Alignment.CenterVertically
@@ -114,6 +126,8 @@ fun FormTextInput(
                             onValueChange = {
                                 onValueChange(it)
                             },
+                            modifier = Modifier
+                                .focusRequester(focusRequester),
                             singleLine = true,
                             textStyle = TextStyle(
                                 fontSize = 14.sp,

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

@@ -22,6 +22,7 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -29,6 +30,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -36,6 +38,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 
 /**
  * 垂直布局的输入框
@@ -52,6 +55,9 @@ fun FormTextInput2(
     onValueChange: (String) -> Unit
 ) {
     val AppColors = LocalAppTheme.current
+    val localFocusRequester = focusRequester ?: remember { FocusRequester() }
+    val keyboardController = LocalSoftwareKeyboardController.current
+
     Column(
         modifier = modifier.height(150.dp)
     ) {
@@ -66,7 +72,11 @@ fun FormTextInput2(
                         it
                     }
                 }
-                .padding(17.dp),
+                .padding(17.dp)
+                .noRippleClickable {
+                    localFocusRequester.requestFocus()
+                    keyboardController?.show()
+                },
 
             ) {
             label?.let {
@@ -91,7 +101,7 @@ fun FormTextInput2(
                     modifier = Modifier
                         .size(16.dp)
                         .align(Alignment.TopStart),
-                    tint = Color.Unspecified.copy(alpha = 0.4f)
+                    tint = AppColors.text.copy(alpha = 0.4f)
                 )
                 Row(
                     verticalAlignment = Alignment.CenterVertically
@@ -112,19 +122,13 @@ fun FormTextInput2(
                         }
 
                         BasicTextField(
-                            maxLines = 5,
+                            maxLines = 6,
                             value = value,
                             onValueChange = {
                                 onValueChange(it)
                             },
                             modifier = Modifier
-                                .let {
+                                .focusRequester(localFocusRequester),
-                                    if (focusRequester != null) {
-                                        it.focusRequester(focusRequester)
-                                    } else {
-                                        it
-                                    }
-                                },
                             textStyle = TextStyle(
                                 fontSize = 14.sp,
                                 fontWeight = FontWeight.Normal,

app/src/main/java/com/aiosman/ravenow/ui/favourite/FavouriteListPage.kt

@@ -4,18 +4,23 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
@@ -24,7 +29,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 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.paging.compose.collectAsLazyPagingItems
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.LocalNavController
@@ -35,6 +42,8 @@ import com.aiosman.ravenow.ui.composables.StatusBarSpacer
 import com.aiosman.ravenow.ui.favourite.FavouriteListViewModel.refreshPager
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
+import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.utils.NetworkUtils
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -71,6 +80,75 @@ fun FavouriteListPage() {
                 ) {
                     NoticeScreenHeader(stringResource(R.string.favourites_upper), moreIcon = false)
                 }
+                val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+                var moments = dataFlow.collectAsLazyPagingItems()
+
+                if (!isNetworkAvailable) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(top=149.dp),
+                        contentAlignment = Alignment.TopCenter
+                    ) {
+                        Column(
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Image(
+                                painter = painterResource(id = R.mipmap.invalid_name_10),
+                                contentDescription = "network error",
+                                modifier = Modifier.size(181.dp)
+                            )
+                            Spacer(modifier = Modifier.size(24.dp))
+                            Text(
+                                text = stringResource(R.string.friend_chat_no_network_title),
+                                color = AppColors.text,
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.W600
+                            )
+                            Spacer(modifier = Modifier.size(8.dp))
+                            Text(
+                                text = stringResource(R.string.friend_chat_no_network_subtitle),
+                                color = AppColors.secondaryText,
+                                fontSize = 14.sp,
+                                fontWeight = FontWeight.W400
+                            )
+                            Spacer(modifier = Modifier.height(16.dp))
+                            ReloadButton(
+                                onClick = {
+                                    model.refreshPager(force = true)
+                                }
+                            )
+                        }
+                    }
+                } else if(moments.itemCount == 0) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(top=189.dp),
+                        contentAlignment = Alignment.TopCenter
+                    ) {
+                        Column(
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Image(
+                                painter = painterResource(
+                                    id = if (com.aiosman.ravenow.AppState.darkMode) R.mipmap.invalid_dark
+                                    else R.mipmap.invalid_name_1),
+                                contentDescription = "No favourites",
+                                modifier = Modifier.size(181.dp, 153.dp)
+                            )
+                            Spacer(modifier = Modifier.size(9.dp)) // 调整间距为9dp
+                            Text(
+                                text = stringResource(R.string.favourites_null),
+                                color = AppColors.text,
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.W600
+                            )
+                        }
+                    }
+                }else{
                     LazyVerticalGrid(
                         columns = GridCells.Fixed(3),
                         modifier = Modifier.fillMaxSize().padding(horizontal = 16.dp)
@@ -111,15 +189,11 @@ fun FavouriteListPage() {
                                         )
                                     }
                                 }
-
-
-                        }
-
                             }
                         }
-
                     }
-
+                }
+            }
             PullRefreshIndicator(
                 FavouriteListViewModel.isLoading,
                 state,

app/src/main/java/com/aiosman/ravenow/ui/follower/FollowerList.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -19,6 +20,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -37,6 +39,8 @@ import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
 import kotlinx.coroutines.launch
+import com.aiosman.ravenow.utils.NetworkUtils
+import com.aiosman.ravenow.ui.network.ReloadButton
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -67,7 +71,47 @@ fun FollowerListScreen(userId: Int) {
         ) {
             NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
         }
-        if (users.itemCount == 0) {
+        val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+        if (!isNetworkAvailable) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = 149.dp),
+                contentAlignment = Alignment.TopCenter
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(181.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = appColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = appColors.text,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            model.loadData(userId, true)
+                        }
+                    )
+                }
+            }
+        } else if (users.itemCount == 0) {
             Box(
                 modifier = Modifier
                     .fillMaxSize()
@@ -80,21 +124,21 @@ fun FollowerListScreen(userId: Int) {
                 ) {
                     Image(
                         painter = painterResource(
-                            id =if(AppState.darkMode) R.mipmap.qst_fs_qs_as_img
+                            id = if(AppState.darkMode) R.mipmap.frame_4
-                            else R.mipmap.qst_fs_qs_img),
+                            else R.mipmap.invalid_name_8),
                         contentDescription = null,
-                        modifier = Modifier.size(181.dp)
+                        modifier = Modifier.size(181.dp, 153.dp)
                     )
-                    Spacer(modifier = Modifier.size(24.dp))
+                    Spacer(modifier = Modifier.size(9.dp)) // 调整间距为9dp
                     androidx.compose.material.Text(
-                        text = "还没有人关注哦",
+                        text = "还没有人关注你呢",
                         color = appColors.text,
                         fontSize = 16.sp,
                         fontWeight = FontWeight.W600
                     )
                     Spacer(modifier = Modifier.size(8.dp))
                     androidx.compose.material.Text(
-                        text = "去发布动态，吸引更多粉丝～",
+                        text = "试着发信号出来，某人就会被吸引啦～",
                         color = appColors.text,
                         fontSize = 14.sp,
                         fontWeight = FontWeight.W400

app/src/main/java/com/aiosman/ravenow/ui/follower/FollowerNotice.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -37,7 +38,9 @@ import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.FollowButton
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import com.aiosman.ravenow.ui.network.ReloadButton
 import kotlinx.coroutines.launch
+import com.aiosman.ravenow.utils.NetworkUtils
 
 /**
  * 关注消息列表
@@ -54,19 +57,51 @@ fun FollowerNoticeScreen() {
         val model = FollowerNoticeViewModel
         var dataFlow = model.followerItemsFlow
         var followers = dataFlow.collectAsLazyPagingItems()
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 16.dp)
-                .background(color = AppColors.background)
-        ) {
-            NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
-        }
         LaunchedEffect(Unit) {
             model.reload()
             model.updateNotice()
         }
-        if (followers.itemCount == 0) {
+        val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+        if (!isNetworkAvailable) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top=149.dp),
+                contentAlignment = Alignment.TopCenter
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(181.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = AppColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = AppColors.text,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            model.reload(force = true)
+                        }
+                    )
+                }
+            }
+        } else if (followers.itemCount == 0) {
             Box(
                 modifier = Modifier
                     .fillMaxSize()
@@ -79,21 +114,22 @@ fun FollowerNoticeScreen() {
                 ) {
                     Image(
                         painter = painterResource(
-                            id =if(AppState.darkMode) R.mipmap.qst_fs_qs_as_img
+                            id = if(AppState.darkMode) R.mipmap.frame_4
-                            else R.mipmap.qst_fs_qs_img),
+                            else R.mipmap.invalid_name_8),
                         contentDescription = "No Followers",
-                        modifier = Modifier.size(181.dp)
+                        modifier = Modifier
+                            .size(width = 181.dp, height = 153.dp)
                     )
-                    Spacer(modifier = Modifier.size(24.dp))
+                    Spacer(modifier = Modifier.height(if (AppState.darkMode) 9.dp else 24.dp))
                     androidx.compose.material.Text(
-                        text = "还没有人关注哦",
+                        text = "还没有人关注你呢",
                         color = AppColors.text,
                         fontSize = 16.sp,
                         fontWeight = FontWeight.W600
                     )
                     Spacer(modifier = Modifier.size(8.dp))
                     androidx.compose.material.Text(
-                        text = "去发布动态，吸引更多粉丝～",
+                        text = "试着发信号出来，某人就会被吸引啦～",
                         color = AppColors.text,
                         fontSize = 14.sp,
                         fontWeight = FontWeight.W400

app/src/main/java/com/aiosman/ravenow/ui/follower/FollowingList.kt

@@ -20,6 +20,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -37,7 +38,9 @@ import com.aiosman.ravenow.exp.viewModelFactory
 import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
+import com.aiosman.ravenow.ui.network.ReloadButton
 import kotlinx.coroutines.launch
+import com.aiosman.ravenow.utils.NetworkUtils
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -69,7 +72,48 @@ fun FollowingListScreen(userId: Int) {
             NoticeScreenHeader(stringResource(R.string.following_upper), moreIcon = false)
 
         }
-        if(users.itemCount == 0) {
+
+        val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+        if (!isNetworkAvailable) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top=149.dp),
+                contentAlignment = Alignment.TopCenter
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(181.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = appColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = appColors.secondaryText,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            model.loadData(userId, true)
+                        }
+                    )
+                }
+            }
+        } else if(users.itemCount == 0) {
             Box(
                 modifier = Modifier
                     .fillMaxSize()
@@ -82,14 +126,14 @@ fun FollowingListScreen(userId: Int) {
                 ) {
                     Image(
                         painter = painterResource(
-                            id =if(AppState.darkMode) R.mipmap.qst_gz_qs_as_img_my
+                            id = if(AppState.darkMode) R.mipmap.frame_3
-                            else R.mipmap.qst_gz_qs_img_my),
+                            else R.mipmap.invalid_name_9),
                         contentDescription = null,
-                        modifier = Modifier.size(181.dp)
+                        modifier = Modifier.size(181.dp, 153.dp)
                     )
-                    Spacer(modifier = Modifier.size(24.dp))
+                    Spacer(modifier = Modifier.size(9.dp)) // 调整间距为9dp
                     androidx.compose.material.Text(
-                        text = "没有关注任何灵魂",
+                        text = "还没有关注任何灵魂",
                         color = appColors.text,
                         fontSize = 16.sp,
                         fontWeight = FontWeight.W600

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

@@ -1,5 +1,6 @@
 package com.aiosman.ravenow.ui.group
 
+import android.util.Log
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -8,6 +9,14 @@ import androidx.lifecycle.viewModelScope
 import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.ChatState
 import com.aiosman.ravenow.data.api.ApiClient
+import com.aiosman.ravenow.data.api.AgentRule
+import com.aiosman.ravenow.data.api.AgentRuleQuota
+import com.aiosman.ravenow.data.api.CreateAgentRuleRequestBody
+import com.aiosman.ravenow.data.api.UpdateAgentRuleRequestBody
+import com.aiosman.ravenow.data.api.CreateAgentRuleRequestBody
+import com.aiosman.ravenow.data.api.AgentRule
+import com.aiosman.ravenow.data.api.AgentRuleQuota
+import com.aiosman.ravenow.data.parseErrorResponse
 import com.aiosman.ravenow.entity.ChatNotification
 import com.aiosman.ravenow.entity.GroupInfo
 import com.aiosman.ravenow.entity.GroupMember
@@ -22,9 +31,36 @@ class GroupChatInfoViewModel(
     var isLoading by mutableStateOf(false)
     var error by mutableStateOf<String?>(null)
     var chatNotification by mutableStateOf<ChatNotification?>(null)
+    var isAddingMemory by mutableStateOf(false)
+    var addMemoryError by mutableStateOf<String?>(null)
+    var addMemorySuccess by mutableStateOf(false)
     val notificationStrategy get() = chatNotification?.strategy ?: "default"
+    
+    // 记忆管理相关状态
+    var memoryQuota by mutableStateOf<AgentRuleQuota?>(null)
+    var memoryList by mutableStateOf<List<AgentRule>>(emptyList())
+    var isLoadingMemory by mutableStateOf(false)
+    var memoryError by mutableStateOf<String?>(null)
+    var promptOpenId by mutableStateOf<String?>(null)
     init {
         loadGroupInfo()
+        loadPromptOpenId()
+    }
+    
+    /**
+     * 获取群聊中智能体的 OpenID
+     */
+    private fun loadPromptOpenId() {
+        viewModelScope.launch {
+            try {
+                val response = ApiClient.api.createGroupChatAi(trtcGroupId = groupId)
+                val groupChatResponse = response.body()?.data
+                val prompts = groupChatResponse?.prompts
+                promptOpenId = prompts?.firstOrNull()?.openId
+            } catch (e: Exception) {
+                Log.e("GroupChatInfoViewModel", "获取智能体OpenID失败: ${e.message}", e)
+            }
+        }
     }
     suspend fun updateNotificationStrategy(strategy: String) {
         val result = ChatState.updateChatNotification(groupId.hashCode(), strategy)
@@ -71,4 +107,218 @@ class GroupChatInfoViewModel(
             }
         }
     }
+    
+    /**
+     * 添加群记忆
+     * @param memoryText 记忆内容
+     * @param promptOpenId 智能体的 OpenID（可选），如果不提供则从群聊信息中获取
+     */
+    fun addGroupMemory(memoryText: String, promptOpenId: String? = null) {
+        viewModelScope.launch {
+            try {
+                isAddingMemory = true
+                addMemoryError = null
+                addMemorySuccess = false
+                
+                // 如果没有提供 promptOpenId，需要先获取群聊的智能体信息
+                val openId = promptOpenId ?: run {
+                    // 通过 createGroupChatAi 接口获取群聊详细信息（包含 prompts）
+                    val response = ApiClient.api.createGroupChatAi(trtcGroupId = groupId)
+                    val groupChatResponse = response.body()?.data
+                    val prompts = groupChatResponse?.prompts
+                    
+                    if (prompts.isNullOrEmpty()) {
+                        throw Exception("群聊中没有找到智能体，无法添加记忆")
+                    }
+                    
+                    // 使用第一个智能体的 openId
+                    prompts.firstOrNull()?.openId
+                        ?: throw Exception("无法获取智能体信息")
+                }
+                
+                if (openId.isBlank()) {
+                    throw Exception("智能体ID不能为空")
+                }
+                
+                // 创建智能体规则（群记忆）
+                val requestBody = CreateAgentRuleRequestBody(
+                    rule = memoryText,
+                    openId = openId
+                )
+                
+                val response = ApiClient.api.createAgentRule(requestBody)
+                
+                if (response.isSuccessful) {
+                    addMemorySuccess = true
+                    Log.d("GroupChatInfoViewModel", "群记忆添加成功")
+                    // 刷新记忆列表和配额
+                    loadMemoryQuota(openId)
+                    loadMemoryList(openId)
+                } else {
+                    val errorResponse = parseErrorResponse(response.errorBody())
+                    val errorMessage = errorResponse?.toServiceException()?.message 
+                        ?: "添加群记忆失败: ${response.code()}"
+                    throw Exception(errorMessage)
+                }
+            } catch (e: Exception) {
+                addMemoryError = e.message ?: "添加群记忆失败"
+                Log.e("GroupChatInfoViewModel", "添加群记忆失败: ${e.message}", e)
+            } finally {
+                isAddingMemory = false
+            }
+        }
+    }
+    
+    /**
+     * 获取记忆配额信息
+     */
+    fun loadMemoryQuota(openId: String? = null) {
+        viewModelScope.launch {
+            try {
+                isLoadingMemory = true
+                memoryError = null
+                
+                val targetOpenId = openId ?: promptOpenId
+                if (targetOpenId.isNullOrBlank()) {
+                    // 如果还没有获取到 openId，先获取
+                    val response = ApiClient.api.createGroupChatAi(trtcGroupId = groupId)
+                    val groupChatResponse = response.body()?.data
+                    val prompts = groupChatResponse?.prompts
+                    val fetchedOpenId = prompts?.firstOrNull()?.openId
+                        ?: throw Exception("无法获取智能体信息")
+                    
+                    promptOpenId = fetchedOpenId
+                    val quotaResponse = ApiClient.api.getAgentRuleQuota(fetchedOpenId)
+                    if (quotaResponse.isSuccessful) {
+                        memoryQuota = quotaResponse.body()?.data
+                    } else {
+                        throw Exception("获取配额信息失败: ${quotaResponse.code()}")
+                    }
+                } else {
+                    val quotaResponse = ApiClient.api.getAgentRuleQuota(targetOpenId)
+                    if (quotaResponse.isSuccessful) {
+                        memoryQuota = quotaResponse.body()?.data
+                    } else {
+                        throw Exception("获取配额信息失败: ${quotaResponse.code()}")
+                    }
+                }
+            } catch (e: Exception) {
+                memoryError = e.message ?: "获取配额信息失败"
+                Log.e("GroupChatInfoViewModel", "获取配额信息失败: ${e.message}", e)
+            } finally {
+                isLoadingMemory = false
+            }
+        }
+    }
+    
+    /**
+     * 获取记忆列表
+     */
+    fun loadMemoryList(openId: String? = null, page: Int = 1, pageSize: Int = 20) {
+        viewModelScope.launch {
+            try {
+                isLoadingMemory = true
+                memoryError = null
+                
+                val targetOpenId = openId ?: promptOpenId
+                if (targetOpenId.isNullOrBlank()) {
+                    // 如果还没有获取到 openId，先获取
+                    val response = ApiClient.api.createGroupChatAi(trtcGroupId = groupId)
+                    val groupChatResponse = response.body()?.data
+                    val prompts = groupChatResponse?.prompts
+                    val fetchedOpenId = prompts?.firstOrNull()?.openId
+                        ?: throw Exception("无法获取智能体信息")
+                    
+                    promptOpenId = fetchedOpenId
+                    val listResponse = ApiClient.api.getAgentRuleList(fetchedOpenId, page = page, pageSize = pageSize)
+                    if (listResponse.isSuccessful) {
+                        memoryList = listResponse.body()?.data?.list ?: emptyList()
+                    } else {
+                        throw Exception("获取记忆列表失败: ${listResponse.code()}")
+                    }
+                } else {
+                    val listResponse = ApiClient.api.getAgentRuleList(targetOpenId, page = page, pageSize = pageSize)
+                    if (listResponse.isSuccessful) {
+                        memoryList = listResponse.body()?.data?.list ?: emptyList()
+                    } else {
+                        throw Exception("获取记忆列表失败: ${listResponse.code()}")
+                    }
+                }
+            } catch (e: Exception) {
+                memoryError = e.message ?: "获取记忆列表失败"
+                Log.e("GroupChatInfoViewModel", "获取记忆列表失败: ${e.message}", e)
+            } finally {
+                isLoadingMemory = false
+            }
+        }
+    }
+    
+    /**
+     * 删除记忆
+     */
+    fun deleteMemory(ruleId: Int) {
+        viewModelScope.launch {
+            try {
+                isLoadingMemory = true
+                memoryError = null
+                
+                val response = ApiClient.api.deleteAgentRule(ruleId)
+                if (response.isSuccessful) {
+                    // 刷新记忆列表和配额
+                    promptOpenId?.let { openId ->
+                        loadMemoryQuota(openId)
+                        loadMemoryList(openId)
+                    }
+                } else {
+                    val errorResponse = parseErrorResponse(response.errorBody())
+                    val errorMessage = errorResponse?.toServiceException()?.message 
+                        ?: "删除记忆失败: ${response.code()}"
+                    throw Exception(errorMessage)
+                }
+            } catch (e: Exception) {
+                memoryError = e.message ?: "删除记忆失败"
+                Log.e("GroupChatInfoViewModel", "删除记忆失败: ${e.message}", e)
+            } finally {
+                isLoadingMemory = false
+            }
+        }
+    }
+    
+    /**
+     * 更新记忆
+     */
+    fun updateMemory(ruleId: Int, newRuleText: String, targetOpenId: String? = null) {
+        viewModelScope.launch {
+            try {
+                isLoadingMemory = true
+                memoryError = null
+                
+                val openId = targetOpenId ?: promptOpenId
+                    ?: throw Exception("无法获取智能体ID")
+                
+                val requestBody = UpdateAgentRuleRequestBody(
+                    id = ruleId,
+                    rule = newRuleText,
+                    openId = openId
+                )
+                
+                val response = ApiClient.api.updateAgentRule(requestBody)
+                if (response.isSuccessful) {
+                    // 刷新记忆列表和配额
+                    loadMemoryQuota(openId)
+                    loadMemoryList(openId)
+                } else {
+                    val errorResponse = parseErrorResponse(response.errorBody())
+                    val errorMessage = errorResponse?.toServiceException()?.message 
+                        ?: "更新记忆失败: ${response.code()}"
+                    throw Exception(errorMessage)
+                }
+            } catch (e: Exception) {
+                memoryError = e.message ?: "更新记忆失败"
+                Log.e("GroupChatInfoViewModel", "更新记忆失败: ${e.message}", e)
+            } finally {
+                isLoadingMemory = false
+            }
+        }
+    }
 }

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

@@ -0,0 +1,625 @@
+package com.aiosman.ravenow.ui.group
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+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.ColorFilter
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalContext
+import android.widget.Toast
+import androidx.compose.ui.graphics.Brush
+
+@Composable
+fun GroupMemoryManageContent(
+    groupId: String,
+    viewModel: GroupChatInfoViewModel,
+    onAddMemoryClick: () -> Unit = {},
+    onDismiss: () -> Unit = {}
+) {
+    val AppColors = LocalAppTheme.current
+    val configuration = LocalConfiguration.current
+    val screenHeight = configuration.screenHeightDp.dp
+    val sheetHeight = screenHeight * 0.95f
+    val context = LocalContext.current
+    
+    // 编辑记忆的状态 - 存储正在编辑的记忆ID
+    var editingMemoryId by remember { mutableStateOf<Int?>(null) }
+    
+    // 加载配额和列表数据
+    LaunchedEffect(Unit) {
+        viewModel.loadMemoryQuota()
+        viewModel.loadMemoryList()
+    }
+    
+    val quota = viewModel.memoryQuota
+    val memoryList = viewModel.memoryList
+    val isLoading = viewModel.isLoadingMemory
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(sheetHeight)
+            .background(Color(0xFFFAF9FB))
+    ) {
+        // 顶部栏：返回按钮 + 标题 + 加号按钮
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(44.dp)
+                .padding(horizontal = 16.dp)
+        ) {
+            // 中间标题 - 绝对居中，不受其他组件影响
+            Text(
+                text = "记忆管理",
+                style = TextStyle(
+                    color = Color.Black,
+                    fontSize = 17.sp,
+                    fontWeight = FontWeight.SemiBold
+                ),
+                modifier = Modifier.align(Alignment.Center),
+                textAlign = TextAlign.Center
+            )
+
+            // 左侧返回按钮
+            Row(
+                modifier = Modifier
+                    .align(Alignment.CenterStart)
+                    .clip(RoundedCornerShape(296.dp))
+                    .background(Color.White) // 浅灰色背景
+                    .noRippleClickable { onDismiss() }
+                    .padding(horizontal = 12.dp, vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(4.dp)
+            ) {
+                Image(
+                    painter = painterResource(R.drawable.rider_pro_back_icon),
+                    contentDescription = "返回",
+                    modifier = Modifier.size(16.dp),
+                    colorFilter = ColorFilter.tint(Color.Black)
+                )
+                Text(
+                    text = "返回",
+                    style = TextStyle(
+                        color = Color.Black,
+                        fontSize = 15.sp,
+                        fontWeight = FontWeight.Normal
+                    )
+                )
+            }
+
+            // 右侧圆形加号按钮
+            Box(
+                modifier = Modifier
+                    .align(Alignment.CenterEnd)
+                    .size(32.dp)
+                    .clip(CircleShape)
+                    .background(Color.White)
+                    .noRippleClickable { onAddMemoryClick() },
+                contentAlignment = Alignment.Center
+            ) {
+                Text(
+                    text = "+",
+                    style = TextStyle(
+                        color = Color.Black,
+                        fontSize = 20.sp,
+                        fontWeight = FontWeight.Medium
+                    )
+                )
+            }
+        }
+
+        // 浅黄色提示栏 - 显示真实的配额数据
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(Color(0xFFFBF8EF))
+                .padding(horizontal = 16.dp, vertical = 12.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.CenterVertically) {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text("已付费:", style = TextStyle(color = Color(0x993C3C43), fontSize = 13.sp))
+                    Spacer(Modifier.width(3.dp))
+                    Text(
+                        "${quota?.purchasedCount ?: 0}", 
+                        style = TextStyle(color = Color(0xFFFF8D28), fontSize = 13.sp)
+                    )
+                }
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Text("已使用:", style = TextStyle(color = Color(0x993C3C43), fontSize = 13.sp))
+                    Spacer(Modifier.width(3.dp))
+                    Text(
+                        "${quota?.currentCount ?: 0}", 
+                        style = TextStyle(color = Color(0xFFFF8D28), fontSize = 13.sp)
+                    )
+                }
+            }
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text("可用上限:", style = TextStyle(color = Color(0x993C3C43), fontSize = 13.sp))
+                Spacer(Modifier.width(3.dp))
+                Text(
+                    "50",
+                    style = TextStyle(color = Color(0xFFFF8D28), fontSize = 13.sp)
+                )
+            }
+        }
+
+        // 记忆列表或空状态
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f)
+        ) {
+            if (isLoading) {
+                // 加载中状态
+                Box(
+                    modifier = Modifier.fillMaxSize(),
+                    contentAlignment = Alignment.Center
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(40.dp),
+                        color = Color(0xFFFF8D28)
+                    )
+                }
+            } else if (memoryList.isNotEmpty()) {
+                // 显示记忆列表
+                LazyColumn(
+                    modifier = Modifier.fillMaxSize(),
+                    contentPadding = PaddingValues(horizontal = 16.dp, vertical = 12.dp),
+                    verticalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    items(memoryList) { memory ->
+                        MemoryItem(
+                            memory = memory,
+                            isEditing = editingMemoryId == memory.id,
+                            onEdit = {
+                                editingMemoryId = memory.id
+                            },
+                            onCancel = {
+                                editingMemoryId = null
+                            },
+                            onSave = { newText ->
+                                viewModel.updateMemory(memory.id, newText)
+                                editingMemoryId = null
+                            },
+                            onDelete = {
+                                viewModel.deleteMemory(memory.id)
+                            }
+                        )
+                    }
+                }
+            } else {
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(vertical = 60.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    Image(
+                        painter = painterResource(id = R.mipmap.group),
+                        contentDescription = "暂无记忆",
+                        modifier = Modifier
+                            .height(150.dp).width(180.dp)
+                    )
+
+                    Spacer(Modifier.height(10.dp))
+                    Text(
+                        text = "暂无记忆",
+                        style = TextStyle(color = Color.Black, fontSize = 16.sp, fontWeight = FontWeight.SemiBold)
+                    )
+                    Spacer(Modifier.height(6.dp))
+                    Text(
+                        text = "点击上方按钮添加群记忆",
+                        style = TextStyle(color = Color.Black, fontSize = 14.sp, fontWeight = FontWeight.Normal)
+                    )
+                }
+            }
+        }
+    }
+}
+
+/**
+ * 编辑记忆对话框
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun EditGroupMemoryDialog(
+    memory: com.aiosman.ravenow.data.api.AgentRule,
+    viewModel: GroupChatInfoViewModel,
+    onDismiss: () -> Unit,
+    onUpdateMemory: (String) -> Unit
+) {
+    val AppColors = LocalAppTheme.current
+    val context = LocalContext.current
+    var memoryText by remember { mutableStateOf(memory.rule) }
+    val maxLength = 500
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+
+    val gradientColors = listOf(
+        Color(0xFF7C45ED),
+        Color(0xFF7C57EE),
+        Color(0xFF7BD8F8)
+    )
+    val gradientBrush = Brush.horizontalGradient(colors = gradientColors)
+    
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        containerColor = Color(0xFFFAF9FB),
+        dragHandle = {
+            Box(
+                modifier = Modifier
+                    .width(36.dp)
+                    .height(5.dp)
+                    .padding(top = 5.dp)
+                    .background(
+                        Color(0xFFCCCCCC),
+                        RoundedCornerShape(100.dp)
+                    )
+            )
+        },
+        shape = RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 12.dp, vertical = 16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(12.dp)
+        ) {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(88.dp)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(RoundedCornerShape(16.dp))
+                        .background(brush = gradientBrush)
+                )
+
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(1.dp)
+                        .clip(RoundedCornerShape(15.dp))
+                        .background(Color.White)
+                        .padding(12.dp),
+                    contentAlignment = Alignment.TopStart
+                ) {
+                    BasicTextField(
+                        value = memoryText,
+                        onValueChange = { newText ->
+                            if (newText.length <= maxLength) {
+                                memoryText = newText
+                            }
+                        },
+                        cursorBrush = SolidColor(Color.Black),
+                        modifier = Modifier.fillMaxWidth(),
+                        textStyle = TextStyle(
+                            fontSize = 13.sp,
+                            color = Color.Black,
+                            lineHeight = 18.sp
+                        ),
+                        decorationBox = { innerTextField ->
+                            Box(
+                                modifier = Modifier.fillMaxWidth(),
+                                contentAlignment = Alignment.TopStart
+                            ) {
+                                innerTextField()
+                            }
+                        }
+                    )
+                }
+            }
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(12.dp)
+            ) {
+                // 取消按钮
+                Box(
+                    modifier = Modifier
+                        .weight(1f)
+                        .height(34.dp)
+                        .clip(RoundedCornerShape(653.8.dp))
+                        .background(Color(0x147C7480))
+                        .noRippleClickable { onDismiss() },
+                    contentAlignment = Alignment.Center
+                ) {
+                    Text(
+                        text = "取消",
+                        style = TextStyle(
+                            fontSize = 15.sp,
+                            color = Color.Black
+                        )
+                    )
+                }
+                
+                // 保存按钮
+                Box(
+                    modifier = Modifier
+                        .weight(1f)
+                        .height(34.dp)
+                        .clip(RoundedCornerShape(653.8.dp))
+                        .background(Color(0xFF110C13))
+                        .noRippleClickable {
+                            if (memoryText.isNotBlank() && memoryText != memory.rule) {
+                                onUpdateMemory(memoryText)
+                                Toast.makeText(context, "记忆更新成功", Toast.LENGTH_SHORT).show()
+                            }
+                        },
+                    contentAlignment = Alignment.Center
+                ) {
+                    Text(
+                        text = "保存",
+                        style = TextStyle(
+                            fontSize = 15.sp,
+                            color = Color.White
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
+
+/**
+ * 记忆项组件
+ */
+@Composable
+fun MemoryItem(
+    memory: com.aiosman.ravenow.data.api.AgentRule,
+    isEditing: Boolean = false,
+    onEdit: () -> Unit = {},
+    onCancel: () -> Unit = {},
+    onSave: (String) -> Unit = {},
+    onDelete: () -> Unit
+) {
+    val AppColors = LocalAppTheme.current
+    val context = LocalContext.current
+    var memoryText by remember { mutableStateOf(memory.rule) }
+    val maxLength = 500
+    
+    // 渐变边框颜色
+    val gradientColors = listOf(
+        Color(0xFF7C45ED),
+        Color(0xFF7C57EE),
+        Color(0xFF7BD8F8)
+    )
+    val gradientBrush = Brush.horizontalGradient(colors = gradientColors)
+    
+    // 当进入编辑模式时，重置文本
+    LaunchedEffect(isEditing) {
+        if (isEditing) {
+            memoryText = memory.rule
+        }
+    }
+    
+    if (isEditing) {
+        // 编辑模式：显示编辑界面
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(16.dp))
+                .background(Color.White)
+                .padding(horizontal = 12.dp, vertical = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(12.dp)
+        ) {
+            // 文本输入框 - 带渐变边框
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(88.dp)
+            ) {
+                // 渐变边框层
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clip(RoundedCornerShape(16.dp))
+                        .background(brush = gradientBrush)
+                )
+                
+                // 内容层 - 白色背景，通过padding形成边框效果
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(1.dp)
+                        .clip(RoundedCornerShape(15.dp))
+                        .background(Color.White)
+                        .padding(12.dp),
+                    contentAlignment = Alignment.TopStart
+                ) {
+                    BasicTextField(
+                        value = memoryText,
+                        onValueChange = { newText ->
+                            if (newText.length <= maxLength) {
+                                memoryText = newText
+                            }
+                        },
+                        cursorBrush = SolidColor(Color.Black),
+                        modifier = Modifier.fillMaxWidth(),
+                        textStyle = TextStyle(
+                            fontSize = 13.sp,
+                            color = Color.Black,
+                            lineHeight = 18.sp
+                        ),
+                        decorationBox = { innerTextField ->
+                            Box(
+                                modifier = Modifier.fillMaxWidth(),
+                                contentAlignment = Alignment.TopStart
+                            ) {
+                                innerTextField()
+                            }
+                        }
+                    )
+                }
+            }
+            
+            // 按钮行：取消和保存
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(12.dp)
+            ) {
+                // 取消按钮
+                Box(
+                    modifier = Modifier
+                        .weight(1f)
+                        .height(34.dp)
+                        .clip(RoundedCornerShape(653.8.dp))
+                        .background(Color(0x147C7480))
+                        .noRippleClickable { onCancel() },
+                    contentAlignment = Alignment.Center
+                ) {
+                    Text(
+                        text = "取消",
+                        style = TextStyle(
+                            fontSize = 15.sp,
+                            color = Color.Black
+                        )
+                    )
+                }
+                
+                // 保存按钮
+                Box(
+                    modifier = Modifier
+                        .weight(1f)
+                        .height(34.dp)
+                        .clip(RoundedCornerShape(653.8.dp))
+                        .background(Color(0xFF110C13))
+                        .noRippleClickable {
+                            if (memoryText.isNotBlank() && memoryText != memory.rule) {
+                                onSave(memoryText)
+                                Toast.makeText(context, "记忆更新成功", Toast.LENGTH_SHORT).show()
+                            }
+                        },
+                    contentAlignment = Alignment.Center
+                ) {
+                    Text(
+                        text = "保存",
+                        style = TextStyle(
+                            fontSize = 15.sp,
+                            color = Color.White
+                        )
+                    )
+                }
+            }
+        }
+    } else {
+        // 显示模式：显示记忆内容
+        // 格式化日期：从 "2025-10-20T10:30:00Z" 格式转换为 "2025年10月20日"
+        val formattedDate = try {
+            if (memory.createdAt.length >= 10) {
+                val dateStr = memory.createdAt.substring(0, 10)
+                val parts = dateStr.split("-")
+                if (parts.size == 3) {
+                    "${parts[0]}年${parts[1].toInt()}月${parts[2].toInt()}日"
+                } else {
+                    dateStr
+                }
+            } else {
+                memory.createdAt
+            }
+        } catch (e: Exception) {
+            if (memory.createdAt.length >= 10) memory.createdAt.substring(0, 10) else memory.createdAt
+        }
+        
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(16.dp))
+                .background(Color.White)
+                .padding(horizontal = 12.dp, vertical = 16.dp)
+        ) {
+            // 主文本 - 顶部
+            Text(
+                text = memory.rule,
+                style = TextStyle(
+                    color = Color.Black,
+                    fontSize = 13.sp,
+                    lineHeight = 18.sp
+                ),
+                maxLines = 3,
+                overflow = TextOverflow.Ellipsis
+            )
+            
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            // 底部行：日期 + 编辑删除按钮
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.Bottom
+            ) {
+                // 日期文本 - 左侧
+                Text(
+                    text = formattedDate,
+                    style = TextStyle(
+                        color = Color(0x993C3C43),
+                        fontSize = 11.sp
+                    )
+                )
+                
+                // 编辑和删除图标 - 右侧
+                Row(
+                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    // 编辑图标
+                    Image(
+                        painter = painterResource(R.mipmap.icons_infor_edit),
+                        contentDescription = "编辑",
+                        modifier = Modifier
+                            .size(20.dp)
+                            .noRippleClickable { onEdit() },
+                        colorFilter = ColorFilter.tint(Color.Black)
+                    )
+
+                    Image(
+                        painter = painterResource(R.mipmap.iconsdelete),
+                        contentDescription = "删除",
+                        modifier = Modifier
+                            .size(20.dp)
+                            .noRippleClickable { onDelete() },
+                        colorFilter = ColorFilter.tint(Color(0xFFEE2A33))
+                    )
+                }
+            }
+        }
+    }
+}
+

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

@@ -43,7 +43,7 @@ fun CreateBottomSheet(
     onMomentClick: () -> Unit
 ) {
     val appColors = LocalAppTheme.current
-    
+//水平效果呈现镜像排列
     ModalBottomSheet(
         onDismissRequest = onDismiss,
         sheetState = sheetState,
@@ -58,42 +58,59 @@ fun CreateBottomSheet(
                 .padding(top = 24.dp, bottom = 24.dp),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            // 标题
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Image(
+                    painter = painterResource(R.mipmap.h_cj_rw_icon),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .padding(start = 16.dp),
+                    colorFilter = androidx.compose.ui.graphics.ColorFilter.tint(appColors.text)
+                )
+                Spacer(modifier = Modifier.weight(1f))
                 Text(
                     text = stringResource(R.string.create_title),
                     fontSize = 18.sp,
                     fontWeight = FontWeight.Bold,
                     color = appColors.text,
-                modifier = Modifier.padding(bottom = 32.dp)
+                    modifier = Modifier
+                        .padding(end = 3.dp)
                 )
+                Image(
+                    painter = painterResource(R.mipmap.h_cj_x_img),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .padding(end = 18.dp),
+                    colorFilter = androidx.compose.ui.graphics.ColorFilter.tint(appColors.text)
+                )
+            }
 
+            Spacer(modifier = Modifier.height(30.dp))
             // 三个创建选项
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceEvenly
             ) {
-                // 群聊选项
-                CreateOption(
-                    icon = R.drawable.ic_create_group_chat,
-                    label = stringResource(R.string.create_group_chat_option),
-                    onClick = onGroupChatClick
-                )
                 // 动态选项
                 CreateOption(
                     icon = R.drawable.ic_create_monent,
                     label = stringResource(R.string.create_moment),
                     onClick = onMomentClick
                 )
+                // 群聊选项
+                CreateOption(
+                    icon = R.mipmap.icons_circle_camera,
+                    label = stringResource(R.string.create_group_chat_option),
+                    onClick = onGroupChatClick
+                )
                 // AI选项
                 CreateOption(
-                    icon = R.drawable.ic_create_ai,
+                    icon = R.mipmap.icons_circle_ai,
                     label = stringResource(R.string.create_ai),
                     onClick = onAiClick
                 )
-                
-
-                
-
             }
             
             Spacer(modifier = Modifier.height(40.dp))

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

@@ -1,6 +1,12 @@
 package com.aiosman.ravenow.ui.index
 
 import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.FastOutLinearInEasing
+import androidx.compose.animation.core.LinearOutSlowInEasing
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -11,15 +17,21 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
@@ -42,8 +54,10 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -59,7 +73,11 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.zIndex
 import com.aiosman.ravenow.AppState
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
 import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.GuestLoginCheckOut
 import com.aiosman.ravenow.GuestLoginCheckOutScene
@@ -123,152 +141,17 @@ fun IndexScreen() {
             gesturesEnabled = drawerState.isOpen,
             drawerContent = {
                 CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
-                    Column(
+                    SideMenuContent(
-                        modifier = Modifier
+                        onClose = {
-                            .requiredWidth(250.dp)
-                            .fillMaxHeight()
-                            .background(
-                                AppColors.background
-                            )
-                    ) {
-                        Spacer(modifier = Modifier.height(88.dp))
-                        NavItem(
-                            iconRes = R.drawable.rave_now_nav_account,
-                            label = stringResource(R.string.account_and_security),
-                            modifier = Modifier.noRippleClickable {
                             coroutineScope.launch {
                                 drawerState.close()
-                                    navController.navigate(NavigationRoute.AccountSetting.route)
                             }
-
-                            }
-                        )
-                        Spacer(modifier = Modifier.height(16.dp))
-                        NavItem(
-                            iconRes = R.drawable.rider_pro_favourited,
-                            label = stringResource(R.string.favourites),
-                            modifier = Modifier.noRippleClickable {
-                                coroutineScope.launch {
-                                    drawerState.close()
-                                    navController.navigate(NavigationRoute.FavouriteList.route)
-                                }
-
-                            }
-                        )
-
-                        NavItem(
-                            iconRes = R.drawable.rave_now_nav_night,
-                            label = stringResource(R.string.dark_mode),
-                            rightContent = {
-                                Switch(
-                                    checked = AppState.darkMode,
-                                    onCheckedChange = {
-                                        AppState.switchTheme()
                         },
-
+                        navController = navController,
-                                    colors = SwitchDefaults.colors(
+                        context = context,
-                                        checkedThumbColor = Color.White,
+                        isDrawerOpen = drawerState.isOpen
-                                        checkedTrackColor = AppColors.main,
-                                        uncheckedThumbColor = Color.White,
-                                        uncheckedTrackColor = AppColors.main.copy(alpha = 0.5f),
-                                        uncheckedBorderColor = Color.Transparent
-                                    ),
-                                    modifier = Modifier.scale(0.8f)
                     )
                 }
-                        )
-                        // divider
-                        Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(top = 16.dp, bottom = 16.dp, start = 16.dp, end = 16.dp)
-                        ) {
-                            Box(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .height(1.dp)
-                                    .background(AppColors.divider)
-                            )
-                        }
-                        NavItem(
-                            iconRes = R.drawable.rave_now_nav_about,
-                            label = stringResource(R.string.blocked),
-                            modifier = Modifier.noRippleClickable {
-                                coroutineScope.launch {
-                                    drawerState.close()
-                                    navController.navigate(NavigationRoute.AboutScreen.route)
-                                }
-                            }
-                        )
-                        NavItem(
-                            iconRes = R.drawable.rave_now_nav_about,
-                            label = stringResource(R.string.feedback),
-                            modifier = Modifier.noRippleClickable {
-                                coroutineScope.launch {
-                                    drawerState.close()
-                                    navController.navigate(NavigationRoute.AboutScreen.route)
-                                }
-                            }
-                        )
-                        NavItem(
-                            iconRes = R.drawable.rave_now_nav_about,
-                            label = stringResource(R.string.about_rave_now),
-                            modifier = Modifier.noRippleClickable {
-                                coroutineScope.launch {
-                                    drawerState.close()
-                                    navController.navigate(NavigationRoute.AboutScreen.route)
-                                }
-                            }
-                        )
-                        // divider
-                        Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(top = 16.dp, bottom = 16.dp, start = 16.dp, end = 16.dp)
-                        ) {
-                            Box(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .height(1.dp)
-                                    .background(AppColors.divider)
-                            )
-                        }
-
-//                        NavItem(
-//                            iconRes = R.drawable.rave_now_nav_switch,
-//                            label = "Switch Account"
-//                        )
-//                        Spacer(modifier = Modifier.height(16.dp))
-                        NavItem(
-                            iconRes = R.drawable.rave_now_nav_logout,
-                            label = stringResource(R.string.logout),
-                            modifier = Modifier.noRippleClickable {
-                                coroutineScope.launch {
-                                    drawerState.close()
-                                    // 只有非游客用户才需要取消注册推送设备
-                                    if (!AppStore.isGuest) {
-                                        Messaging.unregisterDevice(context)
-                                    }
-                                    AppStore.apply {
-                                        token = null
-                                        rememberMe = false
-                                        isGuest = false  // 清除游客状态
-                                        saveData()
-                                    }
-                                    // 删除推送渠道
-
-                                    navController.navigate(NavigationRoute.Login.route) {
-                                        popUpTo(NavigationRoute.Login.route) {
-                                            inclusive = true
-                                        }
-                                    }
-                                    AppState.ReloadAppState(context)
-                                }
-                            }
-                        )
-
-                    }
-                }
             }
         ) {
             CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
@@ -276,12 +159,15 @@ fun IndexScreen() {
                     bottomBar = {
                         NavigationBar(
                             modifier = Modifier.height(58.dp + navigationBarHeight),
-                            containerColor = AppColors.background
+                            containerColor = AppColors.tabUnselectedBackground
                         ) {
                             item.forEachIndexed { idx, it ->
                                 val isSelected = model.tabIndex == idx
+                                // 定义新的选中颜色
+                                val selectedColor = Color(0xFF7C45ED)
+
                                 val iconTint by animateColorAsState(
-                                    targetValue = if (isSelected) AppColors.brandColorsColor else AppColors.text,
+                                    targetValue = if (isSelected) selectedColor else AppColors.text,
                                     animationSpec = tween(durationMillis = 250), label = ""
                                 )
 
@@ -343,7 +229,7 @@ fun IndexScreen() {
                                                     .width(48.dp)
                                                     .height(32.dp)
                                                     .background(
-                                                        color = if (isSelected) AppColors.brandColorsColor.copy(alpha = 0.15f) else Color.Transparent,
+                                                        color = if (isSelected) selectedColor.copy(alpha = 0.15f) else Color.Transparent,
                                                         shape = RoundedCornerShape(12.dp)
                                                     ),
                                                 contentAlignment = Alignment.Center
@@ -362,7 +248,7 @@ fun IndexScreen() {
                                             Text(
                                                 text = it.label(),
                                                 fontSize = 10.sp,
-                                                color = if (isSelected) Color.Blue else AppColors.text,
+                                                color = if (isSelected) selectedColor else AppColors.text,
                                                 fontWeight = if (isSelected) FontWeight.W600 else FontWeight.Normal
                                             )
                                         }
@@ -444,7 +330,6 @@ fun IndexScreen() {
             )
         }
     }
-
 }
 
 @Composable
@@ -621,3 +506,343 @@ fun NavItem(
 
     }
 }
+
+@Composable
+fun SideMenuContent(
+    onClose: () -> Unit,
+    navController: androidx.navigation.NavController,
+    context: android.content.Context,
+    isDrawerOpen: Boolean
+) {
+    val appColors = LocalAppTheme.current
+    val coroutineScope = rememberCoroutineScope()
+    var messageNotificationEnabled by remember { mutableStateOf(true) }
+    var darkModeEnabled by remember { mutableStateOf(AppState.darkMode) }
+    
+    // 菜单背景色 #FAF9FB
+    val menuBackgroundColor = Color(0xFFFAF9FB)
+    // 遮罩颜色 黑色透明度0.6
+    val overlayColor = Color.Black.copy(alpha = 0.6f)
+    // 卡片背景色 白色
+    val cardBackgroundColor = Color.White
+    // 跟随系统文字颜色 #979499
+    val followSystemTextColor = Color(0xFF979499)
+    // 开关开启颜色 #7C45ED
+    val switchActiveColor = Color(0xFF7C45ED)
+    
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        // 左侧半透明遮罩（平滑淡入淡出）
+        val overlayTransition = updateTransition(targetState = isDrawerOpen, label = "overlay")
+        val overlayAlpha by overlayTransition.animateFloat(
+            transitionSpec = {
+                if (targetState) {
+                    tween(durationMillis = 400, easing = LinearOutSlowInEasing)
+                } else {
+                    tween(durationMillis = 300, easing = FastOutLinearInEasing)
+                }
+            },
+            label = "overlayAlpha"
+        ) { open -> if (open) 0.6f else 0f }
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(Color.Black.copy(alpha = overlayAlpha))
+        )
+        
+        // 右侧菜单面板
+        Box(
+            modifier = Modifier
+                .requiredWidth(302.dp)
+                .requiredHeight(874.dp)
+                .align(Alignment.CenterEnd)
+                .background(menuBackgroundColor)
+        ) {
+            // 顶部状态栏间距
+            val statusBarHeight = WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
+            
+            // 扫一扫功能入口 - 右边距离右边66pt
+            Row(
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .offset(x = (-112).dp, y = 88.dp)
+                    .noRippleClickable {
+                        // TODO: 实现扫一扫功能
+                    },
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                // 扫一扫图标（使用现有图标或占位）
+                Image(
+                    painter = painterResource(id = R.mipmap.sao),
+                    contentDescription = null,
+                    modifier = Modifier.size(24.dp),
+                    colorFilter = ColorFilter.tint(Color.Black)
+                )
+            }
+// 绝对定位的"扫一扫"文字：上方71.5dp，右侧66dp
+            Text(
+                text = stringResource(R.string.scan_qr),
+                fontSize = 14.sp,
+                color = Color.Black,
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .offset(x = (-66).dp, y = 91.5.dp)
+            )
+// QR码图标 - 右边距离右边112dp，上边距离上边68pt
+            Image(
+                painter = painterResource(id = R.mipmap.qr_code_icon),
+                contentDescription = null,
+                modifier = Modifier
+                    .size(24.dp)
+                    .align(Alignment.TopEnd)
+                    .offset(x = (-26).dp, y = 88.dp)
+                    .noRippleClickable {
+                        // TODO: 实现QR码功能
+                    },
+                colorFilter = ColorFilter.tint(Color.Black)
+            )
+            
+            // 菜单选项卡片组 - 第一组卡片上方距离上方108pt（绝对定位）
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .offset(y = 128.dp) // 直接距离顶部128dp（整体下移20dp）
+                    .padding(horizontal = 16.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                // 第一组卡片：编辑资料、账号安全、收藏
+                MenuCard(
+                    backgroundColor = cardBackgroundColor,
+                    width = 270.dp,
+                    height = 164.dp,
+                    items = listOf(
+                        MenuItem(
+                            icon = R.mipmap.icons_edited_data,
+                            label = stringResource(R.string.edit_profile_info),
+                            onClick = {
+                                coroutineScope.launch {
+                                    onClose()
+                                    navController.navigate(NavigationRoute.AccountEdit.route)
+                                }
+                            }
+                        ),
+                        MenuItem(
+                            icon = R.mipmap.icons_account_and_security,
+                            label = stringResource(R.string.account_and_security),
+                            onClick = {
+                                coroutineScope.launch {
+                                    onClose()
+                                    navController.navigate(NavigationRoute.AccountSetting.route)
+                                }
+                            }
+                        ),
+                        MenuItem(
+                            icon = R.mipmap.collect,
+                            label = stringResource(R.string.favourites),
+                            onClick = {
+                                coroutineScope.launch {
+                                    onClose()
+                                    navController.navigate(NavigationRoute.FavouriteList.route)
+                                }
+                            }
+                        )
+                    )
+                )
+                
+                // 第二组卡片：暗色模式、消息通知
+                MenuCard(
+                    backgroundColor = cardBackgroundColor,
+                    width = 270.dp,
+                    height = 112.dp, // 根据设计图，第二组卡片高度为112dp
+                    items = listOf(
+                        MenuItem(
+                            icon = R.mipmap.icons_dark_mode,
+                            label = stringResource(R.string.dark_mode),
+                            rightContent = {
+                                Switch(
+                                    checked = darkModeEnabled,
+                                    onCheckedChange = { 
+                                        darkModeEnabled = it
+                                        AppState.darkMode = it
+                                        AppState.appTheme = if (it) {
+                                            com.aiosman.ravenow.DarkThemeColors()
+                                        } else {
+                                            com.aiosman.ravenow.LightThemeColors()
+                                        }
+                                        AppStore.saveDarkMode(it)
+                                    },
+                                    colors = SwitchDefaults.colors(
+                                        checkedThumbColor = Color.White,
+                                        checkedTrackColor = switchActiveColor,
+                                        uncheckedThumbColor = Color.White,
+                                        uncheckedTrackColor = switchActiveColor.copy(alpha = 0.5f),
+                                        uncheckedBorderColor = Color.Transparent
+                                    ),
+                                    modifier = Modifier.size(width = 64.dp, height = 28.dp)
+                                )
+                            }
+                        ),
+                        MenuItem(
+                            icon = R.mipmap.icons_bell,
+                            label = stringResource(R.string.message_notification),
+                            rightContent = {
+                                Switch(
+                                    checked = messageNotificationEnabled,
+                                    onCheckedChange = { messageNotificationEnabled = it },
+                                    colors = SwitchDefaults.colors(
+                                        checkedThumbColor = Color.White,
+                                        checkedTrackColor = switchActiveColor,
+                                        uncheckedThumbColor = Color.White,
+                                        uncheckedTrackColor = switchActiveColor.copy(alpha = 0.5f),
+                                        uncheckedBorderColor = Color.Transparent
+                                    ),
+                                    modifier = Modifier.size(width = 64.dp, height = 28.dp)
+                                )
+                            }
+                        )
+                    )
+                )
+                
+                // 第三组卡片：关于派派、反馈、退出登录
+                MenuCard(
+                    backgroundColor = cardBackgroundColor,
+                    width = 270.dp,
+                    height = 164.dp,
+                    items = listOf(
+                        MenuItem(
+                            icon = R.mipmap.icons_about,
+                            label = stringResource(R.string.about_paipai),
+                            onClick = {
+                                coroutineScope.launch {
+                                    onClose()
+                                    navController.navigate(NavigationRoute.AboutScreen.route)
+                                }
+                            }
+                        ),
+                        MenuItem(
+                            icon = R.mipmap.feedback_icon,
+                            label = stringResource(R.string.feedback),
+                            onClick = {
+                                coroutineScope.launch {
+                                    onClose()
+                                    navController.navigate(NavigationRoute.AboutScreen.route)
+                                }
+                            }
+                        ),
+                        MenuItem(
+                            icon = R.mipmap.log_out_icon,
+                            label = stringResource(R.string.logout_confirm),
+                            onClick = {
+                                coroutineScope.launch {
+                                    onClose()
+                                    // 只有非游客用户才需要取消注册推送设备
+                                    if (!AppStore.isGuest) {
+                                        Messaging.unregisterDevice(context)
+                                    }
+                                    AppStore.apply {
+                                        token = null
+                                        rememberMe = false
+                                        isGuest = false
+                                        saveData()
+                                    }
+                                    navController.navigate(NavigationRoute.Login.route) {
+                                        popUpTo(NavigationRoute.Login.route) {
+                                            inclusive = true
+                                        }
+                                    }
+                                    AppState.ReloadAppState(context)
+                                }
+                            },
+                            showRightArrow = false
+                        )
+                    )
+                )
+            }
+        }
+    }
+}
+
+data class MenuItem(
+    val icon: Int,
+    val label: String,
+    val onClick: (() -> Unit)? = null,
+    val rightContent: @Composable (() -> Unit)? = null,
+    val showRightArrow: Boolean = true
+)
+
+@Composable
+fun MenuCard(
+    backgroundColor: Color,
+    items: List<MenuItem>,
+    width: androidx.compose.ui.unit.Dp? = null,
+    height: androidx.compose.ui.unit.Dp? = null
+) {
+    Column(
+        modifier = Modifier
+            .then(if (width != null) Modifier.requiredWidth(width) else Modifier.fillMaxWidth())
+            .then(if (height != null) Modifier.requiredHeight(height) else Modifier)
+            .background(backgroundColor, RoundedCornerShape(16.dp))
+            .padding(horizontal = 16.dp),
+        verticalArrangement = if (height != null) Arrangement.SpaceEvenly else Arrangement.spacedBy(8.dp) // 固定高度时均匀分布
+    ) {
+        items.forEachIndexed { index, item ->
+            Box(
+                modifier = Modifier
+                    .then(if (height != null) Modifier.weight(1f) else Modifier),
+                contentAlignment = Alignment.Center
+            ) {
+                MenuItemRow(item = item, compact = height != null) // 传递compact参数
+            }
+        }
+    }
+}
+
+@Composable
+fun MenuItemRow(item: MenuItem, compact: Boolean = false) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .then(
+                if (item.onClick != null) {
+                    Modifier.noRippleClickable { item.onClick?.invoke() }
+                } else {
+                    Modifier
+                }
+            )
+            .padding(vertical = if (compact) 4.dp else 8.dp), // 紧凑模式下减少垂直padding
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.weight(1f)
+        ) {
+            Image(
+                painter = painterResource(id = item.icon),
+                contentDescription = null,
+                modifier = Modifier.size(24.dp),
+                colorFilter = ColorFilter.tint(Color.Black)
+            )
+            Text(
+                text = item.label,
+                fontSize = 14.sp,
+                color = Color.Black
+            )
+        }
+        
+        if (item.rightContent != null) {
+            item.rightContent?.invoke()
+        } else if (item.showRightArrow) {
+            Image(
+                painter = painterResource(id = R.drawable.rave_now_nav_right),
+                contentDescription = null,
+                modifier = Modifier.size(24.dp),
+                colorFilter = ColorFilter.tint(Color(0xFF111213))
+            )
+        }
+    }
+}

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

@@ -16,9 +16,9 @@ sealed class NavigationItem(
 ) {
 
     data object Home : NavigationItem("Home",
-        icon = { R.drawable.rider_pro_nav_home },
+        icon = { R.mipmap.bars_x_buttons_home_n_copy },
-        selectedIcon = { R.mipmap.bars_x_buttons_home_s },
+        selectedIcon = { R.mipmap.bars_x_buttons_home_n_copy_2 },
-        label = { stringResource(R.string.main_home) }
+        label = { stringResource(R.string.main_ai) }
     )
 
     data object Ai : NavigationItem("Ai",

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

@@ -80,7 +80,12 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
 import androidx.compose.foundation.lazy.grid.items as gridItems
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.ui.draw.alpha
 
 // 检测是否接近列表底部的扩展函数
 fun LazyListState.isScrolledToEnd(buffer: Int = 3): Boolean {
@@ -146,11 +151,14 @@ fun Agent() {
         topBar = {
             TopAppBar(
                 title = {
-                    androidx.compose.material3.Text(
+                    Image(
-                        text = "Rave AI",
+                        painter = painterResource(id = R.drawable.home_logo),
-                        fontSize = 20.sp,
+                        contentDescription = "Rave AI Logo",
-                        fontWeight = FontWeight.W900,
+                        modifier = Modifier
-                        color = AppColors.text
+                            .height(44.dp)
+                            .padding(top =9.dp,bottom=9.dp)
+                            .wrapContentSize(),
+//                        colorFilter = ColorFilter.tint(AppColors.text)
                     )
                 },
                 actions = {
@@ -158,7 +166,8 @@ fun Agent() {
                         painter = painterResource(id = R.drawable.rider_pro_nav_search),
                         contentDescription = "search",
                         modifier = Modifier
-                            .size(24.dp)
+                            .size(44.dp)
+                            .padding(top = 9.dp,bottom=9.dp)
                             .noRippleClickable {
                                 navController.navigate(NavigationRoute.Search.route)
                             },
@@ -167,7 +176,11 @@ fun Agent() {
                 },
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = AppColors.background
-                )
+                ),
+                windowInsets = WindowInsets(0, 0, 0, 0),
+                modifier = Modifier
+                    .height(44.dp + statusBarPaddingValues.calculateTopPadding())
+                    .padding(top = statusBarPaddingValues.calculateTopPadding())
             )
         },
         containerColor = AppColors.background,
@@ -180,8 +193,8 @@ fun Agent() {
                 .padding(paddingValues)
                 .padding(
                     bottom = navigationBarPaddings,
-                    start = 16.dp,
+                    start = 8.dp,
-                    end = 16.dp
+                    end = 8.dp
                 )
         ) {
 
@@ -217,7 +230,7 @@ fun Agent() {
                         }
 
                         // 动态添加分类标签
-                        viewModel.categories.take(4).forEachIndexed { index, category ->
+                        viewModel.categories.forEachIndexed { index, category ->
                             item {
                                 CustomTabItem(
                                     text = category.name,
@@ -233,58 +246,6 @@ fun Agent() {
                                 TabSpacer()
                             }
                         }
-
-                        item {
-                            CustomTabItem(
-                                text = "scenes",
-                                isSelected = selectedTabIndex == 1,
-                                onClick = {
-                                    selectedTabIndex = 1
-                                }
-                            )
-                        }
-
-                        item {
-                            TabSpacer()
-                        }
-
-                        item {
-                            CustomTabItem(
-                                text = "voices",
-                                isSelected = selectedTabIndex == 6,
-                                onClick = {
-                                    selectedTabIndex = 6
-                                }
-                            )
-                        }
-
-                        item {
-                            TabSpacer()
-                        }
-
-                        item {
-                            CustomTabItem(
-                                text = "anime",
-                                isSelected = selectedTabIndex == 7,
-                                onClick = {
-                                    selectedTabIndex = 7
-                                }
-                            )
-                        }
-
-                        item {
-                            TabSpacer()
-                        }
-
-                        item {
-                            CustomTabItem(
-                                text = "assist",
-                                isSelected = selectedTabIndex == 8,
-                                onClick = {
-                                    selectedTabIndex = 8
-                                }
-                            )
-                        }
                     }
                 }
             }
@@ -310,6 +271,53 @@ fun Agent() {
                 }
             }
 
+            // 热门聊天室
+            stickyHeader(key = "hot_rooms_header") {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(AppColors.background)
+                        .padding(top = 8.dp, bottom = 12.dp),
+                    horizontalArrangement = Arrangement.Start,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Image(
+                        painter = painterResource(R.mipmap.rider_pro_hot_room),
+                        contentDescription = "chat room",
+                        modifier = Modifier.size(28.dp)
+                    )
+                    Spacer(modifier = Modifier.width(4.dp))
+                    androidx.compose.material3.Text(
+                        text = stringResource(R.string.hot_rooms),
+                        fontSize = 16.sp,
+                        fontWeight = androidx.compose.ui.text.font.FontWeight.W900,
+                        color = AppColors.text
+                    )
+                }
+            }
+
+            // 热门聊天室网格
+            items(viewModel.chatRooms.chunked(2)) { rowRooms ->
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 12.dp),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    rowRooms.forEach { chatRoom ->
+                        ChatRoomCard(
+                            chatRoom = chatRoom,
+                            navController = LocalNavController.current,
+                            modifier = Modifier.weight(1f)
+                        )
+                    }
+                    if (rowRooms.size == 1) {
+                        Spacer(modifier = Modifier.weight(1f))
+                    }
+                }
+            }
+
+            item { Spacer(modifier = Modifier.height(20.dp)) }
 
             // "发现更多" 标题 - 吸顶
             stickyHeader(key = "discover_more") {
@@ -322,15 +330,15 @@ fun Agent() {
                     verticalAlignment = Alignment.Bottom
                 ) {
                     Image(
-                        painter = painterResource(R.mipmap.rider_pro_agent2),
+                        painter = painterResource(R.mipmap.bars_x_buttons_home_n_copy_2),
                         contentDescription = "agent",
-                        modifier = Modifier.size(28.dp),
+                        modifier = Modifier.size(28.dp)
                     )
                     Spacer(modifier = Modifier.width(4.dp))
                     androidx.compose.material3.Text(
                         text = stringResource(R.string.agent_find),
                         fontSize = 16.sp,
-                        fontWeight = androidx.compose.ui.text.font.FontWeight.W600,
+                        fontWeight = androidx.compose.ui.text.font.FontWeight.W900,
                         color = AppColors.text
                     )
                 }
@@ -391,11 +399,67 @@ fun Agent() {
         }
     }
 }
+
+@Composable
+fun AgentGridLayout(
+    agentItems: List<AgentItem>,
+    viewModel: AgentViewModel,
+    navController: NavHostController
+) {
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        // 将agentItems按两列分组
+        agentItems.chunked(2).forEachIndexed { rowIndex, rowItems ->
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(
+                        top = if (rowIndex == 0) 30.dp else 20.dp, // 第一行添加更多顶部间距
+                        bottom = 20.dp
+                    ),
+                horizontalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                // 第一列
+                Box(
+                    modifier = Modifier.weight(1f)
+                ) {
+                    AgentCardSquare(
+                        agentItem = rowItems[0],
+                        viewModel = viewModel,
+                        navController = navController
+                    )
+                }
+
+                // 第二列（如果存在）
+                if (rowItems.size > 1) {
+                    Box(
+                        modifier = Modifier.weight(1f)
+                    ) {
+                        AgentCardSquare(
+                            agentItem = rowItems[1],
+                            viewModel = viewModel,
+                            navController = navController
+                        )
+                    }
+                } else {
+                    // 如果只有一列，添加空白占位
+                    Spacer(modifier = Modifier.weight(1f))
+                }
+            }
+        }
+    }
+}
+
 @SuppressLint("SuspiciousIndentation")
 @Composable
-fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navController: NavHostController) {
+fun AgentCardSquare(
+    agentItem: AgentItem,
+    viewModel: AgentViewModel,
+    navController: NavHostController
+) {
     val AppColors = LocalAppTheme.current
-    val cardHeight = 200.dp
+    val cardHeight = 180.dp
     val avatarSize = cardHeight / 3  // 头像大小为方块高度的三分之一
 
     // 防抖状态
@@ -404,9 +468,8 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = avatarSize / 2)
             .height(cardHeight)
-            .background(AppColors.nonActive, RoundedCornerShape(12.dp))  // 修改背景颜色
+            .background(AppColors.secondaryBackground, RoundedCornerShape(12.dp))
             .clickable {
                 if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
                         viewModel.goToProfile(agentItem.openId, navController)
@@ -416,15 +479,19 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
             },
         contentAlignment = Alignment.TopCenter
     ) {
-        // 头像，位于方块上方居中，部分悬于方块外部
         Box(
             modifier = Modifier
-                .offset(y = -avatarSize / 2)
+                .offset(y = 4.dp)
                 .size(avatarSize)
-                .background(Color.White, RoundedCornerShape(avatarSize / 2))
+                .background(AppColors.background, RoundedCornerShape(avatarSize / 2))
                 .clip(RoundedCornerShape(avatarSize / 2)),
             contentAlignment = Alignment.Center
         ) {
+            Image(
+                painter = painterResource(R.mipmap.group_copy),
+                contentDescription = "默认头像",
+                modifier = Modifier.size(avatarSize),
+            )
             if (agentItem.avatar.isNotEmpty()) {
                 CustomAsyncImage(
                     imageUrl = agentItem.avatar,
@@ -434,13 +501,6 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
                         .clip(RoundedCornerShape(avatarSize / 2)),
                     contentScale = androidx.compose.ui.layout.ContentScale.Crop
                 )
-            } else {
-                Image(
-                    painter = painterResource(R.mipmap.rider_pro_agent),
-                    contentDescription = "默认头像",
-                    modifier = Modifier.size(avatarSize / 2),
-                    colorFilter = ColorFilter.tint(AppColors.secondaryText)
-                )
             }
         }
 
@@ -448,7 +508,7 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = avatarSize / 2 + 8.dp, start = 8.dp, end = 8.dp, bottom = 8.dp),
+                .padding(top = 4.dp + avatarSize + 8.dp, start = 8.dp, end = 8.dp, bottom = 48.dp), // 为底部聊天按钮留出空间
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             androidx.compose.material3.Text(
@@ -462,30 +522,31 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
 
             Spacer(modifier = Modifier.height(8.dp))
 
-            Box(
-                modifier = Modifier
-                    .height(85.dp)
-                    .fillMaxWidth()
-            ) {
             androidx.compose.material3.Text(
                 text = agentItem.desc,
                 fontSize = 12.sp,
                 color = AppColors.secondaryText,
-                    maxLines = 5,
+                maxLines = 2,
                 overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f, fill = false)
             )
         }
 
-            Spacer(modifier = Modifier.height(8.dp))
+        // 聊天按钮
-
-            // 聊天按钮，位于底部居中
         Box(
             modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(bottom = 12.dp)
                 .width(60.dp)
                 .height(32.dp)
                 .background(
-                        color = Color(0X147c7480),
+                    color = AppColors.text,
-                        shape = RoundedCornerShape(8.dp)
+                    shape = RoundedCornerShape(
+                        topStart = 14.dp,
+                        topEnd = 14.dp,
+                        bottomStart = 0.dp,
+                        bottomEnd = 14.dp
+                    )
                 )
                 .clickable {
                     if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
@@ -507,13 +568,12 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
         ) {
             androidx.compose.material3.Text(
                 text = stringResource(R.string.chat),
-                    fontSize = 12.sp,
+                fontSize = 15.sp,
-                    color = AppColors.text,
+                color = AppColors.background,
                 fontWeight = androidx.compose.ui.text.font.FontWeight.W500
             )
         }
     }
-    }
 }
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -531,7 +591,7 @@ fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel)
             // Agent内容
             Box(
                 modifier = Modifier
-                    .height(300.dp)
+                    .height(310.dp)
             ) {
                 HorizontalPager(
                     state = pagerState,
@@ -553,7 +613,7 @@ fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel)
                         agentItems = agentItems.drop(page * itemsPerPage).take(itemsPerPage),
                         page = page,
                         modifier = Modifier
-                            .height(300.dp)
+                            .height(310.dp)
                             .graphicsLayer {
                                 scaleX = scale
                                 scaleY = scale
@@ -624,7 +684,7 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
         Box(
             modifier = Modifier
                 .size(48.dp)
-                .background(Color(0xFFF5F5F5), RoundedCornerShape(24.dp))
+                .background(Color(0x00F5F5F5), RoundedCornerShape(24.dp))
                 .clickable {
                     if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
                             viewModel.goToProfile(agentItem.openId, navController)
@@ -634,6 +694,12 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
                 },
             contentAlignment = Alignment.Center
         ) {
+            Image(
+                painter = painterResource(R.mipmap.group_copy),
+                contentDescription = "默认头像",
+                modifier = Modifier.size(48.dp),
+            )
+
             if (agentItem.avatar.isNotEmpty()) {
                 CustomAsyncImage(
                     imageUrl = agentItem.avatar,
@@ -643,13 +709,6 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
                         .clip(RoundedCornerShape(24.dp)),
                     contentScale = androidx.compose.ui.layout.ContentScale.Crop
                 )
-            } else {
-                Image(
-                    painter = painterResource(R.mipmap.rider_pro_agent),
-                    contentDescription = "默认头像",
-                    modifier = Modifier.size(24.dp),
-                    colorFilter = ColorFilter.tint(AppColors.secondaryText)
-                )
             }
         }
 
@@ -689,7 +748,12 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
                 .size(width = 60.dp, height = 32.dp)
                 .background(
                     color = Color(0X147c7480),
-                    shape = RoundedCornerShape(8.dp)
+                    shape = RoundedCornerShape(
+                        topStart = 14.dp,
+                        topEnd = 14.dp,
+                        bottomStart = 0.dp,
+                        bottomEnd = 14.dp
+                    )
                 )
                 .clickable {
                     if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
@@ -718,3 +782,210 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
         }
     }
 }
+@Composable
+fun ChatRoomsSection(
+    chatRooms: List<ChatRoom>,
+    navController: NavHostController
+) {
+    val AppColors = LocalAppTheme.current
+
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        // 标题
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Image(
+                painter = painterResource(R.mipmap.rider_pro_hot_room),
+                contentDescription = "chat room",
+                modifier = Modifier.size(28.dp)
+            )
+            Spacer(modifier = Modifier.width(4.dp))
+            androidx.compose.material3.Text(
+                text = stringResource(R.string.hot_rooms),
+                fontSize = 16.sp,
+                fontWeight = androidx.compose.ui.text.font.FontWeight.W900,
+                color = AppColors.text
+            )
+        }
+
+        Column(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            chatRooms.chunked(2).forEach { rowRooms ->
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 12.dp),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    rowRooms.forEach { chatRoom ->
+                        ChatRoomCard(
+                            chatRoom = chatRoom,
+                            navController = navController,
+                            modifier = Modifier.weight(1f)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ChatRoomCard(
+    chatRoom: ChatRoom,
+    navController: NavHostController,
+    modifier: Modifier = Modifier
+) {
+    val AppColors = LocalAppTheme.current
+    val cardSize = 180.dp
+    val viewModel: AgentViewModel = viewModel()
+    val context = LocalContext.current
+
+    // 防抖状态
+    var lastClickTime by remember { mutableStateOf(0L) }
+
+    // Loading 对话框
+    if (viewModel.isJoiningRoom) {
+        Dialog(
+            onDismissRequest = { /* 阻止用户关闭对话框 */ },
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false
+            )
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(120.dp)
+                    .background(
+                        color = AppColors.background,
+                        shape = RoundedCornerShape(12.dp)
+                    ),
+                contentAlignment = Alignment.Center
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(32.dp),
+                        color = AppColors.main
+                    )
+                    Spacer(modifier = Modifier.height(12.dp))
+                    androidx.compose.material3.Text(
+                        text = "加入中...",
+                        fontSize = 14.sp,
+                        color = AppColors.text
+                    )
+                }
+            }
+        }
+    }
+
+    // 正方形卡片，文字重叠在底部
+    Box(
+        modifier = modifier
+            .size(cardSize)
+            .background(AppColors.tabUnselectedBackground, RoundedCornerShape(12.dp))
+            .clickable(enabled = !viewModel.isJoiningRoom) {
+                if (!viewModel.isJoiningRoom && DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
+                        // 加入群聊房间
+                        viewModel.joinRoom(
+                            id = chatRoom.id,
+                            name = chatRoom.name,
+                            avatar = chatRoom.avatar,
+                            context = context,
+                            navController = navController,
+                            onSuccess = {
+                                // 成功加入房间
+                            },
+                            onError = { errorMsg ->
+                                // 处理错误，可以显示Toast或其他提示
+                            }
+                        )
+                    }) {
+                    lastClickTime = System.currentTimeMillis()
+                }
+            }
+    ) {
+        // 优先显示banner，如果没有banner则显示头像
+        val imageUrl = if (chatRoom.banner.isNotEmpty()) chatRoom.banner else chatRoom.avatar
+
+        if (imageUrl.isNotEmpty()) {
+            CustomAsyncImage(
+                imageUrl = imageUrl,
+                contentDescription = if (chatRoom.banner.isNotEmpty()) "房间banner" else "房间头像",
+                modifier = Modifier
+                    .width(cardSize)
+                    .height(120.dp)
+                    .clip(RoundedCornerShape(
+                        topStart = 12.dp,
+                        topEnd = 12.dp,
+                        bottomStart = 0.dp,
+                        bottomEnd = 0.dp)),
+                contentScale = androidx.compose.ui.layout.ContentScale.Crop
+            )
+        } else {
+            // 默认房间图标
+            Image(
+                painter = painterResource(R.mipmap.rider_pro_agent),
+                contentDescription = "默认房间图标",
+                modifier = Modifier.size(cardSize * 0.4f),
+                colorFilter = ColorFilter.tint(AppColors.secondaryText)
+            )
+        }
+
+        // 房间名称，重叠在底部
+        Box(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .fillMaxWidth()
+                .padding(bottom = 32.dp, start = 10.dp, end = 10.dp)
+                .clip(RoundedCornerShape(12.dp))
+
+        ) {
+            androidx.compose.material3.Text(
+                text = chatRoom.name,
+                fontSize = 14.sp,
+                fontWeight = androidx.compose.ui.text.font.FontWeight.W900,
+                color = AppColors.text,
+                maxLines = 1,
+                overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+                modifier = Modifier.fillMaxWidth(),
+                textAlign = androidx.compose.ui.text.style.TextAlign.Left
+            )
+        }
+        // 显示人数
+        Box(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .fillMaxWidth()
+                .padding(bottom = 10.dp, start = 10.dp, end = 10.dp)
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Image(
+                    painter = painterResource(R.drawable.rider_pro_nav_profile),
+                    contentDescription = "chat",
+                    modifier = Modifier.size(16.dp),
+                    colorFilter = ColorFilter.tint(AppColors.secondaryText)
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+                Text(
+                    text = "${chatRoom.memberCount} ${stringResource(R.string.chatting_now)}",
+                    fontSize = 12.sp,
+                    modifier = Modifier.alpha(0.6f),
+                    color = AppColors.text,
+                    fontWeight = androidx.compose.ui.text.font.FontWeight.W500
+                )
+            }
+        }
+    }
+}

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

@@ -17,6 +17,37 @@ import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.index.tabs.message.MessageListViewModel.userService
 import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.AgentItem
 import kotlinx.coroutines.launch
+import android.util.Log
+import com.aiosman.ravenow.data.Room
+import com.aiosman.ravenow.AppState
+import com.aiosman.ravenow.AppStore
+import com.aiosman.ravenow.ConstVars
+import com.aiosman.ravenow.data.api.CreateGroupChatRequestBody
+import com.aiosman.ravenow.ui.index.tabs.message.tab.GroupChatListViewModel.createGroupChat
+import com.aiosman.ravenow.ui.navigateToGroupChat
+import com.aiosman.ravenow.data.api.ApiErrorResponse
+import com.google.gson.Gson
+import android.content.Context
+import android.widget.Toast
+import kotlinx.coroutines.launch
+import com.aiosman.ravenow.data.api.JoinGroupChatRequestBody
+
+
+/**
+ * 缓存数据结构，用于存储每个分类的Agent列表
+ */
+data class AgentCacheData(
+    val items: List<AgentItem>,
+    val currentPage: Int,
+    val hasMoreData: Boolean
+)
+data class ChatRoom(
+    val id: Int,
+    val name: String,
+    val avatar: String = "",
+    val banner: String = "",
+    val memberCount: Int
+)
 
 object AgentViewModel: ViewModel() {
 
@@ -31,6 +62,11 @@ object AgentViewModel: ViewModel() {
     var errorMessage by mutableStateOf<String?>(null)
         private set
 
+    var chatRooms by mutableStateOf<List<ChatRoom>>(emptyList())
+        private set
+
+    var rooms by mutableStateOf<List<Room>>(emptyList())
+        private set
 
     var isRefreshing by mutableStateOf(false)
         private set
@@ -48,16 +84,37 @@ object AgentViewModel: ViewModel() {
     var hasMoreData by mutableStateOf(true)
         private set
 
+    var isJoiningRoom by mutableStateOf(false)
+        private set
+
     private val pageSize = 20
     private var currentCategoryId: Int? = null
     
+    // 缓存：使用分类ID作为key，null表示推荐列表
+    private val agentCache = mutableMapOf<Int?, AgentCacheData>()
+
     init {
         loadAgentData()
         loadCategories()
+        loadChatRooms()
     }
 
-    private fun loadAgentData(categoryId: Int? = null, page: Int = 1, isLoadMore: Boolean = false) {
+    private fun loadAgentData(categoryId: Int? = null, page: Int = 1, isLoadMore: Boolean = false, forceRefresh: Boolean = false) {
         viewModelScope.launch {
+            // 如果不是强制刷新且不是加载更多，检查缓存
+            if (!forceRefresh && !isLoadMore) {
+                val cached = agentCache[categoryId]
+                if (cached != null && cached.items.isNotEmpty()) {
+                    // 使用缓存数据
+                    agentItems = cached.items
+                    currentPage = cached.currentPage
+                    hasMoreData = cached.hasMoreData
+                    currentCategoryId = categoryId
+                    println("使用缓存数据，分类ID: $categoryId, 数据数量: ${cached.items.size}")
+                    return@launch
+                }
+            }
+            
             if (isLoadMore) {
                 isLoadingMore = true
             } else {
@@ -76,11 +133,18 @@ object AgentViewModel: ViewModel() {
                         page = page,
                         pageSize = pageSize,
                         withWorkflow = 1,
-                        categoryIds = listOf(categoryId)
+                        categoryIds = listOf(categoryId),
+                        random = 1
                     )
                 } else {
-                    // 获取所有智能体
+                    // 获取推荐智能体，使用random=1
-                    apiClient.getAgent(page = page, pageSize = pageSize, withWorkflow = 1)
+                    apiClient.getAgent(
+                        page = page,
+                        pageSize = pageSize,
+                        withWorkflow = 1,
+                        categoryIds = null,
+                        random = 1
+                    )
                 }
 
                 if (response.isSuccessful) {
@@ -103,6 +167,14 @@ object AgentViewModel: ViewModel() {
                     // 检查是否还有更多数据
                     hasMoreData = agents.size >= pageSize
                     
+                    // 更新缓存
+                    agentCache[categoryId] = AgentCacheData(
+                        items = agentItems,
+                        currentPage = currentPage,
+                        hasMoreData = hasMoreData
+                    )
+                    println("更新缓存，分类ID: $categoryId, 数据数量: ${agentItems.size}")
+                    
                 } else {
                     errorMessage = "获取Agent数据失败: ${response.code()}"
                 }
@@ -118,22 +190,70 @@ object AgentViewModel: ViewModel() {
         }
     }
 
-    private fun loadCategories() {
+    private fun loadChatRooms() {
         viewModelScope.launch {
             try {
-                val response = apiClient.getCategories(
+                val response = apiClient.getRooms(
+                    page = 1,
                     pageSize = 20,
-                    withChildren = false,
+                    isRecommended = 1,
-                    withParent = false,
+                    random = 1
-                    withCount = true,
-                    hideEmpty = true
                 )
-                println("分类数据请求完成，响应成功: ${response.isSuccessful}")
                 if (response.isSuccessful) {
-                    val categoryList = response.body()?.data?.list ?: emptyList()
+                    val allRooms = response.body()?.list ?: emptyList()
+                    val targetCount = (allRooms.size / 2) * 2
+                    rooms = allRooms.take(targetCount)
+
+                    // 转换为ChatRoom格式用于兼容现有UI
+                    chatRooms = rooms.map { room ->
+                        ChatRoom(
+                            id = room.id,
+                            name = room.name,
+                            avatar = room.avatar,
+                            banner = ConstVars.BASE_SERVER + "/api/v1/outside/" + room.recommendBanner + "?token=${AppStore.token}",
+                            memberCount = room.userCount
+                        )
+                    }
+                } else {
+
+                }
+            } catch (e: Exception) {
+                // 如果网络请求失败，使用默认数据
+
+            }
+        }
+    }
+
+    private fun loadCategories() {
+        viewModelScope.launch {
+            // 如果分类已经加载，不重复请求
+            if (categories.isNotEmpty()) {
+                println("使用已缓存的分类数据，数量: ${categories.size}")
+                return@launch
+            }
+            
+            try {
+                // 获取完整的语言标记（如 "zh-CN"）
+                val fullLangTag = com.aiosman.ravenow.utils.Utils.getPreferredLanguageTag()
+                // 转换为后端支持的语言代码（仅支持 zh、cn、ja）
+                val sysLang = convertToSupportedLangCode(fullLangTag)
+                val response = apiClient.getCategories(
+                    page = 1,
+                    pageSize = 100,
+                    isActive = true,
+//                    withChildren = false,
+//                    withParent = false,
+//                    withCount = true,
+//                    hideEmpty = true,
+                    lang = sysLang
+                )
+                println("分类数据请求完成，响应成功: ${response.isSuccessful}, 原始语言标记: $fullLangTag, 转换后: $sysLang")
+                if (response.isSuccessful) {
+                    val categoryList = response.body()?.list ?: emptyList()
                     println("获取到 ${categoryList.size} 个分类")
+                    // 使用转换后的语言代码获取翻译后的分类名称
                     categories = categoryList.map { category ->
-                        CategoryItem.fromCategoryTemplate(category)
+                        CategoryItem.fromCategoryTemplate(category, sysLang)
                     }
                     println("成功处理并映射了 ${categories.size} 个分类")
                 } else {
@@ -148,6 +268,24 @@ object AgentViewModel: ViewModel() {
         }
     }
 
+    /**
+     * 将完整的语言标记转换为后端支持的语言代码
+     * 后端仅支持: zh, cn, ja
+     * 
+     * @param langTag 完整的语言标记，如 "zh-CN", "zh-TW", "ja-JP", "en-US" 等
+     * @return 后端支持的语言代码，默认返回 "zh"
+     */
+    private fun convertToSupportedLangCode(langTag: String): String {
+        return when {
+            langTag.startsWith("zh", ignoreCase = true) -> "zh"
+            langTag.startsWith("ja", ignoreCase = true) -> "ja"
+            // 如果是中文相关的其他标记，也返回 zh
+            langTag.equals("cn", ignoreCase = true) -> "cn"
+            // 默认返回中文
+            else -> "zh"
+        }
+    }
+
     fun loadAgentsByCategory(categoryId: Int) {
         loadAgentData(categoryId)
     }
@@ -210,10 +348,12 @@ object AgentViewModel: ViewModel() {
     }
 
     /**
-     * 刷新推荐Agent数据
+     * 刷新当前分类的Agent数据（强制刷新，清除缓存）
      */
     fun refreshAgentData() {
-        loadAgentData()
+        // 清除当前分类的缓存
+        agentCache.remove(currentCategoryId)
+        loadAgentData(categoryId = currentCategoryId, forceRefresh = true)
     }
     
     /**
@@ -225,11 +365,87 @@ object AgentViewModel: ViewModel() {
         }
     }
 
+    /**
+     * 加入房间
+     */
+    fun joinRoom(
+        id: Int,
+        name: String,
+        avatar: String,
+        context: Context,
+        navController: NavHostController,
+        onSuccess: () -> Unit,
+        onError: (String) -> Unit
+    ) {
+        // 防止重复点击
+        if (isJoiningRoom) return
+
+        viewModelScope.launch {
+            try {
+                isJoiningRoom = true
+                val response = apiClient.joinRoom(JoinGroupChatRequestBody(roomId = id))
+                if (response.isSuccessful) {
+                    // 打开房间
+                    val openRoomResponse = apiClient.createGroupChatAi(
+                        roomId = id
+                    )
+
+                    if (openRoomResponse.isSuccessful){
+                        val respData = openRoomResponse.body()
+                        respData?.let {
+                            viewModelScope.launch {
+                                try {
+                                    // 群聊直接使用群ID进行导航
+                                    navController.navigateToGroupChat(
+                                        id = respData.data.trtcRoomId,
+                                        name = name,
+                                        avatar = avatar
+                                    )
+                                } catch (e: Exception) {
+                                    onError("加入房间失败")
+                                    e.printStackTrace()
+                                }
+                            }
+                        }
+                    }
+                    onSuccess()
+
+                } else {
+                    // 处理错误响应
+                    try {
+                        val errorBody = response.errorBody()?.string()
+                        if (errorBody != null) {
+                            val gson = Gson()
+                            val errorResponse = gson.fromJson(errorBody, ApiErrorResponse::class.java)
+
+                            // 在主线程显示 Toast
+                            Toast.makeText(context, errorResponse.error, Toast.LENGTH_LONG).show()
+                            onError(errorResponse.error)
+                        } else {
+                            Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
+                            onError("加入房间失败")
+                        }
+                    } catch (parseException: Exception) {
+                        // 如果解析错误响应失败，显示默认错误信息
+                        Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
+                        onError("加入房间失败")
+                    }
+                }
+            } catch (e: Exception) {
+                Toast.makeText(context, "网络请求失败：${e.message}", Toast.LENGTH_SHORT).show()
+                onError("网络请求失败：${e.message}")
+            } finally {
+                isJoiningRoom = false
+            }
+        }
+    }
+
     /**
      * 重置ViewModel状态，用于登出或切换账号时清理数据
      */
     fun ResetModel() {
         agentItems = emptyList()
+        categories = emptyList()
         errorMessage = null
         isRefreshing = false
         isLoading = false
@@ -237,6 +453,8 @@ object AgentViewModel: ViewModel() {
         currentPage = 1
         hasMoreData = true
         currentCategoryId = null
+        // 清空缓存
+        agentCache.clear()
     }
 
 }
@@ -248,11 +466,11 @@ data class CategoryItem(
     val promptCount: Int?
 ) {
     companion object {
-        fun fromCategoryTemplate(template: CategoryTemplate): CategoryItem {
+        fun fromCategoryTemplate(template: CategoryTemplate, lang: String): CategoryItem {
             return CategoryItem(
                 id = template.id,
-                name = template.name,
+                name = template.getLocalizedName(lang),
-                description = template.description,
+                description = template.getLocalizedDescription(lang),
                 avatar = "${ApiClient.BASE_API_URL}${template.avatar}",
                 promptCount = template.promptCount
             )

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

@@ -78,7 +78,7 @@ import com.aiosman.ravenow.ui.like.LikeNoticeViewModel
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.launch
-
+import com.aiosman.ravenow.ui.index.tabs.message.tab.AllChatListScreen
 
 /**
  * 消息列表界面
@@ -95,7 +95,7 @@ fun NotificationsScreen() {
     val navController = LocalNavController.current
     val systemUiController = rememberSystemUiController()
     val context = LocalContext.current
-    var pagerState = rememberPagerState (pageCount = { 3 })
+    var pagerState = rememberPagerState (pageCount = { 4 })
     var scope = rememberCoroutineScope()
     val state = rememberPullRefreshState(MessageListViewModel.isLoading, onRefresh = {
         MessageListViewModel.viewModelScope.launch {
@@ -177,7 +177,7 @@ fun NotificationsScreen() {
                                 modifier = Modifier
                                     .size(24.dp)
                                     .noRippleClickable {
-                                        // TODO: 实现通知功能
+                                        navController.navigate(NavigationRoute.NotificationScreen.route)
                                     },
                                 colorFilter = ColorFilter.tint(AppColors.text)
                             )
@@ -324,7 +324,7 @@ fun NotificationsScreen() {
 
                     Box {
                         TabItem(
-                            text = stringResource(R.string.chat_ai),
+                            text = stringResource(R.string.chat_all),
                             isSelected = pagerState.currentPage == 0,
                             onClick = {
                                 tabDebouncer {
@@ -335,6 +335,38 @@ fun NotificationsScreen() {
                             }
                         )
 
+                        // 全部未读消息红点
+                        val totalUnreadCount = AgentChatListViewModel.totalUnreadCount +
+                                GroupChatListViewModel.totalUnreadCount +
+                                FriendChatListViewModel.totalUnreadCount
+                        if (totalUnreadCount > 0) {
+                            Box(
+                                modifier = Modifier
+                                    .size(8.dp)
+                                    .background(
+                                        color = Color(0xFFFF3B30),
+                                        shape = CircleShape
+                                    )
+                                    .align(Alignment.TopEnd)
+                                    .offset(x = 8.dp, y = (-4).dp)
+                            )
+                        }
+                    }
+                    TabSpacer()
+
+                    Box {
+                        TabItem(
+                            text = stringResource(R.string.chat_ai),
+                            isSelected = pagerState.currentPage == 1,
+                            onClick = {
+                                tabDebouncer {
+                                    scope.launch {
+                                        pagerState.animateScrollToPage(1)
+                                    }
+                                }
+                            }
+                        )
+
                         // 智能体未读消息红点
                         if (AgentChatListViewModel.totalUnreadCount > 0) {
                             Box(
@@ -353,11 +385,11 @@ fun NotificationsScreen() {
                     Box {
                         TabItem(
                             text = stringResource(R.string.chat_group),
-                            isSelected = pagerState.currentPage == 1,
+                            isSelected = pagerState.currentPage == 2,
                             onClick = {
                                 tabDebouncer {
                                     scope.launch {
-                                        pagerState.animateScrollToPage(1)
+                                        pagerState.animateScrollToPage(2)
                                     }
                                 }
                             }
@@ -378,14 +410,15 @@ fun NotificationsScreen() {
                         }
                     }
                     TabSpacer()
+
                     Box {
                         TabItem(
                             text = stringResource(R.string.chat_friend),
-                            isSelected = pagerState.currentPage == 2,
+                            isSelected = pagerState.currentPage == 3,
                             onClick = {
                                 tabDebouncer {
                                     scope.launch {
-                                        pagerState.animateScrollToPage(2)
+                                        pagerState.animateScrollToPage(3)
                                     }
                                 }
                             }
@@ -414,14 +447,17 @@ fun NotificationsScreen() {
                 ) {
                     when (it) {
                         0 -> {
+                            AllChatListScreen()
+                        }
+                        1 -> {
                             AgentChatListScreen()
                         }
 
-                        1 -> {
+                        2 -> {
                             GroupChatListScreen()
                         }
 
-                        2 -> {
+                        3 -> {
                             FriendChatListScreen()
                         }
                     }

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

@@ -91,16 +91,19 @@ fun AgentChatListScreen() {
                     horizontalAlignment = Alignment.CenterHorizontally,
 
                 ) {
+                    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(context)
+
+                    if (isNetworkAvailable) {
                     Spacer(modifier = Modifier.height(39.dp))
                         Image(
                             painter = painterResource(
-                            id = if(AppState.darkMode) R.mipmap.qs_znt_qs_as_img
+                                id = if(AppState.darkMode) R.mipmap.juhao_dark
-                            else R.mipmap.qs_znt_qs_img),
+                                else R.mipmap.invalid_name_5),
                             contentDescription = "null data",
                             modifier = Modifier
-                            .size(181.dp)
+                                .size(width = 181.dp, height = 153.dp)
                         )
-                    Spacer(modifier = Modifier.height(24.dp))
+                        Spacer(modifier = Modifier.height(if (AppState.darkMode) 9.dp else 24.dp))
                         Text(
                             text = stringResource(R.string.agent_chat_empty_title),
                             color = AppColors.text,
@@ -114,6 +117,35 @@ fun AgentChatListScreen() {
                         fontSize = 14.sp
                     )
                 }
+                    else {
+                        Spacer(modifier = Modifier.height(39.dp))
+                        Image(
+                            painter = painterResource(id = R.mipmap.invalid_name_10),
+                            contentDescription = "network error",
+                            modifier = Modifier
+                                .size(181.dp)
+                        )
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_title),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_subtitle),
+                            color = AppColors.secondaryText,
+                            fontSize = 14.sp
+                        )
+                        Spacer(modifier = Modifier.height(16.dp))
+                        ReloadButton(
+                            onClick = {
+                                AgentChatListViewModel.refreshPager(context = context)
+                            }
+                        )
+                    }
+                }
             } else {
                 LazyColumn(
                     modifier = Modifier.fillMaxSize()

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

@@ -0,0 +1,390 @@
+package com.aiosman.ravenow.ui.index.tabs.message.tab
+
+import android.widget.Toast
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.AppState
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.composables.CustomAsyncImage
+import com.aiosman.ravenow.ui.composables.rememberDebouncer
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import com.aiosman.ravenow.utils.NetworkUtils
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.ui.text.font.FontFamily
+
+data class CombinedConversation(
+    val type: String, // "agent", "group", or "friend"
+    val agentConversation: AgentConversation? = null,
+    val groupConversation: GroupConversation? = null,
+    val friendConversation: FriendConversation? = null
+) {
+    val id: String
+        get() = when (type) {
+            "agent" -> "agent_${agentConversation?.id ?: 0}"
+            "group" -> "group_${groupConversation?.id ?: 0}"
+            "friend" -> "friend_${friendConversation?.id ?: 0}"
+            else -> ""
+        }
+
+    val avatar: String
+        get() = when (type) {
+            "agent" -> agentConversation?.avatar ?: ""
+            "group" -> groupConversation?.avatar ?: ""
+            "friend" -> friendConversation?.avatar ?: ""
+            else -> ""
+        }
+
+    val name: String
+        get() = when (type) {
+            "agent" -> agentConversation?.nickname ?: ""
+            "group" -> groupConversation?.groupName ?: ""
+            "friend" -> friendConversation?.nickname ?: ""
+            else -> ""
+        }
+
+    val lastMessageTime: String
+        get() = when (type) {
+            "agent" -> agentConversation?.lastMessageTime ?: ""
+            "group" -> groupConversation?.lastMessageTime ?: ""
+            "friend" -> friendConversation?.lastMessageTime ?: ""
+            else -> ""
+        }
+
+    val displayText: String
+        get() = when (type) {
+            "agent" -> agentConversation?.displayText ?: ""
+            "group" -> groupConversation?.displayText ?: ""
+            "friend" -> friendConversation?.displayText ?: ""
+            else -> ""
+        }
+
+    val unreadCount: Int
+        get() = when (type) {
+            "agent" -> agentConversation?.unreadCount ?: 0
+            "group" -> groupConversation?.unreadCount ?: 0
+            "friend" -> friendConversation?.unreadCount ?: 0
+            else -> 0
+        }
+
+    val isSelf: Boolean
+        get() = when (type) {
+            "agent" -> agentConversation?.isSelf ?: false
+            "group" -> groupConversation?.isSelf ?: false
+            "friend" -> friendConversation?.isSelf ?: false
+            else -> false
+        }
+}
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+fun AllChatListScreen() {
+    val context = LocalContext.current
+    val navController = LocalNavController.current
+    val AppColors = LocalAppTheme.current
+
+    var allConversations by remember { mutableStateOf<List<CombinedConversation>>(emptyList()) }
+    var refreshing by remember { mutableStateOf(false) }
+    var isLoading by remember { mutableStateOf(false) }
+    var error by remember { mutableStateOf<String?>(null) }
+
+    val state = rememberPullRefreshState(
+        refreshing = refreshing,
+        onRefresh = {
+            refreshing = true
+            refreshAllData(context,
+                onSuccess = { conversations ->
+                    allConversations = conversations
+                    refreshing = false
+                },
+                onError = { errorMsg ->
+                    error = errorMsg
+                    refreshing = false
+                }
+            )
+        }
+    )
+
+    LaunchedEffect(Unit) {
+        isLoading = true
+        refreshAllData(context,
+            onSuccess = { conversations ->
+                allConversations = conversations
+                isLoading = false
+            },
+            onError = { errorMsg ->
+                error = errorMsg
+                isLoading = false
+            }
+        )
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(AppColors.background)
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .pullRefresh(state)
+        ) {
+            if (allConversations.isEmpty() && !isLoading) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(16.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(context)
+
+                    if (isNetworkAvailable) {
+                        Spacer(modifier = Modifier.height(39.dp))
+                        Image(
+                            painter = painterResource(
+                                id = if(AppState.darkMode) R.mipmap.piao_dark
+                                else R.mipmap.invalid_name_2),
+                            contentDescription = "null data",
+                            modifier = Modifier
+                                .size(width = 181.dp, height = 153.dp)
+                        )
+                        Spacer(modifier = Modifier.height(if (AppState.darkMode) 9.dp else 24.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_empty_title),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_empty_subtitle),
+                            color = AppColors.secondaryText,
+                            fontSize = 14.sp
+                        )
+                    } else {
+                        Spacer(modifier = Modifier.height(39.dp))
+                        Image(
+                            painter = painterResource(id = R.mipmap.invalid_name_10),
+                            contentDescription = "network error",
+                            modifier = Modifier
+                                .size(181.dp)
+                        )
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_title),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_subtitle),
+                            color = AppColors.secondaryText,
+                            fontSize = 14.sp
+                        )
+                        Spacer(modifier = Modifier.height(16.dp))
+                        ReloadButton(
+                            onClick = {
+                                isLoading = true
+                                refreshAllData(context,
+                                    onSuccess = { conversations ->
+                                        allConversations = conversations
+                                        isLoading = false
+                                    },
+                                    onError = { errorMsg ->
+                                        error = errorMsg
+                                        isLoading = false
+                                    }
+                                )
+                            }
+                        )
+                    }
+                }
+            } else {
+                LazyColumn(
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    itemsIndexed(
+                        items = allConversations,
+                        key = { _, item -> item.id }
+                    ) { index, item ->
+                        when (item.type) {
+                            "agent" -> {
+                                item.agentConversation?.let { agent ->
+                                    AgentChatItem(
+                                        conversation = agent,
+                                        onUserAvatarClick = { conv ->
+                                            AgentChatListViewModel.goToUserDetail(conv, navController)
+                                        },
+                                        onChatClick = { conv ->
+                                            if (NetworkUtils.isNetworkAvailable(context)) {
+                                                AgentChatListViewModel.createSingleChat(conv.trtcUserId)
+                                                AgentChatListViewModel.goToChatAi(conv.trtcUserId, navController)
+                                            } else {
+                                                Toast.makeText(context, "网络连接异常，请检查网络设置", Toast.LENGTH_SHORT).show()
+                                            }
+                                        }
+                                    )
+                                }
+                            }
+                            "group" -> {
+                                item.groupConversation?.let { group ->
+                                    GroupChatItem(
+                                        conversation = group,
+                                        onGroupAvatarClick = { conv ->
+                                            GroupChatListViewModel.goToGroupDetail(conv, navController)
+                                        },
+                                        onChatClick = { conv ->
+                                            if (NetworkUtils.isNetworkAvailable(context)) {
+                                                GroupChatListViewModel.goToChat(conv, navController)
+                                            } else {
+                                                Toast.makeText(context, "网络连接异常，请检查网络设置", Toast.LENGTH_SHORT).show()
+                                            }
+                                        }
+                                    )
+                                }
+                            }
+                            "friend" -> {
+                                item.friendConversation?.let { friend ->
+                                    FriendChatItem(
+                                        conversation = friend,
+                                        onUserAvatarClick = { conv ->
+                                            FriendChatListViewModel.goToUserDetail(conv, navController)
+                                        },
+                                        onChatClick = { conv ->
+                                            if (NetworkUtils.isNetworkAvailable(context)) {
+                                                FriendChatListViewModel.goToChat(conv, navController)
+                                            } else {
+                                                Toast.makeText(context, "网络连接异常，请检查网络设置", Toast.LENGTH_SHORT).show()
+                                            }
+                                        }
+                                    )
+                                }
+                            }
+                        }
+
+                        // 分隔线
+//                        if (index < allConversations.size - 1) {
+//                            HorizontalDivider(
+//                                modifier = Modifier.padding(horizontal = 24.dp),
+//                                color = AppColors.divider
+//                            )
+//                        }
+                    }
+
+                    if (isLoading && allConversations.isNotEmpty()) {
+                        item {
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(16.dp),
+                                contentAlignment = Alignment.Center
+                            ) {
+                                CircularProgressIndicator(
+                                    modifier = Modifier.size(24.dp),
+                                    color = AppColors.main
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            PullRefreshIndicator(
+                refreshing = refreshing,
+                state = state,
+                modifier = Modifier.align(Alignment.TopCenter)
+            )
+        }
+
+        error?.let { errorMsg ->
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                contentAlignment = Alignment.Center
+            ) {
+                Text(
+                    text = errorMsg,
+                    color = AppColors.error,
+                    fontSize = 14.sp
+                )
+            }
+        }
+    }
+}
+
+fun refreshAllData(
+    context: android.content.Context,
+    onSuccess: (List<CombinedConversation>) -> Unit,
+    onError: (String) -> Unit
+) {
+    try {
+        // 同时刷新所有类型的数据
+        AgentChatListViewModel.refreshPager(context = context)
+        GroupChatListViewModel.refreshPager(context = context)
+        FriendChatListViewModel.refreshPager(context = context)
+
+        val combinedList = mutableListOf<CombinedConversation>()
+
+        AgentChatListViewModel.agentChatList.forEach { agent ->
+            combinedList.add(CombinedConversation(type = "agent", agentConversation = agent))
+        }
+
+        GroupChatListViewModel.groupChatList.forEach { group ->
+            combinedList.add(CombinedConversation(type = "group", groupConversation = group))
+        }
+
+        FriendChatListViewModel.friendChatList.forEach { friend ->
+            val isDuplicate = combinedList.any {//判断重复
+                it.type == "agent" && it.agentConversation?.trtcUserId == friend.trtcUserId
+            }
+
+            if (!isDuplicate) {
+                combinedList.add(CombinedConversation(type = "friend", friendConversation = friend))
+            }
+        }
+
+        // 按最后消息时间排序
+        val sortedList = combinedList.sortedByDescending {
+            it.lastMessageTime
+        }
+
+        onSuccess(sortedList)
+    } catch (e: Exception) {
+        onError("刷新数据失败: ${e.message}")
+    }
+}

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

@@ -33,8 +33,14 @@ import com.aiosman.ravenow.LocalNavController
 import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
+import com.aiosman.ravenow.ui.index.tabs.search.ReloadButton
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.utils.NetworkUtils
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.foundation.layout.PaddingValues
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -73,17 +79,19 @@ fun FriendChatListScreen() {
                     horizontalAlignment = Alignment.CenterHorizontally,
                     //verticalArrangement = Arrangement.Center
                 ) {
+                    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(context)
 
+                    if (isNetworkAvailable) {
                     Spacer(modifier = Modifier.height(39.dp))
                         Image(
                             painter = painterResource(
-                            id = if(AppState.darkMode) R.mipmap.qs_py_qs_as_img
+                                id = if(AppState.darkMode) R.mipmap.piao_dark
-                            else R.mipmap.qs_py_qs_img),
+                                else R.mipmap.invalid_name_2),
                             contentDescription = "null data",
                             modifier = Modifier
-                            .size(181.dp)
+                                .size(width = 181.dp, height = 153.dp)
                         )
-                    Spacer(modifier = Modifier.height(24.dp))
+                        Spacer(modifier = Modifier.height(if (AppState.darkMode) 9.dp else 24.dp))
                         Text(
                             text = stringResource(R.string.friend_chat_empty_title),
                             color = AppColors.text,
@@ -96,6 +104,34 @@ fun FriendChatListScreen() {
                         color = AppColors.secondaryText,
                         fontSize = 14.sp
                     )
+                }else {
+                        Spacer(modifier = Modifier.height(39.dp))
+                        Image(
+                            painter = painterResource(id = R.mipmap.invalid_name_10),
+                            contentDescription = "network error",
+                            modifier = Modifier
+                                .size(181.dp)
+                        )
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_title),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_subtitle),
+                            color = AppColors.secondaryText,
+                            fontSize = 14.sp
+                        )
+                        Spacer(modifier = Modifier.height(16.dp))
+                        ReloadButton(
+                            onClick = {
+                                FriendChatListViewModel.refreshPager(pullRefresh = true, context = context)
+                            }
+                        )
+                    }
                 }
             } else {
                 LazyColumn(
@@ -266,4 +302,43 @@ fun FriendChatItem(
         }
     }
 }
+@Composable
+fun ReloadButton(
+    onClick: () -> Unit
+) {
+    val gradientBrush = Brush.linearGradient(
+        colors = listOf(
+            Color(0xFF7c45ed),
+            Color(0xFF7c68ef),
+            Color(0xFF7bd8f8)
+        )
+    )
 
+    Button(
+        onClick = onClick,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 120.dp)
+            .height(48.dp),
+        shape = RoundedCornerShape(30.dp),
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = Color.Transparent
+        ),
+        contentPadding = PaddingValues(0.dp)
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(gradientBrush),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text =  stringResource(R.string.Reload),
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Bold,
+                color = Color.White,
+                textAlign = TextAlign.Center
+            )
+        }
+    }
+}

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

@@ -71,16 +71,19 @@ fun GroupChatListScreen() {
                         .padding(16.dp),
                     horizontalAlignment = Alignment.CenterHorizontally,
                 ) {
+                    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(context)
+
+                    if (isNetworkAvailable) {
                     Spacer(modifier = Modifier.height(39.dp))
                         Image(
                             painter = painterResource(
-                            id = if(AppState.darkMode) R.mipmap.qs_ql_qs_as_img
+                                id = if(AppState.darkMode) R.mipmap.fei_dark
-                            else R.mipmap.qs_ql_qs_img),
+                                else R.mipmap.invalid_name_12),
                             contentDescription = "null data",
                             modifier = Modifier
-                            .size(181.dp)
+                                .size(width = 181.dp, height = 153.dp)
                         )
-                    Spacer(modifier = Modifier.height(24.dp))
+                        Spacer(modifier = Modifier.height(if (AppState.darkMode) 9.dp else 24.dp))
                         Text(
                             text = stringResource(R.string.group_chat_empty),
                             color = AppColors.text,
@@ -93,6 +96,34 @@ fun GroupChatListScreen() {
                         color = AppColors.secondaryText,
                         fontSize = 14.sp
                     )
+                }else {
+                        Spacer(modifier = Modifier.height(39.dp))
+                        Image(
+                            painter = painterResource(id = R.mipmap.invalid_name_10),
+                            contentDescription = "network error",
+                            modifier = Modifier
+                                .size(181.dp)
+                        )
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_title),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600
+                        )
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_subtitle),
+                            color = AppColors.secondaryText,
+                            fontSize = 14.sp
+                        )
+                        Spacer(modifier = Modifier.height(16.dp))
+                        ReloadButton(
+                            onClick = {
+                                GroupChatListViewModel.refreshPager(context = context)
+                            }
+                        )
+                    }
                 }
             } else {
                 LazyColumn(

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

@@ -2,6 +2,7 @@ package com.aiosman.ravenow.ui.index.tabs.message.tab
 
 import android.content.Context
 import android.icu.util.Calendar
+import android.util.Log
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -167,10 +168,12 @@ object GroupChatListViewModel : ViewModel() {
     }
 
     fun createGroupChat(
-        trtcGroupId: String,
+        trtcGroupId: String? = null,
+        roomId: Int? = null
     ) {
         viewModelScope.launch {
-            val response = ApiClient.api.createGroupChatAi(trtcGroupId = trtcGroupId)
+            val response = ApiClient.api.createGroupChatAi(trtcGroupId = trtcGroupId,roomId = roomId)
+            Log.d("debug",response.toString())
         }
 
     }

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

@@ -17,6 +17,7 @@ import com.aiosman.ravenow.event.MomentAddEvent
 import com.aiosman.ravenow.event.MomentFavouriteChangeEvent
 import com.aiosman.ravenow.event.MomentLikeChangeEvent
 import com.aiosman.ravenow.event.MomentRemoveEvent
+import com.aiosman.ravenow.ui.follower.FollowerNoticeViewModel
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -72,9 +73,12 @@ open class BaseMomentModel :ViewModel(){
     }
 
 
-    suspend fun onAddComment(id: Int) {
+    fun onAddComment(id: Int) {
-//        val currentPagingData = _momentsFlow.value
+        momentLoader.updateCommentCount(id, +1)
-//        updateCommentCount(id)
+    }
+
+    fun onDeleteComment(id: Int) {
+        momentLoader.updateCommentCount(id, -1)
     }
 
 
@@ -83,6 +87,7 @@ open class BaseMomentModel :ViewModel(){
     fun onMomentFavoriteChangeEvent(event: MomentFavouriteChangeEvent) {
         momentLoader.updateFavoriteCount(event.postId, event.isFavourite)
     }
+
     suspend fun favoriteMoment(id: Int) {
         momentService.favoriteMoment(id)
         momentLoader.updateFavoriteCount(id, true)
@@ -118,8 +123,9 @@ open class BaseMomentModel :ViewModel(){
                     userService.unFollowUser(moment.authorId.toString())
                     EventBus.getDefault().post(FollowChangeEvent(moment.authorId, false))
                 } else {
-                    userService.followUser(moment.authorId.toString())
+                    // 调用 FollowerNoticeViewModel.followUser() 实现与 FollowerNotice.kt 相同的效果
-                    EventBus.getDefault().post(FollowChangeEvent(moment.authorId, true))
+                    // 该方法内部会调用 userService.followUser() 并发布 FollowChangeEvent 事件
+                    FollowerNoticeViewModel.followUser(moment.authorId)
                 }
             }  catch (e: Exception) {
                 e.printStackTrace()

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

@@ -3,6 +3,7 @@ package com.aiosman.ravenow.ui.index.tabs.moment
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -20,6 +21,7 @@ import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
@@ -45,6 +47,7 @@ import com.aiosman.ravenow.ui.index.tabs.moment.tabs.dynamic.Dynamic
 import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.Explore
 import com.aiosman.ravenow.ui.index.tabs.moment.tabs.hot.HotMomentsList
 import com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline.TimelineMomentsList
+import com.aiosman.ravenow.ui.index.tabs.moment.tabs.news.NewsScreen
 import com.aiosman.ravenow.ui.index.tabs.search.SearchViewModel
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import kotlinx.coroutines.launch
@@ -54,7 +57,7 @@ import androidx.compose.runtime.remember
 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.UnderlineTabItem
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
 
 /**
@@ -68,8 +71,8 @@ fun MomentsList() {
     val navigationBarPaddings =
         WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() + 48.dp
     val statusBarPaddingValues = WindowInsets.systemBars.asPaddingValues()
-    // 游客模式下不显示timeline，只显示2个tab：Dynamic、Hot    // 游客模式下不显示timeline，只显示3个tab：Explore、Dynamic、Hot
+    // 现在有6个tab：推荐、短视频、新闻、探索、关注、热门
-    val tabCount = if (AppStore.isGuest) 2 else 3        // val tabCount = if (AppStore.isGuest) 3 else 4
+    val tabCount = 6
     var pagerState = rememberPagerState { tabCount }
     var scope = rememberCoroutineScope()
     Column(
@@ -81,60 +84,127 @@ fun MomentsList() {
             ),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
+        // 顶部区域：可滚动的标签页 + 搜索按钮
         Row(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(44.dp)
                 .padding(horizontal = 16.dp),
-            // center the tabs
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            // 可滚动的标签页行
+            Row(
+                modifier = Modifier
+                    .weight(1f)
+                    .horizontalScroll(rememberScrollState()),
                 horizontalArrangement = Arrangement.Start,
                 verticalAlignment = Alignment.CenterVertically
             ) {
-            //原探索//
+                val tabDebouncer = rememberDebouncer()
-//            Column(
+                
-//                modifier = Modifier
+                // 推荐标签
-//                    .noRippleClickable {
+                UnderlineTabItem(
-//                        scope.launch {
+                    text = stringResource(R.string.tab_recommend),
-//                            pagerState.animateScrollToPage(0)
+                    isSelected = pagerState.currentPage == 0,
-//                        }
+                    onClick = {
-//                    }.padding(start = 16.dp),
+                        tabDebouncer {
-//                verticalArrangement = Arrangement.Center,
+                            scope.launch {
-//                horizontalAlignment = Alignment.CenterHorizontally
+                                pagerState.animateScrollToPage(0)
-//
+                            }
-//            ) {
+                        }
-//                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))
-            val lastClickTime = remember { mutableStateOf(0L) }
-            val clickDelay = 500L
-            Text(
-                text = stringResource(R.string.moment),
-                fontSize = 20.sp,
-                fontWeight = FontWeight.W900,
-                color = AppColors.text,
-                modifier = Modifier
-                    .align(Alignment.CenterVertically)
                 )
 
-            Spacer(modifier = Modifier.weight(1f))
                 
+                // 短视频标签
+                UnderlineTabItem(
+                    text = stringResource(R.string.tab_short_video),
+                    isSelected = pagerState.currentPage == 1,
+                    onClick = {
+                        tabDebouncer {
+                            scope.launch {
+                                pagerState.animateScrollToPage(1)
+                            }
+                        }
+                    }
+                )
+
+                
+                // 动态标签
+                UnderlineTabItem(
+                    text = stringResource(R.string.moment),
+                    isSelected = pagerState.currentPage == 2,
+                    onClick = {
+                        tabDebouncer {
+                            scope.launch {
+                                pagerState.animateScrollToPage(2)
+                            }
+                        }
+                    }
+                )
+
+                
+                // 只有非游客用户才显示"关注"tab
+                if (!AppStore.isGuest) {
+                    UnderlineTabItem(
+                        text = stringResource(R.string.index_following),
+                        isSelected = pagerState.currentPage == 3,
+                        onClick = {
+                            tabDebouncer {
+                                scope.launch {
+                                    pagerState.animateScrollToPage(3)
+                                }
+                            }
+                        }
+                    )
+
+                    
+                    // 热门标签
+                    UnderlineTabItem(
+                        text = stringResource(R.string.index_hot),
+                        isSelected = pagerState.currentPage == 4,
+                        onClick = {
+                            tabDebouncer {
+                                scope.launch {
+                                    pagerState.animateScrollToPage(4)
+                                }
+                            }
+                        }
+                    )
+                } else {
+                    // 热门标签 (游客模式)
+                    UnderlineTabItem(
+                        text = stringResource(R.string.index_hot),
+                        isSelected = pagerState.currentPage == 4,
+                        onClick = {
+                            tabDebouncer {
+                                scope.launch {
+                                    pagerState.animateScrollToPage(4)
+                                }
+                            }
+                        }
+                    )
+                }
+
+
+                // 新闻标签
+                UnderlineTabItem(
+                    text = stringResource(R.string.tab_news),
+                    isSelected = pagerState.currentPage == 5,
+                    onClick = {
+                        tabDebouncer {
+                            scope.launch {
+                                pagerState.animateScrollToPage(5)
+                            }
+                        }
+                    }
+                )
+            }
+            
+            // 搜索按钮
+            val lastClickTime = remember { mutableStateOf(0L) }
+            val clickDelay = 500L
             Image(
                 painter = painterResource(id = R.drawable.rider_pro_nav_search),
                 contentDescription = "search",
@@ -151,113 +221,39 @@ fun MomentsList() {
             )
         }
 
-        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) {
-                Box {
-                    CustomTabItem(
-                        text = stringResource(R.string.index_following),
-                        isSelected = pagerState.currentPage == 1,
-                        onClick = {
-                            tabDebouncer {
-                                scope.launch {
-                                    pagerState.animateScrollToPage(1)
-                                }
-                            }
-                        }
-                    )
-                }
-
-                TabSpacer()
-
-                // 热门标签
-                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)
-                                }
-                            }
-                        }
-                    )
-                }
-            }
-        }
-
         HorizontalPager(
             state = pagerState,
             modifier = Modifier
                 .fillMaxWidth()
                 .weight(1f)
         ) {
-            if (AppStore.isGuest) {
-                // 游客模式：Dynamic(0), Hot(1)
             when (it) {
                 0 -> {
-                        Dynamic()
+                    // 推荐页面
+                    NewsScreen()
                 }
                 1 -> {
-                        HotMomentsList()
+                    // 短视频页面
-                    }
-                }
-            } else {
-                // 正常用户：Dynamic(0), Timeline(1), Hot(2)
-                when (it) {
-                    0 -> {
-                        Dynamic()
-                    }
-                    1 -> {
-                        TimelineMomentsList()
                 }
                 2 -> {
+                    // 动态页面 - 暂时显示时间线内容
+                    Dynamic()
+                }
+                3 -> {
+                    // 关注页面 (仅非游客用户) 或 热门页面 (游客用户)
+                    if (AppStore.isGuest) {
+                        HotMomentsList()
+                    } else {
+                        TimelineMomentsList()
+                    }
+                }
+                4 -> {
+                    // 热门页面 (仅非游客用户)
                     HotMomentsList()
                 }
+                5 -> {
+                    // 新闻页面
+                    NewsScreen()
                 }
             }
         }

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

@@ -168,6 +168,7 @@ fun Dynamic() {
                     )
                 }
             }
+            PullRefreshIndicator(model.refreshing, state, Modifier.align(Alignment.TopCenter))
         }
     }
 }

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

@@ -369,6 +369,7 @@ fun Explore() {
                             trtcId = roomItem.trtcId.toString(),
                             name = roomItem.title,
                             avatar = roomItem.avatar,
+                            context = context,
                             navController = navController,
                             onSuccess = {
                                 Toast.makeText(context, enterSuccessText, Toast.LENGTH_SHORT).show()
@@ -523,7 +524,7 @@ fun Explore() {
                     Row(
                         verticalAlignment = Alignment.CenterVertically
                     ) {
-                        /* Image(
+                        Image(
                              painter = painterResource(R.drawable.rider_pro_nav_profile),
                              contentDescription = "chat",
                              modifier = Modifier.size(16.dp),
@@ -535,7 +536,7 @@ fun Explore() {
                              fontSize = 12.sp,
                              color = Color.White,
                              fontWeight = androidx.compose.ui.text.font.FontWeight.W500
-                         )*/
+                         )
                     }
 
                     // 底部：标题和描述
@@ -636,6 +637,7 @@ fun Explore() {
                                                     trtcId = bannerItem.trtcId.toString(),
                                                     name = bannerItem.title,
                                                     avatar = bannerItem.avatar,
+                                                    context = context,
                                                     navController = navController,
                                                     onSuccess = {
                                                         Toast.makeText(context, enterSuccessText, Toast.LENGTH_SHORT).show()

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

@@ -17,6 +17,10 @@ import com.aiosman.ravenow.ui.index.tabs.message.MessageListViewModel.userServic
 import com.aiosman.ravenow.ui.index.tabs.message.tab.GroupChatListViewModel
 import com.aiosman.ravenow.ui.index.tabs.message.tab.GroupChatListViewModel.createGroupChat
 import com.aiosman.ravenow.ui.navigateToGroupChat
+import com.aiosman.ravenow.data.api.ApiErrorResponse
+import com.google.gson.Gson
+import android.content.Context
+import android.widget.Toast
 import kotlinx.coroutines.launch
 
 class ExploreViewModel : ViewModel() {
@@ -130,21 +134,24 @@ class ExploreViewModel : ViewModel() {
             }
         }
     }
+
     fun createSingleChat(
         openId: String,
     ) {
         viewModelScope.launch {
-            val response = ApiClient.api.createSingleChat(SingleChatRequestBody(agentOpenId = openId))
+            val response =
+                ApiClient.api.createSingleChat(SingleChatRequestBody(agentOpenId = openId))
         }
 
     }
+
     fun goToChatAi(
         openId: String,
         navController: NavHostController
     ) {
         viewModelScope.launch {
             val profile = userService.getUserProfileByOpenId(openId)
-            createGroup2ChatAi(profile.trtcUserId,"ai_group",navController,profile.id)
+            createGroup2ChatAi(profile.trtcUserId, "ai_group", navController, profile.id)
         }
     }
 
@@ -152,6 +159,7 @@ class ExploreViewModel : ViewModel() {
         trtcId: String,
         name: String,
         avatar: String,
+        context: Context,
         navController: NavHostController,
         onSuccess: () -> Unit,
         onError: (String) -> Unit
@@ -164,9 +172,11 @@ class ExploreViewModel : ViewModel() {
                         try {
                             createGroupChat(trtcGroupId = trtcId)
                             // 群聊直接使用群ID进行导航
-                                navController.navigateToGroupChat( id = trtcId,
+                            navController.navigateToGroupChat(
+                                id = trtcId,
                                 name = name,
-                                    avatar = avatar)
+                                avatar = avatar
+                            )
                         } catch (e: Exception) {
                             onError("加入房间失败")
                             e.printStackTrace()
@@ -175,9 +185,28 @@ class ExploreViewModel : ViewModel() {
                     onSuccess()
 
                 } else {
+                    // 处理错误响应
+                    try {
+                        val errorBody = response.errorBody()?.string()
+                        if (errorBody != null) {
+                            val gson = Gson()
+                            val errorResponse = gson.fromJson(errorBody, ApiErrorResponse::class.java)
+
+                            // 在主线程显示 Toast
+                            Toast.makeText(context, errorResponse.error, Toast.LENGTH_LONG).show()
+                            onError(errorResponse.error)
+                        } else {
+                            Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
                             onError("加入房间失败")
                         }
+                    } catch (parseException: Exception) {
+                        // 如果解析错误响应失败，显示默认错误信息
+                        Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
+                        onError("加入房间失败")
+                    }
+                }
             } catch (e: Exception) {
+                Toast.makeText(context, "网络请求失败：${e.message}", Toast.LENGTH_SHORT).show()
                 onError("网络请求失败：${e.message}")
             }
         }

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.aspectRatio
@@ -13,11 +14,12 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
-import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.staggeredgrid.items
-import androidx.compose.foundation.lazy.grid.rememberLazyGridState
+import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
@@ -39,6 +41,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.runtime.collectAsState
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.LocalNavController
@@ -104,8 +107,8 @@ fun DiscoverView() {
     val isLoading by model.isLoading.collectAsState()
     val context = LocalContext.current
     val navController = LocalNavController.current
-    val gridState = rememberLazyGridState()
+    val gridState = rememberLazyStaggeredGridState()
-    
+    val AppColors = LocalAppTheme.current
     // 监听滚动到底部，自动加载更多
     LaunchedEffect(gridState, moments.size) {
         snapshotFlow {
@@ -124,18 +127,40 @@ fun DiscoverView() {
         }
     }
     
-    LazyVerticalGrid(
+    LazyVerticalStaggeredGrid(
-        columns = GridCells.Fixed(3),
+        columns =  StaggeredGridCells.Fixed(2),
         state = gridState,
         modifier = Modifier.fillMaxSize().padding(bottom = 8.dp),
-//        contentPadding = PaddingValues(8.dp)
+        contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 8.dp, vertical = 4.dp)
     ) {
         items(moments) { momentItem ->
             val debouncer = rememberDebouncer()
+
+            val textContent = momentItem.momentTextContent
+            val textLines = if (textContent.isNotEmpty()) {
+                val estimatedCharsPerLine = 20
+                val estimatedLines = (textContent.length / estimatedCharsPerLine) + 1
+                minOf(estimatedLines, 2) // 最多2行
+            } else {
+                0
+            }
+
+            val baseHeight = 200.dp
+            val singleLineTextHeight = 20.dp
+            val doubleLineTextHeight = 40.dp
+            val authorInfoHeight = 25.dp
+            val paddingHeight = 10.dp
+            val paddingHeight2 =3.dp
+            val totalHeight = baseHeight + when (textLines) {
+                0 -> authorInfoHeight + paddingHeight
+                1 -> singleLineTextHeight + authorInfoHeight + paddingHeight
+                else -> doubleLineTextHeight + authorInfoHeight +paddingHeight2
+            }
+            
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .aspectRatio(1f)
+                    .height(totalHeight)
                     .padding(2.dp)
                     .noRippleClickable {
                         debouncer {
@@ -146,15 +171,69 @@ fun DiscoverView() {
                             )
                         }
                     }
+            ) {
+                Column(
+                    modifier = Modifier.fillMaxSize().background(AppColors.secondaryBackground, RoundedCornerShape(12.dp))
                 ) {
                     CustomAsyncImage(
                         imageUrl = momentItem.images[0].thumbnail,
                         contentDescription = "",
                         modifier = Modifier
-                        .fillMaxSize(),
+                            .fillMaxWidth()
+                            .height(baseHeight)
+                            .clip(RoundedCornerShape(
+                                topStart = 12.dp,
+                                topEnd = 12.dp,
+                                bottomStart = 0.dp,
+                                bottomEnd = 0.dp)),
                         context = context,
                         showShimmer = true
                     )
+
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(totalHeight - baseHeight)
+                            .padding(horizontal = 8.dp, vertical = 8.dp)
+                    ) {
+                        if (momentItem.momentTextContent.isNotEmpty()) {
+                            androidx.compose.material3.Text(
+                                text = momentItem.momentTextContent,
+                                modifier = Modifier.fillMaxWidth(),
+                                fontSize = 12.sp,
+                                color = AppColors.text,
+                                maxLines = 2,
+                                overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+                            )
+                        }
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(top = 5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            CustomAsyncImage(
+                                imageUrl = momentItem.avatar,
+                                contentDescription = "",
+                                modifier = Modifier
+                                    .size(16.dp)
+                                    .clip(RoundedCornerShape(8.dp)),
+                                context = context,
+                                showShimmer = true
+                            )
+
+                            androidx.compose.material3.Text(
+                                text = momentItem.nickname,
+                                modifier = Modifier.padding(start = 4.dp),
+                                fontSize = 11.sp,
+                                color = AppColors.text.copy(alpha = 0.6f),
+                                maxLines = 1,
+                                overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+                            )
+                        }
+                    }
+                }
                 if (momentItem.images.size > 1) {
                     Box(
                         modifier = Modifier

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

@@ -0,0 +1,205 @@
+package com.aiosman.ravenow.ui.index.tabs.moment.tabs.news
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+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.layout.ContentScale
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.entity.MomentEntity
+import com.aiosman.ravenow.exp.formatPostTime2
+import com.aiosman.ravenow.ui.composables.CustomAsyncImage
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun FullArticleModal(
+    moment: MomentEntity,
+    onDismiss: () -> Unit
+) {
+    val appColors = LocalAppTheme.current
+    val context = LocalContext.current
+    val configuration = LocalConfiguration.current
+    val screenHeight = configuration.screenHeightDp.dp
+    val sheetHeight = screenHeight * 0.9f // 90% 高度
+    
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = rememberModalBottomSheetState(
+            skipPartiallyExpanded = true
+        ),
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(sheetHeight),
+        containerColor = appColors.background,
+        shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
+        windowInsets = androidx.compose.foundation.layout.WindowInsets(0)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+        ) {
+            // 滚动内容
+            Column(
+                modifier = Modifier
+                    .weight(1f)
+                    .verticalScroll(rememberScrollState())
+            ) {
+                // 新闻图片区域 - 固定高度和宽度
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(250.dp)
+
+                        .background(color = appColors.secondaryBackground)
+                ) {
+                    if (moment.images.isNotEmpty()) {
+                        val firstImage = moment.images[0]
+                        CustomAsyncImage(
+                            context = context,
+                            imageUrl = firstImage.url,
+                            contentDescription = "新闻图片",
+                            contentScale = ContentScale.Fit,
+                            blurHash = firstImage.blurHash,
+                            modifier = Modifier.fillMaxSize()
+                        )
+                    } else {
+                        Image(
+                            painter = androidx.compose.ui.res.painterResource(id = R.drawable.default_moment_img),
+                            contentDescription = "默认图片",
+                            contentScale = ContentScale.Fit,
+                            modifier = Modifier.fillMaxSize()
+                        )
+                    }
+                }
+                
+                Spacer(modifier = Modifier.height(16.dp))
+                
+                // 新闻标题
+                Text(
+                    text = if (moment.newsTitle.isNotEmpty()) moment.newsTitle else moment.nickname,
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = appColors.text,
+                    lineHeight = 28.sp,
+                    modifier = Modifier.padding(horizontal = 10.dp)
+                )
+                
+                Spacer(modifier = Modifier.height(12.dp))
+                
+                // 新闻来源和发布时间
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 10.dp),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    // 来源按钮
+                    Button(
+                        onClick = {  },
+                        modifier = Modifier.height(28.dp),
+                        colors = ButtonDefaults.buttonColors(
+                            containerColor = Color(0xFF7c68ef)
+                        ),
+                        contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 12.dp, vertical = 4.dp),
+                        shape = RoundedCornerShape(14.dp)
+                    ) {
+                        Text(
+                            text = if (moment.newsSource.isNotEmpty()) moment.newsSource else moment.nickname,
+                            fontSize = 12.sp,
+                            color = Color.White,
+                        )
+                    }
+                    
+                    // 发布时间
+                    Text(
+                        text = moment.time.formatPostTime2(),
+                        fontSize = 12.sp,
+                        color = appColors.secondaryText
+                    )
+                }
+                
+                Spacer(modifier = Modifier.height(16.dp))
+                
+                // 帖子内容
+                NewsContent(
+                    content = if (moment.newsContent.isNotEmpty()) moment.newsContent else moment.momentTextContent,
+                    images = moment.images,
+                    context = context
+                )
+				Spacer(modifier = Modifier.height(200.dp))
+            }
+        }
+    }
+}
+
+@Composable
+private fun NewsContent(
+    content: String,
+    images: List<com.aiosman.ravenow.entity.MomentImageEntity>,
+    context: android.content.Context
+) {
+    val appColors = LocalAppTheme.current
+    
+    Column(
+        modifier = Modifier.padding(horizontal = 16.dp)
+    ) {
+        Text(
+            text = content,
+            fontSize = 16.sp,
+            color = appColors.text,
+            lineHeight = 24.sp
+        )
+        
+        // 图片内容
+        if (images.isNotEmpty()) {
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            images.forEach { image ->
+                Spacer(modifier = Modifier.height(12.dp))
+                
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clip(RoundedCornerShape(8.dp))
+                ) {
+                    CustomAsyncImage(
+                        context = context,
+                        imageUrl = image.url,
+                        contentDescription = "内容图片",
+                        contentScale = ContentScale.Fit,
+                        blurHash = image.blurHash,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,306 @@
+package com.aiosman.ravenow.ui.index.tabs.moment.tabs.news
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.aiosman.ravenow.AppState
+import com.aiosman.ravenow.GuestLoginCheckOut
+import com.aiosman.ravenow.GuestLoginCheckOutScene
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.data.CommentService
+import com.aiosman.ravenow.data.CommentServiceImpl
+import com.aiosman.ravenow.entity.CommentEntity
+import com.aiosman.ravenow.ui.NavigationRoute
+import com.aiosman.ravenow.ui.composables.EditCommentBottomModal
+import com.aiosman.ravenow.ui.composables.debouncedClickable
+import com.aiosman.ravenow.ui.composables.rememberDebouncedNavigation
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import com.aiosman.ravenow.ui.post.CommentContent
+import com.aiosman.ravenow.ui.post.CommentMenuModal
+import com.aiosman.ravenow.ui.post.CommentsViewModel
+import com.aiosman.ravenow.ui.post.OrderSelectionComponent
+import kotlinx.coroutines.launch
+
+
+class NewsCommentModalViewModel(
+    val postId: Int?
+) : ViewModel() {
+    var commentsViewModel: CommentsViewModel = CommentsViewModel(postId.toString())
+    var commentService: CommentService = CommentServiceImpl()
+    
+    init {
+        commentsViewModel.preTransit()
+    }
+
+    fun likeComment(commentId: Int) {
+        viewModelScope.launch {
+            commentsViewModel.likeComment(commentId)
+        }
+    }
+    
+    fun unlikeComment(commentId: Int) {
+        viewModelScope.launch {
+            commentsViewModel.unlikeComment(commentId)
+        }
+    }
+    
+    fun createComment(
+        content: String,
+        parentCommentId: Int? = null,
+        replyUserId: Int? = null,
+        replyCommentId: Int? = null
+    ) {
+        viewModelScope.launch {
+            commentsViewModel.createComment(
+                content = content,
+                parentCommentId = parentCommentId,
+                replyUserId = replyUserId,
+                replyCommentId = replyCommentId
+            )
+        }
+    }
+    
+    fun deleteComment(commentId: Int) {
+        commentsViewModel.deleteComment(commentId)
+    }
+}
+
+// 新闻评论弹窗
+// @param postId 新闻帖子ID
+// @param commentCount 评论数量
+// @param onDismiss 关闭回调
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun NewsCommentModal(
+    postId: Int? = null,
+    commentCount: Int = 0,
+    onDismiss: () -> Unit = {},
+    onCommentAdded: () -> Unit = {},
+    onCommentDeleted: () -> Unit = {}
+) {
+    val AppColors = LocalAppTheme.current
+    val navController = LocalNavController.current
+    val debouncedNavigation = rememberDebouncedNavigation()
+    
+    // 实时评论数状态
+    var currentCommentCount by remember { mutableStateOf(commentCount) }
+    
+    val model = viewModel<NewsCommentModalViewModel>(
+        key = "NewsCommentModalViewModel_$postId",
+        factory = object : ViewModelProvider.Factory {
+            override fun <T : ViewModel> create(modelClass: Class<T>): T {
+                return NewsCommentModalViewModel(postId) as T
+            }
+        }
+    )
+    
+    val commentViewModel = model.commentsViewModel
+    var navBarHeight = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()
+    
+    var showCommentMenu by remember { mutableStateOf(false) }
+    var contextComment by remember { mutableStateOf<CommentEntity?>(null) }
+    var replyComment by remember { mutableStateOf<CommentEntity?>(null) }
+    
+    // 菜单弹窗
+    if (showCommentMenu) {
+        ModalBottomSheet(
+            onDismissRequest = {
+                showCommentMenu = false
+            },
+            containerColor = AppColors.background,
+            sheetState = rememberModalBottomSheetState(
+                skipPartiallyExpanded = true
+            ),
+            dragHandle = {},
+            shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
+            windowInsets = WindowInsets(0)
+        ) {
+            CommentMenuModal(
+                onDeleteClick = {
+                    showCommentMenu = false
+                    contextComment?.let {
+                        model.deleteComment(it.id)
+                        onCommentDeleted()
+                        currentCommentCount = (currentCommentCount - 1).coerceAtLeast(0)
+                    }
+                },
+                commentEntity = contextComment,
+                onCloseClick = {
+                    showCommentMenu = false
+                },
+                isSelf = AppState.UserId?.toLong() == contextComment?.author,
+                onLikeClick = {
+                    if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.LIKE_MOMENT)) {
+                        debouncedNavigation {
+                            navController.navigate(NavigationRoute.Login.route)
+                        }
+                    } else {
+                        showCommentMenu = false
+                        contextComment?.let {
+                            if (it.liked) {
+                                model.unlikeComment(it.id)
+                            } else {
+                                model.likeComment(it.id)
+                            }
+                        }
+                    }
+                },
+                onReplyClick = {
+                    if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.COMMENT_MOMENT)) {
+                        debouncedNavigation {
+                            navController.navigate(NavigationRoute.Login.route)
+                        }
+                    } else {
+                        showCommentMenu = false
+                        replyComment = contextComment
+                    }
+                }
+            )
+        }
+    }
+
+    Column(
+        modifier = Modifier.background(AppColors.background)
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 8.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = "${currentCommentCount}条评论",
+                fontSize = 15.sp,
+                fontWeight = FontWeight.Bold,
+                color = AppColors.text
+            )
+
+            // 排序选择
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth(),
+                horizontalArrangement = Arrangement.End
+            ) {
+                OrderSelectionComponent {
+                    commentViewModel.order = it
+                    commentViewModel.reloadComment()
+                }
+            }
+        }
+
+        // 评论列表
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f)
+        ) {
+            Box(
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                LazyColumn {
+                    item {
+                        CommentContent(
+                            viewModel = commentViewModel,
+                            onLongClick = { comment ->
+                                showCommentMenu = true
+                                contextComment = comment
+                            },
+                            onReply = { parentComment, _, _, _ ->
+                                if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.COMMENT_MOMENT)) {
+                                    debouncedNavigation {
+                                        navController.navigate(NavigationRoute.Login.route)
+                                    }
+                                } else {
+                                    replyComment = parentComment
+                                }
+                            }
+                        )
+                    }
+                }
+            }
+        }
+        
+        // 底部输入栏
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(AppColors.background)
+        ) {
+            HorizontalDivider(color = AppColors.inputBackground)
+            
+            EditCommentBottomModal(
+                replyComment = replyComment,
+                autoFocus = false
+            ) {
+                if (replyComment != null) {
+                    if (replyComment?.parentCommentId != null) {
+                        // 第三级评论
+                        model.createComment(
+                            content = it,
+                            parentCommentId = replyComment?.parentCommentId,
+                            replyUserId = replyComment?.author?.toInt(),
+                            replyCommentId = replyComment?.id
+                        )
+                    } else {
+                        // 子级评论
+                        model.createComment(
+                            content = it,
+                            parentCommentId = replyComment?.id,
+                            replyCommentId = replyComment?.id
+                        )
+                    }
+                } else {
+                    // 顶级评论
+                    model.createComment(content = it)
+                }
+                replyComment = null
+                onCommentAdded()
+                currentCommentCount++
+            }
+            
+            Spacer(modifier = Modifier.height(navBarHeight))
+        }
+    }
+}
+  

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

@@ -0,0 +1,436 @@
+package com.aiosman.ravenow.ui.index.tabs.moment.tabs.news
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.pager.VerticalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.LaunchedEffect
+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.ColorFilter
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.platform.LocalConfiguration
+import com.aiosman.ravenow.GuestLoginCheckOut
+import com.aiosman.ravenow.GuestLoginCheckOutScene
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.entity.MomentEntity
+import com.aiosman.ravenow.exp.timeAgo
+import com.aiosman.ravenow.exp.formatPostTime2
+import com.aiosman.ravenow.ui.NavigationRoute
+import com.aiosman.ravenow.ui.composables.CustomAsyncImage
+import com.aiosman.ravenow.ui.composables.rememberDebouncer
+import com.aiosman.ravenow.ui.index.tabs.moment.tabs.news.NewsViewModel
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
+@Composable
+fun NewsScreen() {
+    val model = NewsViewModel
+    val moments = model.moments
+    val AppColors = LocalAppTheme.current
+    val context = LocalContext.current
+    val navController = LocalNavController.current
+    val scope = rememberCoroutineScope()
+    
+    // 评论弹窗状态
+    var showCommentModal by remember { mutableStateOf(false) }
+    var selectedMoment by remember { mutableStateOf<MomentEntity?>(null) }
+    
+    // 查看全文弹窗状态
+    var showFullArticleModal by remember { mutableStateOf(false) }
+    var selectedArticleMoment by remember { mutableStateOf<MomentEntity?>(null) }
+    // 垂直翻页状态
+    val pagerState = rememberPagerState(pageCount = { moments.size })
+    
+    // 防抖器
+    val likeDebouncer = rememberDebouncer()
+    val favoriteDebouncer = rememberDebouncer()
+
+    // 初始化加载数据
+    LaunchedEffect(Unit) {
+        model.refreshPager()
+    }
+    
+    // 监听数据变化，重置加载状态
+    LaunchedEffect(moments.size) {
+        // 当数据增加时，如果接近列表末尾，Pager会自动更新页数
+    }
+
+    // 当翻页接近末尾时加载更多
+    LaunchedEffect(pagerState.currentPage, moments.size) {
+        if (moments.isNotEmpty() && pagerState.currentPage >= moments.size - 2) {
+            model.loadMore()
+        }
+    }
+    
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(AppColors.background)
+    ) {
+        if (moments.isEmpty()) {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center
+            ) {
+                Text(text = "暂无新闻内容", color = AppColors.text, fontSize = 16.sp)
+            }
+        } else {
+            VerticalPager(
+                state = pagerState,
+                modifier = Modifier.fillMaxSize()
+            ) { page ->
+                val momentItem = moments.getOrNull(page) ?: return@VerticalPager
+                NewsItem(
+                    moment = momentItem,
+                    modifier = Modifier.fillMaxSize(),
+                    onCommentClick = {
+                        selectedMoment = momentItem
+                        showCommentModal = true
+                    },
+                    onReadFullClick = {
+                        selectedArticleMoment = momentItem
+                        showFullArticleModal = true
+                    },
+                    onLikeClick = {
+                        likeDebouncer {
+                            // 检查游客模式
+                            if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.LIKE_MOMENT)) {
+                                navController.navigate(NavigationRoute.Login.route)
+                            } else {
+                                scope.launch {
+                                    if (momentItem.liked) {
+                                        model.dislikeMoment(momentItem.id)
+                                    } else {
+                                        model.likeMoment(momentItem.id)
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    onFavoriteClick = {
+                        favoriteDebouncer {
+                            // 检查游客模式
+                            if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.LIKE_MOMENT)) {
+                                navController.navigate(NavigationRoute.Login.route)
+                            } else {
+                                scope.launch {
+                                    if (momentItem.isFavorite) {
+                                        model.unfavoriteMoment(momentItem.id)
+                                    } else {
+                                        model.favoriteMoment(momentItem.id)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                )
+            }
+        }
+        
+        // 查看全文弹窗
+        if (showFullArticleModal && selectedArticleMoment != null) {
+            FullArticleModal(
+                moment = selectedArticleMoment!!,
+                onDismiss = {
+                    showFullArticleModal = false
+                }
+            )
+        }
+        
+        // 评论弹窗
+        if (showCommentModal && selectedMoment != null) {
+            val configuration = LocalConfiguration.current
+            val screenHeight = configuration.screenHeightDp.dp
+            val sheetHeight = screenHeight * 0.67f // 三分之二高度
+            
+            ModalBottomSheet(
+                onDismissRequest = {
+                    showCommentModal = false
+                },
+                sheetState = rememberModalBottomSheetState(
+                    skipPartiallyExpanded = true
+                ),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(sheetHeight),
+                containerColor = AppColors.background,
+                shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
+                windowInsets = androidx.compose.foundation.layout.WindowInsets(0)
+            ) {
+                NewsCommentModal(
+                    postId = selectedMoment?.id,
+                        commentCount = selectedMoment?.commentCount ?: 0,
+                        onDismiss = {
+                            showCommentModal = false
+                        },
+                        onCommentAdded = {
+                            selectedMoment?.id?.let { model.onAddComment(it) }
+                        },
+                        onCommentDeleted = {
+                            selectedMoment?.id?.let { model.onDeleteComment(it) }
+                        }
+                )
+            }
+        }
+    }
+}
+
+//单个新闻项
+@Composable
+fun NewsItem(
+    moment: MomentEntity,
+    modifier: Modifier = Modifier,
+    onCommentClick: () -> Unit = {},
+    onReadFullClick: () -> Unit = {},
+    onLikeClick: () -> Unit = {},
+    onFavoriteClick: () -> Unit = {}
+) {
+    val AppColors = LocalAppTheme.current
+    val context = LocalContext.current
+    
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .background(AppColors.background)
+            .padding(vertical = 8.dp),
+        verticalArrangement = Arrangement.SpaceBetween
+    ) {
+        Column(
+            modifier = Modifier
+                .weight(1f)
+                .padding(bottom = 30.dp)
+        ) {
+            // 新闻图片
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(300.dp)
+                    .padding(horizontal = 16.dp)
+            ) {
+                if (moment.images.isNotEmpty()) {
+                    CustomAsyncImage(
+                        context = context,
+                        imageUrl = moment.images[0].thumbnail,
+                        contentDescription = "新闻图片",
+                        contentScale = ContentScale.Crop,
+                        blurHash = moment.images[0].blurHash,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .clip(RoundedCornerShape(8.dp))
+                    )
+                } else {
+                    Image(
+                        painter = androidx.compose.ui.res.painterResource(id = R.drawable.default_moment_img),
+                        contentDescription = "默认图片",
+                        contentScale = ContentScale.Crop,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .clip(RoundedCornerShape(8.dp))
+                    )
+                }
+            }
+            
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            // 新闻标题
+            Text(
+                text = if (moment.newsTitle.isNotEmpty()) moment.newsTitle else moment.nickname,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+                fontSize = 20.sp,
+                fontWeight = FontWeight.Bold,
+                color = AppColors.text,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis
+            )
+            
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            // 新闻内容（超出使用省略号）
+            Text(
+                text = if (moment.newsContent.isNotEmpty()) moment.newsContent else moment.momentTextContent,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+                fontSize = 14.sp,
+                color = AppColors.text,
+                lineHeight = 20.sp,
+                maxLines = 6,
+                overflow = TextOverflow.Ellipsis
+            )
+            
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            // 新闻信息
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                // 来源和时间（显示月份与具体时间）
+                Text(
+                    text = if (moment.newsSource.isNotEmpty()) "${moment.newsSource} • ${moment.time.formatPostTime2()}" else "${moment.nickname} • ${moment.time.formatPostTime2()}",
+                    fontSize = 12.sp,
+                    color = AppColors.secondaryText,
+                    modifier = Modifier
+                        .weight(1f)
+                        .padding(end = 8.dp),
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis
+                )
+                
+                // 查看全文
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.noRippleClickable { onReadFullClick() }
+                ) {
+                    Text(
+                        text = stringResource(R.string.read_full_article),
+                        fontSize = 13.sp,
+                        fontWeight = FontWeight.W600,
+                        color = Color(0xFF7c45ed)
+                    )
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Image(
+                        painter = androidx.compose.ui.res.painterResource(id = R.mipmap.arrow),
+                        contentDescription = "箭头",
+                        modifier = Modifier.size(18.dp),
+                        colorFilter = ColorFilter.tint(Color(0xFF7c45ed))
+                    )
+                }
+            }
+        }
+
+        // 互动栏
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp)
+                .padding(bottom = 25.dp),
+            horizontalArrangement = Arrangement.SpaceEvenly
+        ) {
+            // 点赞
+            NewsActionButton(
+                icon = if (moment.liked) R.drawable.rider_pro_moment_liked else R.drawable.rider_pro_moment_like,
+                count = moment.likeCount.toString(),
+                isActive = moment.liked,
+                modifier = Modifier.noRippleClickable { onLikeClick() }
+            )
+            
+            // 评论
+            NewsActionButton(
+                icon = R.mipmap.icon_comment,
+                count = moment.commentCount.toString(),
+                isActive = false,
+                modifier = Modifier.noRippleClickable { onCommentClick() }
+            )
+            
+            // 收藏
+            NewsActionButton(
+                icon = if (moment.isFavorite) R.mipmap.icon_variant_2 else R.mipmap.icon_collect,
+                count = moment.favoriteCount.toString(),
+                isActive = moment.isFavorite,
+                modifier = Modifier.noRippleClickable { onFavoriteClick() }
+            )
+            
+            // 分享
+            NewsActionButton(
+                icon = R.mipmap.icon_share,
+                count = "",
+                isActive = false,
+                text = stringResource(R.string.share),
+                textSize = 8.sp
+            )
+        }
+    }
+}
+
+// 互动栏按钮
+@Composable
+fun NewsActionButton(
+    icon: Int,
+    count: String,
+    isActive: Boolean,
+    modifier: Modifier = Modifier,
+    text: String? = null,
+    textSize: androidx.compose.ui.unit.TextUnit = 12.sp
+) {
+    val AppColors = LocalAppTheme.current
+    
+    Row(
+        modifier = modifier
+            .width(60.dp)
+            .background(
+                color = AppColors.secondaryBackground,
+                shape = RoundedCornerShape(16.dp)
+            )
+            .padding(horizontal = 12.dp, vertical = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.Center
+    ) {
+        Image(
+            painter = androidx.compose.ui.res.painterResource(id = icon),
+            contentDescription = "操作图标",
+            modifier = Modifier.size(16.dp)
+        )
+        
+        if (count.isNotEmpty()) {
+            Spacer(modifier = Modifier.width(4.dp))
+            Text(
+                text = count,
+                fontSize = 12.sp,
+                color = AppColors.text
+            )
+        }
+        if (text != null) {
+            Spacer(modifier = Modifier.width(4.dp))
+            Text(
+                text = text,
+                fontSize = textSize,
+                color = AppColors.text
+            )
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.aiosman.ravenow.ui.index.tabs.moment.tabs.news
+
+import com.aiosman.ravenow.entity.MomentLoaderExtraArgs
+import com.aiosman.ravenow.ui.index.tabs.moment.BaseMomentModel
+
+object NewsViewModel : BaseMomentModel() {
+    override fun extraArgs(): MomentLoaderExtraArgs {
+        // 只拉取新闻
+        return MomentLoaderExtraArgs(
+            explore = false,
+            timelineId = null,
+            authorId = null,
+            newsOnly = true
+        )
+    }
+}
+
+

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

@@ -43,6 +43,8 @@ import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.composables.MomentCard
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
 import kotlinx.coroutines.launch
+import com.aiosman.ravenow.utils.NetworkUtils
+import androidx.compose.ui.platform.LocalContext
 
 /**
  * 动态列表
@@ -76,7 +78,49 @@ fun TimelineMomentsList() {
             model.loadMore()
         }
     }
-    if (moments.isEmpty()) {
+    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+    if (!isNetworkAvailable) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(top = 188.dp),
+            contentAlignment = Alignment.TopCenter
+        ) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                val exploreDebouncer = rememberDebouncer()
+                Image(
+                    painter = painterResource(id = R.mipmap.invalid_name_10),
+                    contentDescription = "network error",
+                    modifier = Modifier.size(140.dp)
+                )
+                Spacer(modifier = Modifier.size(24.dp))
+                Text(
+                    text = stringResource(R.string.friend_chat_no_network_title),
+                    color = AppColors.text,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.W600
+                )
+                Spacer(modifier = Modifier.size(8.dp))
+                Text(
+                    text = stringResource(R.string.friend_chat_no_network_subtitle),
+                    color = AppColors.text,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.W400
+                )
+                Spacer(modifier = Modifier.size(16.dp))
+                ExploreButton(
+                    onClick = {
+                        exploreDebouncer {
+                            /* TODO: 添加点击事件处理 */
+                        } }
+                )
+            }
+        }
+    } else if (moments.isEmpty()) {
         Box(
             modifier = Modifier
                 .fillMaxSize()
@@ -91,7 +135,7 @@ fun TimelineMomentsList() {
                 Image(
                     painter = painterResource(
                         id = if(AppState.darkMode) R.mipmap.qst_gz_qs_as_img
-                        else R.mipmap.qst_gz_qs_img),
+                        else R.mipmap.invalid_name_4),
                     contentDescription = null,
                     modifier = Modifier.size(140.dp)
                 )
@@ -191,9 +235,9 @@ fun ExploreButton(
 ) {
     val gradientBrush = Brush.linearGradient(
         colors = listOf(
-            Color(0xFFee2a33),
+            Color(0xFF7c45ed),
-            Color(0xFFd80264),
+            Color(0xFF7c68ef),
-            Color(0xFF664c92)
+            Color(0xFF7bd8f8)
         )
     )
 

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

@@ -0,0 +1,178 @@
+package com.aiosman.ravenow.ui.index.tabs.profile
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+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 com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.entity.AccountProfileEntity
+import com.aiosman.ravenow.ui.composables.CustomAsyncImage
+
+/**
+ * 拉黑确认弹窗
+ */
+@Composable
+fun BlockConfirmDialog(
+    userProfile: AccountProfileEntity?,
+    onConfirmBlock: () -> Unit = {},
+    onDismiss: () -> Unit = {}
+) {
+    val AppColors = LocalAppTheme.current
+    
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.BottomCenter
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(
+                    color = AppColors.background,
+                    shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)
+                )
+                .padding(24.dp)
+        ) {
+            // 用户头像
+            Box(
+                modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .padding(bottom = 16.dp)
+            ) {
+                CustomAsyncImage(
+                    LocalContext.current,
+                    userProfile?.avatar,
+                    modifier = Modifier
+                        .size(60.dp)
+                        .clip(CircleShape)
+                        .background(
+                            color = AppColors.background,
+                            shape = CircleShape
+                        ),
+                    contentDescription = "用户头像",
+                    contentScale = ContentScale.Crop
+                )
+            }
+            
+            // 确认文本
+            Text(
+                text = stringResource(R.string.confirm_block_user, userProfile?.nickName ?: "该用户"),
+
+                fontSize = 18.sp,
+                fontWeight = FontWeight.Bold,
+                color = AppColors.text,
+                modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .padding(bottom = 24.dp)
+            )
+            
+            // 说明信息
+            Column(
+                modifier = Modifier.padding(bottom = 32.dp)
+            ) {
+                // 第一条说明
+                Row(
+                    modifier = Modifier.padding(bottom = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.mipmap.icons_infor_off_eye),
+                        contentDescription = "",
+                        tint = AppColors.text,
+                        modifier = Modifier.size(20.dp)
+                    )
+                    Spacer(modifier = Modifier.width(12.dp))
+                    Text(
+                        text = stringResource(R.string.block_description_1),
+                        fontSize = 14.sp,
+                        color = AppColors.text,
+                        lineHeight = 20.sp
+                    )
+                }
+
+                // 第二条说明
+                Row(
+                    modifier = Modifier.padding(bottom = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.rider_pro_notice_mute),
+                        contentDescription = "",
+                        tint = AppColors.text,
+                        modifier = Modifier.size(20.dp)
+                    )
+                    Spacer(modifier = Modifier.width(12.dp))
+                    Text(
+                        text = stringResource(R.string.block_description_2),
+                        fontSize = 14.sp,
+                        color = AppColors.text,
+                        lineHeight = 20.sp
+                    )
+                }
+                
+                // 第三条说明
+                Row(
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.mipmap.icons_infor_off_bell),
+                        contentDescription = "",
+                        tint = AppColors.text,
+                        modifier = Modifier.size(20.dp)
+                    )
+                    Spacer(modifier = Modifier.width(12.dp))
+                    Text(
+                        text = stringResource(R.string.block_description_3),
+                        fontSize = 14.sp,
+                        color = AppColors.text,
+                        lineHeight = 20.sp
+                    )
+                }
+            }
+            
+            // 确认拉黑按钮
+            androidx.compose.material3.Button(
+                onClick = {
+                    onConfirmBlock()
+                    onDismiss()
+                },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(48.dp),
+                colors = androidx.compose.material3.ButtonDefaults.buttonColors(
+                    containerColor = AppColors.text
+                ),
+                shape = RoundedCornerShape(24.dp)
+            ) {
+                Text(
+                    stringResource(R.string.block),
+                    color = AppColors.background,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.Bold
+                )
+            }
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ import android.util.Log
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -86,8 +87,8 @@ import com.aiosman.ravenow.ui.composables.toolbar.rememberCollapsingToolbarScaff
 import com.aiosman.ravenow.ui.index.IndexViewModel
 import com.aiosman.ravenow.ui.index.tabs.profile.composable.GalleryGrid
 import com.aiosman.ravenow.ui.post.MenuActionItem
+import com.aiosman.ravenow.ui.index.tabs.profile.composable.GroupChatEmptyContent
 import com.aiosman.ravenow.ui.index.tabs.profile.composable.OtherProfileAction
-import com.aiosman.ravenow.ui.index.tabs.profile.composable.SelfProfileAction
 import com.aiosman.ravenow.ui.index.tabs.profile.composable.UserAgentsList
 import com.aiosman.ravenow.ui.index.tabs.profile.composable.UserAgentsRow
 import com.aiosman.ravenow.ui.index.tabs.profile.composable.UserContentPageIndicator
@@ -98,6 +99,15 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.io.File
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.ui.res.stringResource
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.border
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.graphics.Brush
+import java.text.NumberFormat
+import java.util.Locale
 
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
 @Composable
@@ -116,11 +126,11 @@ fun ProfileV3(
     onLike: (MomentEntity) -> Unit = {},
     onComment: (MomentEntity) -> Unit = {},
     onAgentClick: (AgentEntity) -> Unit = {},
-    postCount: Int? = null, // 新增参数用于传递帖子总数
+    postCount: Long? = null, // 新增参数用于传递帖子总数
 ) {
     val model = MyProfileViewModel
-    val state = rememberCollapsingToolbarScaffoldState()
+    // Tabs: 动态、(可选)智能体、群聊
-    val pagerState = rememberPagerState(pageCount = { if (isAiAccount) 1 else 2 })
+    val pagerState = rememberPagerState(pageCount = { if (isAiAccount) 2 else 3 })
     val enabled by remember { mutableStateOf(true) }
     val statusBarPaddingValues = WindowInsets.systemBars.asPaddingValues()
     var expanded by remember { mutableStateOf(false) }
@@ -128,10 +138,13 @@ fun ProfileV3(
     var showAgentMenu by remember { mutableStateOf(false) }
     var contextAgent by remember { mutableStateOf<AgentEntity?>(null) }
     var showDeleteConfirmDialog by remember { mutableStateOf(false) }
+    var showOtherUserMenu by remember { mutableStateOf(false) }
+    var showBlockConfirmDialog by remember { mutableStateOf(false) }
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     val navController = LocalNavController.current
-    val bannerHeight = 400
+    val bannerWidth = 402
+    val bannerHeight = 206
     val pickBannerImageLauncher = pickupAndCompressLauncher(
         context,
         scope,
@@ -151,6 +164,20 @@ fun ProfileV3(
     val systemUiController = rememberSystemUiController()
     val listState = rememberLazyListState()
     val gridState = rememberLazyGridState()
+    val scrollState = rememberScrollState()
+
+    // 计算导航栏背景透明度，根据滚动位置从0到1
+    val toolbarBackgroundAlpha by remember {
+        derivedStateOf {
+            if (!isSelf) {
+                1f
+            } else {
+                val maxScroll = 600f // 增加最大滚动距离，让渐变更平缓
+                val progress = (scrollState.value.coerceAtMost(maxScroll.toInt()) / maxScroll).coerceIn(0f, 1f)
+                progress
+            }
+        }
+    }
 
     // observe list scrolling
     val reachedListBottom by remember {
@@ -201,8 +228,6 @@ fun ProfileV3(
         }
     }
 
-
-
     fun switchTheme() {
         // delay
         scope.launch {
@@ -281,139 +306,90 @@ fun ProfileV3(
     Box(
         modifier = Modifier.pullRefresh(refreshState)
     ) {
-        CollapsingToolbarScaffold(
+        Column(
             modifier = Modifier
                 .fillMaxSize()
-                .background(AppColors.profileBackground),
+                .verticalScroll(scrollState)
-            state = state,
-            scrollStrategy = ScrollStrategy.ExitUntilCollapsed,
-            toolbarScrollable = true,
-            enabled = enabled,
-            toolbar = { toolbarScrollState ->
-                Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(miniToolbarHeight.dp)
-                        // 保持在最低高度和当前高度之间
                 .background(AppColors.profileBackground)
         ) {
-                }
+            // Banner
-                // header
+            val banner = profile?.banner
-                Box(
+            if (banner != null) {
-                    modifier = Modifier
-                        .parallax(0.5f)
-                        .fillMaxWidth()
-                        .height(if (isAiAccount) 600.dp else 700.dp)
-                        .background(AppColors.profileBackground)
-                        .verticalScroll(toolbarScrollState)
-                ) {
-                    Box(
-                        modifier = Modifier.fillMaxSize()
-                    ) {
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .graphicsLayer {
-                                    alpha = state.toolbarState.progress
-                                }
-                        ) {
-                            // banner
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(bannerHeight.dp)
-                                    .background(AppColors.profileBackground)
+                        .background(AppColors.profileBackground),
+                    contentAlignment = Alignment.Center
                 ) {
                     Box(
                         modifier = Modifier
-                                        .fillMaxWidth()
+                            .width(bannerWidth.dp)
-                                        .height(bannerHeight.dp - 24.dp)
+                            .height(bannerHeight.dp)
+                            .clip(
+                                RoundedCornerShape(
+                                    bottomStart = 32.dp,
+                                    bottomEnd = 32.dp
+                                )
+                            )
                             .let {
-                                            if (isSelf&&isMain) {
+                                if (isSelf && isMain) {
                                     it.noRippleClickable {
                                         Intent(Intent.ACTION_PICK).apply {
                                             type = "image/*"
-                                                        pickBannerImageLauncher.launch(
+                                            pickBannerImageLauncher.launch(this)
-                                                            this
-                                                        )
                                         }
                                     }
                                 } else {
                                     it
                                 }
                             }
-                                        .shadow(
-                                            elevation = 6.dp,
-                                            shape = RoundedCornerShape(
-                                                bottomStart = 32.dp,
-                                                bottomEnd = 32.dp
-                                            ),
-                                        )
                     ) {
-                                    val banner = profile?.banner
-
-                                    if (banner != null) {
                         CustomAsyncImage(
                             LocalContext.current,
                             banner,
-                                            modifier = Modifier
+                            modifier = Modifier.fillMaxSize(),
-                                                .fillMaxSize(),
-                                            contentDescription = "",
-                                            contentScale = ContentScale.Crop
-                                        )
-                                    } else {
-                                        Image(
-                                            painter = painterResource(id = R.drawable.rave_now_profile_backgrount_demo_1),
-                                            modifier = Modifier
-                                                .fillMaxSize(),
                             contentDescription = "",
                             contentScale = ContentScale.Crop
                         )
                     }
                 }
+            } else {
+                Spacer(modifier = Modifier.height(100.dp))
+            }
 
-                            }
+            // 壁纸下方间距
+            Spacer(modifier = Modifier.height(16.dp))
+
+            // 用户信息
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
                     .background(AppColors.profileBackground)
-                            ) {
+                    .padding(horizontal = 16.dp)
-                                // user info
-                                Column(
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-
-                                ) {
-//                                    Spacer(modifier = Modifier.height(16.dp))
-                                    // 个人信息
-                                    Box(
-                                        modifier = Modifier.padding(horizontal = 16.dp)
             ) {
                 profile?.let {
                     UserItem(
                         accountProfileEntity = it,
-                                                postCount = postCount ?: if (isSelf) MyProfileViewModel.momentLoader.total else moments.size
+                        postCount = postCount ?: if (isSelf) MyProfileViewModel.momentLoader.total else moments.size.toLong(),
+                        isSelf = isSelf,
+                        onEditClick = {
+                            navController.navigate(NavigationRoute.AccountEdit.route)
+                        }
                     )
                 }
             }
+
             Spacer(modifier = Modifier.height(20.dp))
+
+            // 操作按钮（仅其他用户显示）
             profile?.let {
+                if (!isSelf && it.id != AppState.UserId) {
                     Box(
-                                            modifier = Modifier.padding(horizontal = 16.dp)
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 16.dp)
                     ) {
-                                            if (isSelf) {
-                                                SelfProfileAction(
-                                                    onEditProfile = {
-                                                        navController.navigate(
-                                                            NavigationRoute.AccountEdit.route
-                                                        )
-                                                    },
-                                                    onPremiumClick = {
-                                                        navController.navigate(NavigationRoute.VipSelPage.route)
-                                                    }
-                                                )
-                                            } else {
-                                                if (it.id != AppState.UserId) {
                         OtherProfileAction(
                             it,
                             onFollow = {
@@ -424,24 +400,19 @@ fun ProfileV3(
                             }
                         )
                     }
-
-                                            }
-
                 }
             }
 
-                                    // 添加用户智能体行（智能体用户不显示）
+            // 用户智能体行
             if (!isAiAccount) {
                 UserAgentsRow(
                     userId = if (isSelf) null else profile?.id,
                     modifier = Modifier.padding(top = 16.dp),
                     onMoreClick = {
                         // 导航到智能体列表页面
-                                                // TODO: 实现导航逻辑
                     },
                     onAgentClick = { agent ->
                         // 导航到智能体详情页面
-                                                // TODO: 实现导航逻辑
                     },
                     onAvatarClick = { agent ->
                         // 导航到智能体个人主页
@@ -469,128 +440,26 @@ fun ProfileV3(
                     }
                 )
             }
-                                }
 
-                            }
+            // 内容
-
-                        }
-                    }
-
-
-                }
-                Box(modifier = Modifier.fillMaxWidth()) {
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                            .graphicsLayer {
-                                alpha = 1 - state.toolbarState.progress
-                            }
-                            .background(AppColors.profileBackground)
-                            .onGloballyPositioned {
-                                miniToolbarHeight = with(density) {
-                                    it.size.height.toDp().value.toInt()
-                                }
-                            }
-                    ) {
-                        StatusBarSpacer()
-                        Row(
-                            modifier = Modifier.padding(
-                                horizontal = 16.dp,
-                                vertical = 8.dp,
-                            ).noRippleClickable {
-
-                            },
-
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            if (!isMain) {
-                                Image(
-                                    painter = painterResource(id = R.drawable.rider_pro_back_icon), // Replace with your image resource
-                                    contentDescription = "Back",
-                                    modifier = Modifier
-                                        .noRippleClickable {
-                                            navController.navigateUp()
-                                        }
-                                        .size(24.dp),
-                                    colorFilter = ColorFilter.tint(AppColors.text)
-                                )
-                                Spacer(modifier = Modifier.width(8.dp))
-                                CustomAsyncImage(
-                                    LocalContext.current,
-                                    profile?.avatar,
-                                    modifier = Modifier
-                                        .size(32.dp)
-                                        .clip(CircleShape),
-                                    contentDescription = "",
-                                    contentScale = ContentScale.Crop
-                                )
-                                Spacer(modifier = Modifier.width(16.dp))
-                                Text(
-                                    text = profile?.nickName ?: "",
-                                    fontSize = 16.sp,
-                                    fontWeight = FontWeight.W600,
-                                    color = AppColors.text
-                                )
-
-                            }
-                            Spacer(modifier = Modifier.weight(1f))
-                            if (isSelf&&isMain) {
-                                Box(
-                                    modifier = Modifier
-                                        .size(24.dp)
-                                        .padding(16.dp)
-                                )
-                            }
-                        }
-
-                        Spacer(modifier = Modifier.height(8.dp))
-                    }
-                    if (isSelf&&isMain) {
-                        Box(
-                            modifier = Modifier
-                                .align(Alignment.TopEnd)
-                                .padding(
-                                    top = 32.dp ,
-                                    end = 16.dp
-                                )
-                                .noRippleClickable {
-                                IndexViewModel.openDrawer = true
-                            }
-                        ) {
-                            Box(
-                                modifier = Modifier
-                                    .padding(16.dp)
-
-                            ) {
-                                Icon(
-                                    painter = painterResource(id = R.drawable.rider_pro_more_horizon),
-                                    contentDescription = "",
-                                    tint = AppColors.text
-                                )
-                            }
-
-                        }
-                    }
-                }
-            }
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxSize()
                     .background(AppColors.profileBackground)
+                    .padding(top = 8.dp)
             ) {
                 UserContentPageIndicator(
                     pagerState = pagerState,
                     showAgentTab = !isAiAccount
                 )
-                Spacer(modifier = Modifier.height(8.dp))
                 HorizontalPager(
                     state = pagerState,
+                    modifier = Modifier.height(500.dp) // 固定滚动高度
                 ) { idx ->
                     when (idx) {
-                        0 ->
+                        0 -> GalleryGrid(moments = moments)
-                            GalleryGrid(moments = moments)
+                        1 -> {
-                        1 ->
+                            if (!isAiAccount) {
                                 UserAgentsList(
                                     agents = agents,
                                     onAgentClick = onAgentClick,
@@ -612,18 +481,377 @@ fun ProfileV3(
                                     },
                                     modifier = Modifier.fillMaxSize()
                                 )
+                            } else {
+                                GroupChatPlaceholder()
+                            }
+                        }
+                        2 -> {
+                            if (!isAiAccount) {
+                                GroupChatPlaceholder()
+                            }
+                        }
                     }
                 }
             }
             
+            // 底部间距，增加滚动距离
+            Spacer(modifier = Modifier.height(100.dp))
         }
+
+        // 顶部导航栏
+        TopNavigationBar(
+            isMain = isMain,
+            isSelf = isSelf,
+            profile = profile,
+            navController = navController,
+            backgroundAlpha = toolbarBackgroundAlpha,
+            interactionCount = moments.sumOf { it.likeCount }, // 计算总点赞数作为互动数据
+            onMenuClick = {
+                showOtherUserMenu = true
+            },
+            onShareClick = {
+                // TODO: 实现分享功能
+            }
+        )
+
         PullRefreshIndicator(
             model.refreshing,
             refreshState,
             Modifier.align(Alignment.TopCenter)
         )
+        
+        // 其他用户菜单弹窗
+        if (showOtherUserMenu) {
+            ModalBottomSheet(
+                onDismissRequest = { showOtherUserMenu = false },
+                sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+                containerColor = Color.Transparent, // 设置容器背景透明
+                contentColor = Color.Transparent, // 设置内容背景透明
+                dragHandle = null, // 移除拖拽手柄
+                windowInsets = androidx.compose.foundation.layout.WindowInsets(0) // 移除窗口边距
+            ) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(Color.Transparent)
+                ) {
+                OtherUserMenuModal(
+                    onBlockClick = {
+                        showBlockConfirmDialog = true
+                    },
+                        onReportClick = {
+                            // 实现举报逻辑
+                        },
+                        onCancelClick = {
+                            showOtherUserMenu = false
+                        },
+                    onDismiss = { showOtherUserMenu = false }
+                )
+            }
         }
 
+        // 拉黑确认弹窗
+        if (showBlockConfirmDialog) {
+            ModalBottomSheet(
+                onDismissRequest = {
+                    showBlockConfirmDialog = false
+                },
+                sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+                containerColor = Color.Transparent,
+                contentColor = Color.Transparent,
+                dragHandle = null,
+                windowInsets = androidx.compose.foundation.layout.WindowInsets(0)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(Color.Transparent)
+                ) {
+                    BlockConfirmDialog(
+                        userProfile = profile,
+                        onConfirmBlock = {
+                            // 实现拉黑逻辑
+                        },
+                        onDismiss = {
+                            showBlockConfirmDialog = false
+                            showOtherUserMenu = false
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+}
+
+@Composable
+private fun GroupChatPlaceholder() {
+    GroupChatEmptyContent()
+}
+
+//顶部导航栏组件
+@Composable
+fun TopNavigationBar(
+    isMain: Boolean,
+    isSelf: Boolean,
+    profile: AccountProfileEntity?,
+    navController: androidx.navigation.NavController,
+    backgroundAlpha: Float,
+    interactionCount: Int = 0,
+    onMenuClick: () -> Unit = {},
+    onShareClick: () -> Unit = {}
+) {
+    val appColors = LocalAppTheme.current
+    val numberFormat = remember { NumberFormat.getNumberInstance(Locale.getDefault()) }
+    
+    // 根据背景透明度决定图标颜色：透明度为1时变黑，否则为白色
+    val iconColor = if (backgroundAlpha >= 1f) Color.Black else Color.White
+    val cardBorderColor = if (backgroundAlpha >= 1f) Color.Black else Color.White
+    
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+    ) {
+        val statusBarPadding = WindowInsets.systemBars.asPaddingValues()
+        val statusBarHeight = statusBarPadding.calculateTopPadding()
+        val navigationBarHeight = 56.dp // 增加导航栏高度，包括图标和额外空间
+        
+        // 导航栏背景层，包括状态栏区域，根据滚动位置逐渐变白
+        val totalHeight = statusBarHeight + navigationBarHeight
+        val density = LocalDensity.current
+        val totalHeightPx = with(density) { totalHeight.toPx() }
+        
+        // 根据滚动位置计算基础颜色，从深色平滑过渡到白色，透明度从初始值逐渐减到0
+        val baseColor = remember(backgroundAlpha) {
+            val smoothProgress = backgroundAlpha.coerceIn(0f, 1f)
+            
+            // 初始状态：半透明深色，让白色图标清晰可见
+            val initialDarkAlpha = 0.12f
+            
+            // 使用平滑的插值函数，让整个过渡更自然
+            val easedProgress = smoothProgress * smoothProgress * (3f - 2f * smoothProgress) // smoothstep
+            
+            // 颜色值：从黑色(0)平滑过渡到白色(1)
+            val colorValue = easedProgress
+            
+            // 透明度：从初始值(0.12f)逐渐减少到0
+            // 当smoothProgress从0到1时，alpha从initialDarkAlpha减少到0
+            val alpha = initialDarkAlpha * (1f - easedProgress)
+            
+            Color(
+                red = colorValue,
+                green = colorValue,
+                blue = colorValue,
+                alpha = alpha.coerceIn(0f, initialDarkAlpha)
+            )
+        }
+        
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(totalHeight) // 状态栏高度 + 导航栏高度
+                .align(Alignment.TopCenter)
+                .background(
+                    brush = Brush.verticalGradient(
+                        colors = listOf(
+                            baseColor, // 顶部保持基础颜色
+                            baseColor, // 中间保持基础颜色
+                            baseColor.copy(alpha = baseColor.alpha * 0.5f), // 底部过渡，逐渐变透明
+                            Color.Transparent // 最底部完全透明
+                        ),
+                        startY = 0f,
+                        endY = totalHeightPx
+                    )
+                )
+        )
+        
+        // 功能按钮区域，图标和文字根据背景透明度改变颜色
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 16.dp, bottom = 16.dp, end = 16.dp) // 增加上下内边距
+                .align(Alignment.TopEnd)
+                .padding(top = statusBarHeight), // 从状态栏下方开始
+            horizontalArrangement = Arrangement.End,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            // 左侧：互动数据卡片
+            Row(
+                modifier = Modifier
+                    .height(24.dp)
+                    .background(
+                        color = Color.White.copy(alpha = 0.52f),
+                        shape = RoundedCornerShape(16.dp)
+                    )
+                    .border(
+                        width = 0.5.dp,
+                        color = cardBorderColor, // 根据背景透明度改变边框颜色
+                        shape = RoundedCornerShape(16.dp)
+                    )
+                    .padding(horizontal = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center
+            ) {
+                // 互动图标
+                Image(
+                    painter = painterResource(id = R.mipmap.paip_coin_img),
+                    contentDescription = "互动",
+                    modifier = Modifier.size(24.dp),
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+                Text(
+                    text = numberFormat.format(interactionCount),
+                    fontSize = 14.sp,
+                    fontWeight = FontWeight.W500,
+                    color = Color.Black, // 文字始终为黑色
+                    textAlign = TextAlign.Center
+                )
+            }
+            
+            Spacer(modifier = Modifier.width(16.dp))
+            
+            // 中间：分享图标
+            Image(
+                painter = painterResource(id = R.mipmap.menu_icon),
+                contentDescription = "分享",
+                modifier = Modifier
+                    .size(24.dp)
+                    .noRippleClickable {
+                        onShareClick()
+                    },
+                colorFilter = ColorFilter.tint(iconColor) // 根据背景透明度改变颜色
+            )
+            
+            Spacer(modifier = Modifier.width(16.dp))
+            
+            // 右侧：菜单图标
+            Image(
+                painter = painterResource(id = R.mipmap.menu_ico),
+                contentDescription = "菜单",
+                modifier = Modifier
+                    .size(24.dp)
+                    .noRippleClickable {
+                        if (isSelf && isMain) {
+                            IndexViewModel.openDrawer = true
+                        } else {
+                            onMenuClick()
+                        }
+                    },
+                colorFilter = ColorFilter.tint(iconColor) // 根据背景透明度改变颜色
+            )
+        }
+        
+        // 如果不是主页面，显示返回按钮和用户信息
+        if (!isMain) {
+            val statusBarPadding = WindowInsets.systemBars.asPaddingValues()
+            Row(
+                modifier = Modifier
+                    .align(Alignment.TopStart)
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .padding(top = statusBarPadding.calculateTopPadding()),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Image(
+                    painter = painterResource(id = R.drawable.rider_pro_back_icon),
+                    contentDescription = "Back",
+                    modifier = Modifier
+                        .noRippleClickable {
+                            navController.navigateUp()
+                        }
+                        .size(24.dp),
+                    colorFilter = ColorFilter.tint(Color.White)
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+                CustomAsyncImage(
+                    LocalContext.current,
+                    profile?.avatar,
+                    modifier = Modifier
+                        .size(32.dp)
+                        .clip(CircleShape),
+                    contentDescription = "",
+                    contentScale = ContentScale.Crop
+                )
+                Spacer(modifier = Modifier.width(16.dp))
+                Text(
+                    text = profile?.nickName ?: "",
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.W600,
+                    color = Color.White
+                )
+            }
+        }
+    }
+}
+
+// 分享图标（向上箭头）
+@Composable
+fun ShareIcon(
+    color: Color,
+    modifier: Modifier = Modifier
+) {
+    Canvas(modifier = modifier) {
+        val strokeWidth = 2.dp.toPx()
+        val centerX = size.width / 2
+        val centerY = size.height / 2
+        
+        // 绘制向上的箭头
+        // 底部横线
+        drawLine(
+            color = color,
+            start = Offset(centerX - 9.dp.toPx(), centerY + 6.dp.toPx()),
+            end = Offset(centerX + 9.dp.toPx(), centerY + 6.dp.toPx()),
+            strokeWidth = strokeWidth
+        )
+        // 顶部横线
+        drawLine(
+            color = color,
+            start = Offset(centerX - 5.dp.toPx(), centerY - 6.5.dp.toPx()),
+            end = Offset(centerX + 5.dp.toPx(), centerY - 6.5.dp.toPx()),
+            strokeWidth = strokeWidth
+        )
+        // 中间竖线
+        drawLine(
+            color = color,
+            start = Offset(centerX, centerY - 3.dp.toPx()),
+            end = Offset(centerX, centerY + 6.dp.toPx()),
+            strokeWidth = strokeWidth
+        )
+    }
+}
+
+// 菜单图标（三条横线）
+@Composable
+fun MenuIcon(
+    color: Color,
+    modifier: Modifier = Modifier
+) {
+    Canvas(modifier = modifier) {
+        val strokeWidth = 2.dp.toPx()
+        val centerX = size.width / 2
+        val centerY = size.height / 2
+        val lineLength = 16.dp.toPx()
+        val spacing = 6.dp.toPx()
+        
+        // 绘制三条横线
+        drawLine(
+            color = color,
+            start = Offset(centerX - lineLength / 2, centerY - spacing),
+            end = Offset(centerX + lineLength / 2, centerY - spacing),
+            strokeWidth = strokeWidth
+        )
+        drawLine(
+            color = color,
+            start = Offset(centerX - lineLength / 2, centerY),
+            end = Offset(centerX + lineLength / 2, centerY),
+            strokeWidth = strokeWidth
+        )
+        drawLine(
+            color = color,
+            start = Offset(centerX - lineLength / 2, centerY + spacing),
+            end = Offset(centerX + lineLength / 2, centerY + spacing),
+            strokeWidth = strokeWidth
+        )
+    }
 }
 
 /**
@@ -705,7 +933,7 @@ fun AgentMenuModal(
             if (isSelf) {
                 MenuActionItem(
                     icon = R.drawable.rider_pro_moment_delete,
-                    text = "删除"
+                    text = stringResource(R.string.delete)
                 ) {
                     onDeleteClick()
                 }
@@ -781,3 +1009,96 @@ fun DeleteConfirmDialog(
         containerColor = AppColors.background
     )
 }
+
+/**
+ * 其他用户主页菜单弹窗
+ */
+@Composable
+fun OtherUserMenuModal(
+    onBlockClick: () -> Unit = {},
+    onReportClick: () -> Unit = {},
+    onCancelClick: () -> Unit = {},
+    onDismiss: () -> Unit = {}
+) {
+    val AppColors = LocalAppTheme.current
+    
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.BottomCenter
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 8.dp)
+                .padding(bottom = 11.dp)
+        ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(
+                    color = AppColors.background,
+                    shape = RoundedCornerShape(8.dp)
+                )
+        ) {
+            // 拉黑选项
+            androidx.compose.material3.TextButton(
+                onClick = {
+                    onBlockClick()
+                },
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Text(
+                    stringResource(R.string.block),
+                    color = AppColors.error,
+                    fontWeight = FontWeight.Bold,
+                    fontSize = 16.sp
+                )
+            }
+            
+            // 分割线
+            androidx.compose.material3.HorizontalDivider(
+                color = AppColors.divider,
+                thickness = 0.5.dp
+            )
+            
+            // 举报选项
+            androidx.compose.material3.TextButton(
+                onClick = {
+                    onReportClick()
+                    onDismiss()
+                },
+                modifier = Modifier.fillMaxWidth()
+            ) {
+                Text(
+                    stringResource(R.string.report),
+                    color = AppColors.error,
+                    fontWeight = FontWeight.Bold,
+                    fontSize = 16.sp
+                )
+            }
+        }
+        
+        Spacer(modifier = Modifier.height(8.dp))
+        
+        // 取消按钮
+        androidx.compose.material3.TextButton(
+            onClick = {
+                onCancelClick()
+                onDismiss()
+            },
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(
+                    color = AppColors.background,
+                    shape = RoundedCornerShape(8.dp)
+                )
+        ) {
+            Text(
+                stringResource(R.string.cancel),
+                color = AppColors.text,
+                fontSize = 16.sp
+            )
+        }
+        }
+    }
+}

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

@@ -37,9 +37,16 @@ import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.res.stringResource
 import com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
-
+import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel
+import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.utils.NetworkUtils
 @Composable
 fun GalleryItem(
     moment: MomentEntity,
@@ -129,8 +136,50 @@ fun GalleryGrid(
     val AppColors = LocalAppTheme.current
     val gridState = rememberLazyGridState()
     val debouncer = rememberDebouncer()
+    var refreshKey by remember { mutableStateOf(0) }
+    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
-    if (moments.isEmpty()) {
+    if (!isNetworkAvailable) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(vertical = 60.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Image(
+                painter = painterResource(id = R.mipmap.invalid_name_10),
+                contentDescription = "network error",
+                modifier = Modifier.size(181.dp),
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_title),
+                fontSize = 16.sp,
+                color = AppColors.text,
+                fontWeight = FontWeight.W600
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_subtitle),
+                fontSize = 14.sp,
+                color = AppColors.secondaryText,
+                fontWeight = FontWeight.W400
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            ReloadButton(
+                onClick = {
+                    refreshKey++
+                    MyProfileViewModel.ResetModel()
+                    MyProfileViewModel.loadProfile(pullRefresh = true)
+                }
+            )
+        }
+    } else if (moments.isEmpty()) {
         Column(
             modifier = Modifier
                 .fillMaxSize()
@@ -140,16 +189,17 @@ fun GalleryGrid(
         ) {
             Image(
                 painter = painterResource(
-                    id = if(AppState.darkMode) R.mipmap.qs_dt_qs_as_img
+                    id = if(AppState.darkMode) R.mipmap.shuihu_dark
-                    else R.mipmap.qs_dt_qs_img),
+                    else R.mipmap.invalid_name_7),
                 contentDescription = "暂无图片",
-                modifier = Modifier.size(181.dp),
+                modifier = Modifier
+                    .size(width = 181.dp, height = 153.dp),
             )
 
-            Spacer(modifier = Modifier.height(24.dp))
+            Spacer(modifier = Modifier.height(if(AppState.darkMode) 9.dp else 24.dp))
 
             Text(
-                text = "故事还没开始",
+                text = stringResource(R.string.your_story_not_started),
                 fontSize = 16.sp,
                 color = AppColors.text,
                 fontWeight = FontWeight.W600
@@ -158,7 +208,7 @@ fun GalleryGrid(
             Spacer(modifier = Modifier.height(8.dp))
 
             Text(
-                text = "发布一条动态，和世界打个招呼吧",
+                text = stringResource(R.string.publish_moment_greeting),
                 fontSize = 14.sp,
                 color = AppColors.secondaryText,
                 fontWeight = FontWeight.W400

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

@@ -0,0 +1,168 @@
+package com.aiosman.ravenow.ui.index.tabs.profile.composable
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Divider
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+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 com.aiosman.ravenow.R
+
+@Composable
+fun GroupChatEmptyContent() {
+    var selectedSegment by remember { mutableStateOf(0) } // 0: 全部, 1: 公开, 2: 私有
+    
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp)
+    ) {
+        // 分割线（紧贴上方栏）
+        Divider(
+            color = Color(0xFFF0F0F0), // 更浅的灰色
+            thickness = 1.dp,
+            modifier = Modifier.fillMaxWidth()
+        )
+        
+        Spacer(modifier = Modifier.height(16.dp))
+        
+        // 分段控制器
+        SegmentedControl(
+            selectedIndex = selectedSegment,
+            onSegmentSelected = { selectedSegment = it },
+            modifier = Modifier.fillMaxWidth()
+        )
+        
+        Spacer(modifier = Modifier.height(8.dp))
+        
+        // 空状态内容（居中）
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            // 空状态插图
+            EmptyStateIllustration()
+            
+            Spacer(modifier = Modifier.height(9.dp))
+            
+            // 空状态文本
+            Text(
+                text = stringResource(R.string.empty_nothing),
+                fontSize = 16.sp,
+                fontWeight = FontWeight.SemiBold,
+                color = Color(0xFF000000)
+            )
+        }
+    }
+}
+
+@Composable
+private fun SegmentedControl(
+    selectedIndex: Int,
+    onSegmentSelected: (Int) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier = modifier
+            .height(32.dp),
+        horizontalArrangement = Arrangement.Start,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        // 全部
+        SegmentButton(
+            text = stringResource(R.string.chat_all),
+            isSelected = selectedIndex == 0,
+            onClick = { onSegmentSelected(0) },
+            width = 54.dp
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 公开
+        SegmentButton(
+            text = stringResource(R.string.public_label),
+            isSelected = selectedIndex == 1,
+            onClick = { onSegmentSelected(1) },
+            width = 59.dp
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 私有
+        SegmentButton(
+            text = stringResource(R.string.private_label),
+            isSelected = selectedIndex == 2,
+            onClick = { onSegmentSelected(2) },
+            width = 54.dp
+        )
+    }
+}
+
+@Composable
+private fun SegmentButton(
+    text: String,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+    width: androidx.compose.ui.unit.Dp
+) {
+    Box(
+        modifier = Modifier
+            .width(width)
+            .height(32.dp)
+            .background(
+                color = if (isSelected) {
+                    Color(0xFF110C13) // RGB(17, 12, 19)
+                } else {
+                    Color(0x147C7480) // RGB(124, 116, 128, alpha 0.08)
+                },
+                shape = RoundedCornerShape(1000.dp)
+            )
+            .clickable(onClick = onClick),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            text = text,
+            fontSize = 13.sp,
+            fontWeight = FontWeight.Normal,
+            color = if (isSelected) Color(0xFFFFFFFF) else Color(0xFF000000)
+        )
+    }
+}
+
+@Composable
+private fun EmptyStateIllustration() {
+    Image(
+        painter = painterResource(id = R.mipmap.l_empty_img),
+        contentDescription = "空状态",
+        modifier = Modifier
+            .width(181.dp)
+            .height(153.dp),
+        contentScale = ContentScale.Fit
+    )
+}
+

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

@@ -50,8 +50,8 @@ fun OtherProfileAction(
     // 定义渐变色
     val followGradient = Brush.horizontalGradient(
         colors = listOf(
-            Color(0xFFE53E3E), // 红色
+            Color(0xFF7c45ed),
-            Color(0xFF9F7AEA)  // 紫色
+            Color(0x777c68ef)
         )
     )
     
@@ -98,9 +98,9 @@ fun OtherProfileAction(
                 }
         ) {
             Text(
-                text = if (profile.isFollowing) "已关注" else stringResource(R.string.follow_upper),
+                text = if (profile.isFollowing) stringResource(R.string.follow_upper_had) else stringResource(R.string.follow_upper),
                 fontSize = 14.sp,
-                fontWeight = FontWeight.W600,
+                fontWeight = FontWeight.W900,
                 color = if (profile.isFollowing) {
                     // 已关注状态 - 灰色文字
                     AppColors.text.copy(alpha = 0.6f)
@@ -133,11 +133,37 @@ fun OtherProfileAction(
                 Text(
                     text = stringResource(R.string.chat_upper),
                     fontSize = 14.sp,
-                    fontWeight = FontWeight.W600,
+                    fontWeight = FontWeight.W900,
                     color = AppColors.text, // 使用主题文字颜色
                 )
             }
         }
+
+        // 分享按钮 - 灰色背景样式
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center,
+            modifier = Modifier
+                .weight(1f)
+                .clip(RoundedCornerShape(8.dp))
+                .background(AppColors.nonActive)
+                .padding(horizontal = 16.dp, vertical = 12.dp)
+                .noRippleClickable {
+                    // 检查游客模式，如果是游客则跳转登录
+                    if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.CHAT_WITH_AGENT)) {
+                        navController.navigate(NavigationRoute.Login.route)
+                    } else {
+                        // TODO: 添加分享逻辑
+                    }
+                }
+        ) {
+            Text(
+                text = stringResource(R.string.share),
+                fontSize = 14.sp,
+                fontWeight = FontWeight.W900,
+                color = AppColors.text, // 使用主题文字颜色
+            )
+        }
     }
 
 }

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

@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -29,11 +30,13 @@ import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 @Composable
 fun SelfProfileAction(
     onEditProfile: () -> Unit,
-    onPremiumClick: (() -> Unit)? = null
+    onPremiumClick: (() -> Unit),
+    onShare: (() -> Unit)? = null
 ) {
     val AppColors = LocalAppTheme.current
     val editProfileDebouncer = rememberDebouncer()
     val premiumClickDebouncer = rememberDebouncer()
+    val shareDebouncer = rememberDebouncer()
 
     Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -45,52 +48,101 @@ fun SelfProfileAction(
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Center,
             modifier = Modifier
-                .weight(1f)
+                .width(60.dp).height(25.dp)
-                .clip(RoundedCornerShape(8.dp))
+                .clip(RoundedCornerShape(12.dp))
-                .background(AppColors.nonActive)
+                .background(androidx.compose.ui.graphics.Color(0x229284BD))
-                .padding(horizontal = 16.dp, vertical = 12.dp)
                 .noRippleClickable {
                     editProfileDebouncer {
                         onEditProfile()
                     }
                 }
         ) {
+            Image(
+                painter = painterResource(id = R.mipmap.fill_and_sign),
+                contentDescription = "",
+                modifier = Modifier.size(12.dp),
+                colorFilter = ColorFilter.tint(androidx.compose.ui.graphics.Color(0xFF9284BD))
+            )
+            Spacer(modifier = Modifier.width(4.dp))
             Text(
                 text = stringResource(R.string.edit_profile),
-                fontSize = 14.sp,
+                fontSize = 12.sp,
                 fontWeight = FontWeight.W600,
-                color = AppColors.text,
+                color = androidx.compose.ui.graphics.Color(0xFF9284BD),
             )
         }
 
-        // Rave Premium 按钮（右侧）
+//        // 预留按钮位置
-        Row(
+//        Row(
-            verticalAlignment = Alignment.CenterVertically,
+//            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.Center,
+//            horizontalArrangement = Arrangement.Center,
-            modifier = Modifier
+//            modifier = Modifier
-                .weight(1f)
+//                .weight(1f)
-                .clip(RoundedCornerShape(8.dp))
+//                .clip(RoundedCornerShape(10.dp))
-                .background(AppColors.premiumBackground)
+//                .padding(horizontal = 16.dp, vertical = 12.dp)
-                .padding(horizontal = 16.dp, vertical = 12.dp)
+//                .noRippleClickable {
-                .noRippleClickable {
+//
-                    premiumClickDebouncer {
+//                }
-                        onPremiumClick?.invoke()
+//        ) {
-                    }
+//            Text(
-                }
+//                text = "",
-        ) {
+//                fontSize = 14.sp,
-            Image(
+//                fontWeight = FontWeight.W900,
-                painter = painterResource(id = R.drawable.ic_member),
+//                color = AppColors.text,
-                contentDescription = "",
+//            )
-                modifier = Modifier.size(18.dp),
+//        }
-                colorFilter = ColorFilter.tint(AppColors.premiumText)
+//
-            )
+//        // 分享按钮
-            Spacer(modifier = Modifier.width(8.dp))
+//        Row(
-            Text(
+//            verticalAlignment = Alignment.CenterVertically,
-                text = "Rave Premium",
+//            horizontalArrangement = Arrangement.Center,
-                fontSize = 14.sp,
+//            modifier = Modifier
-                fontWeight = FontWeight.W600,
+//                .weight(1f)
-                color = AppColors.premiumText,
+//                .clip(RoundedCornerShape(10.dp))
-            )
+//                .background(AppColors.nonActive)
-        }
+//                .padding(horizontal = 16.dp, vertical = 12.dp)
+//                .noRippleClickable {
+//                    shareDebouncer {
+//                        // TODO: 添加分享逻辑
+//                    }
+//                }
+//        ) {
+//            Text(
+//                text = stringResource(R.string.share),
+//                fontSize = 14.sp,
+//                fontWeight = FontWeight.W900,
+//                color = AppColors.text,
+//            )
+//        }
+
+//        // Rave Premium 按钮（右侧）
+//        Row(
+//            verticalAlignment = Alignment.CenterVertically,
+//            horizontalArrangement = Arrangement.Center,
+//            modifier = Modifier
+//                .weight(1f)
+//                .clip(RoundedCornerShape(8.dp))
+//                .background(AppColors.premiumBackground)
+//                .padding(horizontal = 16.dp, vertical = 12.dp)
+//                .noRippleClickable {
+//                    premiumClickDebouncer {
+//                        onPremiumClick?.invoke()
+//                    }
+//                }
+//        ) {
+//            Image(
+//                painter = painterResource(id = R.drawable.ic_member),
+//                contentDescription = "",
+//                modifier = Modifier.size(18.dp),
+//                colorFilter = ColorFilter.tint(AppColors.premiumText)
+//            )
+//            Spacer(modifier = Modifier.width(8.dp))
+//            Text(
+//                text = "Rave Premium",
+//                fontSize = 14.sp,
+//                fontWeight = FontWeight.W600,
+//                color = AppColors.premiumText,
+//            )
+//        }
     }
 }

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

@@ -17,8 +17,10 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Divider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -29,6 +31,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -44,7 +47,10 @@ import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.entity.AgentEntity
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
+import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel
+import com.aiosman.ravenow.ui.network.ReloadButton
 import com.aiosman.ravenow.utils.DebounceUtils
+import com.aiosman.ravenow.utils.NetworkUtils
 
 @Composable
 fun UserAgentsList(
@@ -55,15 +61,14 @@ fun UserAgentsList(
 ) {
     val AppColors = LocalAppTheme.current
 
+    if (agents.isEmpty()) {
+        // 使用带分段控制器的空状态布局
+        AgentEmptyContentWithSegments()
+    } else {
         LazyColumn(
             modifier = modifier.fillMaxSize(),
             verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
-        if (agents.isEmpty()) {
-            item {
-                EmptyAgentsView()
-            }
-        } else {
             items(agents) { agent ->
                 UserAgentCard(
                     agent = agent,
@@ -71,13 +76,13 @@ fun UserAgentsList(
                     onAvatarClick = onAvatarClick
                 )
             }
-        }
             
             // 底部间距
             item {
                 Spacer(modifier = Modifier.height(120.dp))
             }
         }
+    }
 }
 
 @Composable
@@ -193,9 +198,182 @@ fun UserAgentCard(
     }
 }
 
+@Composable
+fun AgentEmptyContentWithSegments() {
+    var selectedSegment by remember { mutableStateOf(0) } // 0: 全部, 1: 公开, 2: 私有
+    val AppColors = LocalAppTheme.current
+    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+    
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp)
+    ) {
+        // 分割线（紧贴上方栏）
+        Divider(
+            color = Color(0xFFF0F0F0), // 更浅的灰色
+            thickness = 1.dp,
+            modifier = Modifier.fillMaxWidth()
+        )
+        
+        Spacer(modifier = Modifier.height(16.dp))
+        
+        // 分段控制器
+        AgentSegmentedControl(
+            selectedIndex = selectedSegment,
+            onSegmentSelected = { selectedSegment = it },
+            modifier = Modifier.fillMaxWidth()
+        )
+        
+        Spacer(modifier = Modifier.height(8.dp))
+        
+        // 空状态内容（使用智能体原本的图标和文字）
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            if (isNetworkAvailable) {
+                Image(
+                    painter = painterResource(
+                        id = if(AppState.darkMode) R.mipmap.ai_dark
+                        else R.mipmap.ai),
+                    contentDescription = "暂无Agent",
+                    modifier = Modifier
+                        .size(width = 181.dp, height = 153.dp)
+                        .align(Alignment.CenterHorizontally),
+                )
+
+                // 根据是否为深色模式调整间距
+                Spacer(modifier = Modifier.height(if(AppState.darkMode) 9.dp else 24.dp))
+
+                Text(
+                    text = stringResource(R.string.exclusive_ai_waiting),
+                    fontSize = 16.sp,
+                    color = AppColors.text,
+                    fontWeight = FontWeight.W600
+                )
+
+                Spacer(modifier = Modifier.height(8.dp))
+
+                Text(
+                    text = stringResource(R.string.ai_companion_not_tool),
+                    fontSize = 14.sp,
+                    color = AppColors.secondaryText,
+                    fontWeight = FontWeight.W400
+                )
+            } else {
+                Image(
+                    painter = painterResource(id = R.mipmap.invalid_name_10),
+                    contentDescription = "network error",
+                    modifier = Modifier.size(181.dp),
+                )
+
+                Spacer(modifier = Modifier.height(24.dp))
+
+                Text(
+                    text = stringResource(R.string.friend_chat_no_network_title),
+                    fontSize = 16.sp,
+                    color = AppColors.text,
+                    fontWeight = FontWeight.W600
+                )
+
+                Spacer(modifier = Modifier.height(8.dp))
+
+                Text(
+                    text = stringResource(R.string.friend_chat_no_network_subtitle),
+                    fontSize = 14.sp,
+                    color = AppColors.secondaryText,
+                    fontWeight = FontWeight.W400
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+                ReloadButton(
+                    onClick = {
+                        MyProfileViewModel.ResetModel()
+                        MyProfileViewModel.loadProfile(pullRefresh = true)
+                    }
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun AgentSegmentedControl(
+    selectedIndex: Int,
+    onSegmentSelected: (Int) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier = modifier
+            .height(32.dp),
+        horizontalArrangement = Arrangement.Start,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        // 全部
+        AgentSegmentButton(
+            text = stringResource(R.string.chat_all),
+            isSelected = selectedIndex == 0,
+            onClick = { onSegmentSelected(0) },
+            width = 54.dp
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 公开
+        AgentSegmentButton(
+            text = stringResource(R.string.public_label),
+            isSelected = selectedIndex == 1,
+            onClick = { onSegmentSelected(1) },
+            width = 59.dp
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 私有
+        AgentSegmentButton(
+            text = stringResource(R.string.private_label),
+            isSelected = selectedIndex == 2,
+            onClick = { onSegmentSelected(2) },
+            width = 54.dp
+        )
+    }
+}
+
+@Composable
+private fun AgentSegmentButton(
+    text: String,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+    width: androidx.compose.ui.unit.Dp
+) {
+    Box(
+        modifier = Modifier
+            .width(width)
+            .height(32.dp)
+            .background(
+                color = if (isSelected) {
+                    Color(0xFF110C13) // RGB(17, 12, 19)
+                } else {
+                    Color(0x147C7480) // RGB(124, 116, 128, alpha 0.08)
+                },
+                shape = RoundedCornerShape(1000.dp)
+            )
+            .clickable(onClick = onClick),
+        contentAlignment = Alignment.Center
+    ) {
+        Text(
+            text = text,
+            fontSize = 13.sp,
+            fontWeight = FontWeight.Normal,
+            color = if (isSelected) Color(0xFFFFFFFF) else Color(0xFF000000)
+        )
+    }
+}
+
 @Composable
 fun EmptyAgentsView() {
     val AppColors = LocalAppTheme.current
+    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
     Column(
         modifier = Modifier
@@ -203,15 +381,19 @@ fun EmptyAgentsView() {
             .padding(vertical = 60.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
+        if (isNetworkAvailable) {
             Image(
                 painter = painterResource(
-                id =if(AppState.darkMode) R.mipmap.qs_ai_qs_as_img
+                    id = if(AppState.darkMode) R.mipmap.ai_dark
-                else R.mipmap.qs_ai_qs_img),
+                    else R.mipmap.ai),
                 contentDescription = "暂无Agent",
-            modifier = Modifier.size(181.dp),
+                modifier = Modifier
+                    .size(width = 181.dp, height = 153.dp)
+                    .align(Alignment.CenterHorizontally),
             )
 
-        Spacer(modifier = Modifier.height(24.dp))
+// 根据是否为深色模式调整间距
+            Spacer(modifier = Modifier.height(if(AppState.darkMode) 9.dp else 24.dp))
 
             Text(
                 text = "专属AI等你召唤",
@@ -228,5 +410,37 @@ fun EmptyAgentsView() {
                 color = AppColors.secondaryText,
                 fontWeight = FontWeight.W400
             )
+        } else {
+            Image(
+                painter = painterResource(id = R.mipmap.invalid_name_10),
+                contentDescription = "network error",
+                modifier = Modifier.size(181.dp),
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_title),
+                fontSize = 16.sp,
+                color = AppColors.text,
+                fontWeight = FontWeight.W600
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_subtitle),
+                fontSize = 14.sp,
+                color = AppColors.secondaryText,
+                fontWeight = FontWeight.W400
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            ReloadButton(
+                onClick = {
+                    MyProfileViewModel.ResetModel()
+                    MyProfileViewModel.loadProfile(pullRefresh = true)
+                }
+            )
+        }
     }
 }

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

@@ -65,94 +65,94 @@ fun UserAgentsRow(
         viewModel.loadUserAgents(userId)
     }
     
-    // 总是显示智能体区域，即使没有数据也显示标题和状态
+//    // 总是显示智能体区域，即使没有数据也显示标题和状态
-    Column(
+//    Column(
-        modifier = modifier
+//        modifier = modifier
-            .fillMaxWidth()
+//            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
+//            .padding(horizontal = 16.dp)
-    ) {
+//    ) {
-        Text(
+//        Text(
-            text = if (isSelf) "我的智能体" else "TA的智能体",
+//            text = if (isSelf) "我的智能体" else "TA的智能体",
-            fontSize = 16.sp,
+//            fontSize = 16.sp,
-            fontWeight = FontWeight.W600,
+//            fontWeight = FontWeight.W600,
-            color = AppColors.text,
+//            color = AppColors.text,
-            modifier = Modifier.padding(bottom = 12.dp)
+//            modifier = Modifier.padding(bottom = 12.dp)
-        )
+//        )
-        
+//
-        when {
+//        when {
-            viewModel.isLoading -> {
+//            viewModel.isLoading -> {
-                // 显示加载状态
+//                // 显示加载状态
-                Box(
+//                Box(
-                    modifier = Modifier
+//                    modifier = Modifier
-                        .fillMaxWidth()
+//                        .fillMaxWidth()
-                        .height(60.dp),
+//                        .height(60.dp),
-                    contentAlignment = Alignment.Center
+//                    contentAlignment = Alignment.Center
-                ) {
+//                ) {
-                    Text(
+//                    Text(
-                        text = "加载中...",
+//                        text = "加载中...",
-                        fontSize = 14.sp,
+//                        fontSize = 14.sp,
-                        color = AppColors.text.copy(alpha = 0.6f)
+//                        color = AppColors.text.copy(alpha = 0.6f)
-                    )
+//                    )
-                }
+//                }
-            }
+//            }
-            viewModel.error != null -> {
+//            viewModel.error != null -> {
-                // 显示错误状态
+//                // 显示错误状态
-                Box(
+//                Box(
-                    modifier = Modifier
+//                    modifier = Modifier
-                        .fillMaxWidth()
+//                        .fillMaxWidth()
-                        .height(60.dp),
+//                        .height(60.dp),
-                    contentAlignment = Alignment.Center
+//                    contentAlignment = Alignment.Center
-                ) {
+//                ) {
-                    Text(
+//                    Text(
-                        text = "加载失败: ${viewModel.error}",
+//                        text = "加载失败: ${viewModel.error}",
-                        fontSize = 14.sp,
+//                        fontSize = 14.sp,
-                        color = AppColors.text.copy(alpha = 0.6f)
+//                        color = AppColors.text.copy(alpha = 0.6f)
-                    )
+//                    )
-                }
+//                }
-            }
+//            }
-            viewModel.agents.isEmpty() -> {
+//            viewModel.agents.isEmpty() -> {
-                // 显示空状态
+//                // 显示空状态
-                Box(
+//                Box(
-                    modifier = Modifier
+//                    modifier = Modifier
-                        .fillMaxWidth()
+//                        .fillMaxWidth()
-                        .height(60.dp),
+//                        .height(60.dp),
-                    contentAlignment = Alignment.Center
+//                    contentAlignment = Alignment.Center
-                ) {
+//                ) {
-                    Text(
+//                    Text(
-                        text = if (isSelf) "您还没有创建智能体" else "TA还没有创建智能体",
+//                        text = if (isSelf) "您还没有创建智能体" else "TA还没有创建智能体",
-                        fontSize = 14.sp,
+//                        fontSize = 14.sp,
-                        color = AppColors.text.copy(alpha = 0.6f)
+//                        color = AppColors.text.copy(alpha = 0.6f)
-                    )
+//                    )
-                }
+//                }
-            }
+//            }
-            else -> {
+//            else -> {
-                // 显示智能体列表
+//                // 显示智能体列表
-                LazyRow(
+//                LazyRow(
-                    horizontalArrangement = Arrangement.spacedBy(12.dp),
+//                    horizontalArrangement = Arrangement.spacedBy(12.dp),
-                    modifier = Modifier.fillMaxWidth()
+//                    modifier = Modifier.fillMaxWidth()
-                ) {
+//                ) {
-                    // 显示智能体项目
+//                    // 显示智能体项目
-                    items(viewModel.agents) { agent ->
+//                    items(viewModel.agents) { agent ->
-                        AgentItem(
+//                        AgentItem(
-                            agent = agent,
+//                            agent = agent,
-                            onClick = { onAgentClick(agent) },
+//                            onClick = { onAgentClick(agent) },
-                            onAvatarClick = { onAvatarClick(agent) },
+//                            onAvatarClick = { onAvatarClick(agent) },
-                            onLongClick = { onAgentLongClick(agent) }
+//                            onLongClick = { onAgentLongClick(agent) }
-                        )
+//                        )
-                    }
+//                    }
-                    
+//
-                    // 添加"更多"按钮
+//                    // 添加"更多"按钮
-                    item {
+//                    item {
-                        MoreAgentItem(
+//                        MoreAgentItem(
-                            onClick = onMoreClick
+//                            onClick = onMoreClick
-                        )
+//                        )
-                    }
+//                    }
-                }
+//                }
-            }
+//            }
-        }
+//        }
-        
+//
-        Spacer(modifier = Modifier.height(16.dp))
+//        Spacer(modifier = Modifier.height(16.dp))
-    }
+//    }
 }
 
 @OptIn(ExperimentalFoundationApi::class)

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

@@ -10,21 +10,14 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.pager.PagerState
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 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.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -52,7 +45,7 @@ fun UserContentPageIndicator(
                 .padding(horizontal = 16.dp),
             horizontalArrangement = Arrangement.SpaceEvenly
         ) {
-            // 图片/相册 Tab
+            // 动态 Tab
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 modifier = Modifier
@@ -64,15 +57,24 @@ fun UserContentPageIndicator(
                     }
                     .padding(vertical = 12.dp)
             ) {
-                Icon(
+                Text(
-                    painter = painterResource(id = R.drawable.rider_pro_images),
+                    text = stringResource(R.string.index_dynamic),
-                    contentDescription = "Gallery",
+                    fontSize = 16.sp,
-                    tint = if (pagerState.currentPage == 0) AppColors.text else AppColors.text.copy(alpha = 0.6f),
+                    fontWeight = if (pagerState.currentPage == 0) FontWeight.SemiBold else FontWeight.Medium,
-                    modifier = Modifier.size(24.dp)
+                    color = if (pagerState.currentPage == 0) Color(0xFF000000) else Color(0x993C3C43)
+                )
+                Spacer(modifier = Modifier.height(if (pagerState.currentPage == 0) 6.dp else 4.dp))
+                if (pagerState.currentPage == 0) {
+                    Box(
+                        modifier = Modifier
+                            .width(20.dp)
+                            .height(2.dp)
+                            .background(Color(0xFF000000))
                     )
                 }
+            }
             
-            // Agent Tab (只在非智能体用户时显示)
+            // 智能体 Tab (只在非智能体用户时显示)
             if (showAgentTab) {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
@@ -85,40 +87,54 @@ fun UserContentPageIndicator(
                         }
                         .padding(vertical = 12.dp)
                 ) {
-                    Icon(
+                    Text(
-                        painter = painterResource(id = R.drawable.rider_pro_nav_ai),
+                        text = stringResource(R.string.chat_ai),
-                        contentDescription = "Agents",
+                        fontSize = 16.sp,
-                        tint = if (pagerState.currentPage == 1) AppColors.text else AppColors.text.copy(alpha = 0.6f),
+                        fontWeight = if (pagerState.currentPage == 1) FontWeight.SemiBold else FontWeight.Medium,
-                        modifier = Modifier.size(24.dp)
+                        color = if (pagerState.currentPage == 1) Color(0xFF000000) else Color(0x993C3C43)
+                    )
+                    Spacer(modifier = Modifier.height(if (pagerState.currentPage == 1) 6.dp else 4.dp))
+                    if (pagerState.currentPage == 1) {
+                        Box(
+                            modifier = Modifier
+                                .width(20.dp)
+                                .height(2.dp)
+                                .background(Color(0xFF000000))
                         )
                     }
                 }
             }
             
-        // 下划线指示器
+            // 群聊 Tab (只在非智能体用户时显示)
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp)
-        ) {
-            Box(
-                modifier = Modifier
-                    .weight(1f)
-                    .height(2.dp)
-                    .background(
-                        if (pagerState.currentPage == 0) AppColors.text else Color.Transparent
-                    )
-            )
             if (showAgentTab) {
-                Box(
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
                     modifier = Modifier
                         .weight(1f)
+                        .noRippleClickable {
+                            scope.launch {
+                                pagerState.scrollToPage(2)
+                            }
+                        }
+                        .padding(vertical = 12.dp)
+                ) {
+                    Text(
+                        text = stringResource(R.string.chat_group),
+                        fontSize = 16.sp,
+                        fontWeight = if (pagerState.currentPage == 2) FontWeight.SemiBold else FontWeight.Medium,
+                        color = if (pagerState.currentPage == 2) Color(0xFF000000) else Color(0x993C3C43)
+                    )
+                    Spacer(modifier = Modifier.height(if (pagerState.currentPage == 2) 6.dp else 4.dp))
+                    if (pagerState.currentPage == 2) {
+                        Box(
+                            modifier = Modifier
+                                .width(20.dp)
                                 .height(2.dp)
-                        .background(
+                                .background(Color(0xFF000000))
-                            if (pagerState.currentPage == 1) AppColors.text else Color.Transparent
-                        )
                         )
                     }
                 }
             }
+        }
+    }
 }

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

@@ -1,26 +1,39 @@
 package com.aiosman.ravenow.ui.index.tabs.profile.composable
 
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 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.ColorFilter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.LocalNavController
 import com.aiosman.ravenow.R
@@ -29,23 +42,52 @@ import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import java.text.NumberFormat
+import java.util.Locale
 
 @Composable
 fun UserItem(
     accountProfileEntity: AccountProfileEntity,
-    postCount: Int = 0
+    postCount: Long = 0,
+    isSelf: Boolean = false,
+    onEditClick: () -> Unit = {}
 ) {
     val navController = LocalNavController.current
     val AppColors = LocalAppTheme.current
     val followerDebouncer = rememberDebouncer()
     val followingDebouncer = rememberDebouncer()
     
+    // 获取 MBTI 和星座信息
+    val mbti = remember(accountProfileEntity.id) {
+        AppStore.getUserMbti(accountProfileEntity.id)
+    }
+    val zodiac = remember(accountProfileEntity.id) {
+        AppStore.getUserZodiac(accountProfileEntity.id)
+    }
+    
+    // 格式化粉丝数
+    val numberFormat = remember { NumberFormat.getNumberInstance(Locale.getDefault()) }
+    val formattedFollowerCount = remember(accountProfileEntity.followerCount) {
+        if (accountProfileEntity.followerCount >= 10000) {
+            val wan = accountProfileEntity.followerCount / 10000.0
+            if (wan >= 100) {
+                "${wan.toInt()}万"
+            } else {
+                String.format("%.1f万", wan)
+            }
+        } else {
+            numberFormat.format(accountProfileEntity.followerCount)
+        }
+    }
+
     Column(
         modifier = Modifier
             .fillMaxWidth()
     ) {
+        // 顶部：头像和统计数据
         Row(
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(16.dp)
         ) {
             // 头像
             CustomAsyncImage(
@@ -53,39 +95,47 @@ fun UserItem(
                 accountProfileEntity.avatar,
                 modifier = Modifier
                     .clip(CircleShape)
-                    .size(48.dp),
+                    .size(96.dp),
                 contentDescription = "",
                 contentScale = ContentScale.Crop
             )
-            Spacer(modifier = Modifier.width(32.dp))
+            
-            //个人统计
+            // 统计数据
             Row(
-                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier.weight(1f),
-                modifier = Modifier.weight(1f)
+                horizontalArrangement = Arrangement.spacedBy(0.dp),
+                verticalAlignment = Alignment.CenterVertically
             ) {
                 // 帖子数
                 Column(
+                    modifier = Modifier
+                        .width(80.dp)
+                        .height(40.dp),
                     horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.weight(1f)
+                    verticalArrangement = Arrangement.Center
                 ) {
                     Text(
                         text = postCount.toString(),
-                        fontWeight = FontWeight.W600,
+                        fontWeight = FontWeight.Medium,
-                        fontSize = 16.sp,
+                        fontSize = 15.sp,
-                        color = AppColors.text
+                        color = Color(0xFF000000),
+                        textAlign = TextAlign.Center
                     )
-                    Spacer(modifier = Modifier.height(8.dp))
+                    Spacer(modifier = Modifier.height(2.dp))
                     Text(
-                        text = "帖子",
+                        text = stringResource(R.string.posts),
-                        color = AppColors.text
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 11.sp,
+                        color = Color(0xFF000000),
+                        textAlign = TextAlign.Center
                     )
                 }
 
                 // 粉丝数
                 Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
                     modifier = Modifier
-                        .weight(1f)
+                        .width(80.dp)
+                        .height(40.dp)
                         .noRippleClickable {
                             followerDebouncer {
                                 navController.navigate(
@@ -95,26 +145,33 @@ fun UserItem(
                                     )
                                 )
                             }
-                        }
+                        },
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
                 ) {
                     Text(
-                        text = accountProfileEntity.followerCount.toString(),
+                        text = formattedFollowerCount,
-                        fontWeight = FontWeight.W600,
+                        fontWeight = FontWeight.Medium,
-                        fontSize = 16.sp,
+                        fontSize = 15.sp,
-                        color = AppColors.text
+                        color = Color(0xFF000000),
+                        textAlign = TextAlign.Center
                     )
-                    Spacer(modifier = Modifier.height(8.dp))
+                    Spacer(modifier = Modifier.height(2.dp))
                     Text(
-                        text = "粉丝",
+                        text = stringResource(R.string.followers_upper),
-                        color = AppColors.text
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 11.sp,
+                        color = Color(0xFF000000),
+                        textAlign = TextAlign.Center
                     )
                 }
 
                 // 关注数
                 Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
                     modifier = Modifier
-                        .weight(1f)
+                        .width(80.dp)
+                        .height(40.dp)
+                        .offset(x = 6.dp)
                         .noRippleClickable {
                             followingDebouncer {
                                 navController.navigate(
@@ -124,49 +181,161 @@ fun UserItem(
                                     )
                                 )
                             }
-                        }
+                        },
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
                 ) {
                     Text(
                         text = accountProfileEntity.followingCount.toString(),
-                        fontWeight = FontWeight.W600,
+                        fontWeight = FontWeight.Medium,
-                        fontSize = 16.sp,
+                        fontSize = 15.sp,
-                        color = AppColors.text
+                        color = Color(0xFF000000),
+                        textAlign = TextAlign.Center
                     )
-                    Spacer(modifier = Modifier.height(8.dp))
+                    Spacer(modifier = Modifier.height(2.dp))
                     Text(
-                        text = "关注",
+                        text = stringResource(R.string.following_upper),
-                        color = AppColors.text
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 11.sp,
+                        color = Color(0xFF000000),
+                        textAlign = TextAlign.Center
                     )
                 }
             }
         }
-        Spacer(modifier = Modifier.height(12.dp))
-        // 昵称
-        Text(
-            text = accountProfileEntity.nickName,
-            fontWeight = FontWeight.W600,
-            fontSize = 16.sp,
-            color = AppColors.text
-        )
-        Spacer(modifier = Modifier.height(4.dp))
-        // 个人简介
-        if (accountProfileEntity.bio.isNotEmpty()){
-            Text(
-                text = accountProfileEntity.bio,
-                fontSize = 14.sp,
-                color = AppColors.secondaryText,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
-        }else{
-            Text(
-                text = "No bio here.",
-                fontSize = 14.sp,
-                color = AppColors.secondaryText,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
-            )
-        }
-    }
         
+        Spacer(modifier = Modifier.height(12.dp))
+        
+        // 中间：昵称、简介、创建者信息
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            // 昵称
+            Text(
+                text = accountProfileEntity.nickName,
+                fontWeight = FontWeight.Bold,
+                fontSize = 22.sp,
+                letterSpacing = (-0.3).sp,
+                color = Color(0xFF000000)
+            )
+            
+            Spacer(modifier = Modifier.height(4.dp))
+            
+            // 个人简介
+            if (accountProfileEntity.bio.isNotEmpty()) {
+                Text(
+                    text = accountProfileEntity.bio,
+                    fontSize = 13.sp,
+                    color = Color(0x993C3C43), // 60/255, 60/255, 67/255, alpha 0.6
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis
+                )
+            } else {
+                Text(
+                    text = "Welcome to my fantiac word i will show you something about magic",
+                    fontSize = 13.sp,
+                    color = Color(0x993C3C43),
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+            
+            // 创建者信息（如果是 AI 账户，可以显示创建者）
+            // 注意：当前 AccountProfileEntity 没有创建者字段，这里暂时留空
+            // 如果需要显示，需要从其他地方获取创建者信息
+        }
+        
+        Spacer(modifier = Modifier.height(12.dp))
+        
+        // 底部：标签按钮
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            // MBTI 标签
+            if (!mbti.isNullOrEmpty()) {
+                ProfileTag(
+                    text = mbti,
+                    backgroundColor = Color(0x33FF8D28), // 255/255, 141/255, 40/255, alpha 0.2
+                    textColor = Color(0xFF000000)
+                )
+            }
+            
+            // 星座标签
+            if (!zodiac.isNullOrEmpty()) {
+                ProfileTag(
+                    text = zodiac,
+                    backgroundColor = Color(0x33FFCC00), // 255/255, 204/255, 0/255, alpha 0.2
+                    textColor = Color(0xFF000000)
+                )
+            }
+            
+            // 编辑标签（仅自己可见）
+            if (isSelf) {
+                ProfileTag(
+                    text = stringResource(R.string.edit_profile),
+                    backgroundColor = Color(0x14947A80), // 124/255, 116/255, 128/255, alpha 0.08
+                    textColor = Color(0xFF9284BD), // 146/255, 132/255, 189/255
+                    leadingIcon = {
+                        EditIcon(
+                            color = Color(0xFF9284BD),
+                            modifier = Modifier.size(16.dp)
+                        )
+                    },
+                    onClick = onEditClick
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun ProfileTag(
+    text: String,
+    backgroundColor: Color,
+    textColor: Color,
+    leadingIcon: (@Composable () -> Unit)? = null,
+    onClick: (() -> Unit)? = null
+) {
+    Box(
+        modifier = Modifier
+            .height(25.dp)
+            .clip(RoundedCornerShape(12.dp))
+            .background(backgroundColor)
+            .then(
+                if (onClick != null) {
+                    Modifier.clickable(onClick = onClick)
+                } else {
+                    Modifier
+                }
+            )
+            .padding(horizontal = 8.dp, vertical = 4.dp),
+        contentAlignment = Alignment.Center
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            leadingIcon?.invoke()
+            Text(
+                text = text,
+                fontSize = 12.sp,
+                color = textColor
+            )
+        }
+    }
+}
+
+@Composable
+private fun EditIcon(
+    color: Color,
+    modifier: Modifier = Modifier
+) {
+    Image(
+        painter = painterResource(id = R.mipmap.bi),
+        contentDescription = stringResource(R.string.edit_profile),
+        modifier = modifier,
+        colorFilter = ColorFilter.tint(color)
+    )
 }

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchScreen.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
@@ -28,6 +29,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Icon
 import androidx.compose.material.Tab
 import androidx.compose.material.TabRow
@@ -44,6 +47,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalContext
@@ -53,6 +57,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -70,6 +75,7 @@ import com.aiosman.ravenow.ui.index.tabs.message.tab.AgentChatListViewModel
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.launch
+import com.aiosman.ravenow.utils.NetworkUtils
 
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -304,6 +310,7 @@ fun MomentResultTab() {
     var dataFlow = model.momentsFlow
     var moments = dataFlow.collectAsLazyPagingItems()
     val AppColors = LocalAppTheme.current
+    val context = LocalContext.current
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -317,10 +324,13 @@ fun MomentResultTab() {
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center
             ) {
+                val isNetworkAvailable = NetworkUtils.isNetworkAvailable(context)
+
+                if (isNetworkAvailable) {
                 androidx.compose.foundation.Image(
                     painter = painterResource(
                         id = if(AppState.darkMode) R.mipmap.syss_yh_qs_as_img
-                        else R.mipmap.syss_yh_qs_img),
+                        else R.mipmap.invalid_name_1),
                     contentDescription = "No Comment",
                     modifier = Modifier.size(140.dp)
                 )
@@ -337,6 +347,33 @@ fun MomentResultTab() {
                     fontSize = 14.sp,
                     fontWeight = FontWeight.W400
                 )
+            } else {
+                    androidx.compose.foundation.Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(140.dp)
+                    )
+                    Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = LocalAppTheme.current.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = LocalAppTheme.current.secondaryText,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.size(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            SearchViewModel.ResetModel()
+                            SearchViewModel.search()
+                        }
+                    )
+                }
             }
         } else {
             LazyColumn(
@@ -369,6 +406,7 @@ fun UserResultTab() {
     val model = SearchViewModel
     val users = model.usersFlow.collectAsLazyPagingItems()
     val scope = rememberCoroutineScope()
+    val context = LocalContext.current
     Box(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -380,10 +418,13 @@ fun UserResultTab() {
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center
             ) {
+                val isNetworkAvailable = NetworkUtils.isNetworkAvailable(context)
+
+                if (isNetworkAvailable) {
                 androidx.compose.foundation.Image(
                     painter = painterResource(
                         id = if(AppState.darkMode) R.mipmap.syss_yh_qs_as_img
-                        else R.mipmap.syss_yh_qs_img),
+                        else R.mipmap.invalid_name_1),
                     contentDescription = "No Comment",
                     modifier = Modifier.size(140.dp)
                 )
@@ -400,6 +441,33 @@ fun UserResultTab() {
                     fontSize = 14.sp,
                     fontWeight = FontWeight.W400
                 )
+            } else {
+                    androidx.compose.foundation.Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(140.dp)
+                    )
+                    Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = LocalAppTheme.current.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = LocalAppTheme.current.secondaryText,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.size(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            SearchViewModel.ResetModel()
+                            SearchViewModel.search()
+                        }
+                    )
+                }
             }
         } else {
             LazyColumn(
@@ -497,3 +565,42 @@ fun UserItem(
         }
     }
 }
+@Composable
+fun ReloadButton(
+    onClick: () -> Unit
+) {
+    val gradientBrush = Brush.linearGradient(
+        colors = listOf(
+            Color(0xFF7c45ed),
+            Color(0xFF7c68ef),
+            Color(0xFF7bd8f8)
+        )
+    )
+
+    Button(
+        onClick = onClick,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 120.dp)
+            .height(48.dp),
+        shape = RoundedCornerShape(30.dp),
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = Color.Transparent
+        ),
+        contentPadding = PaddingValues(0.dp)
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(gradientBrush),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text =  stringResource(R.string.Reload),
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Bold,
+                color = Color.White,
+            )
+        }
+    }
+}

app/src/main/java/com/aiosman/ravenow/ui/like/LikePage.kt

@@ -39,15 +39,14 @@ import com.aiosman.ravenow.R
 import com.aiosman.ravenow.entity.AccountLikeEntity
 import com.aiosman.ravenow.exp.timeAgo
 import com.aiosman.ravenow.ui.NavigationRoute
-import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.BottomNavigationPlaceholder
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
-import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
 import java.util.Date
-
+import com.aiosman.ravenow.utils.NetworkUtils
+import com.aiosman.ravenow.ui.network.ReloadButton
 @Preview
 @Composable
 fun LikeNoticeScreen() {
@@ -72,18 +71,47 @@ fun LikeNoticeScreen() {
                 .background(color = AppColors.background)
                 .padding(horizontal = 16.dp)
         ) {
+
+            val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+            if (!isNetworkAvailable) {
                 Box(
-                modifier = Modifier
+                    modifier = Modifier.fillMaxSize()
-                    .fillMaxWidth()
+                        .padding(top=149.dp),
-                    .padding(vertical = 16.dp)
+                    contentAlignment = Alignment.TopCenter
                 ) {
-                NoticeScreenHeader(
+                    Column(
-                    stringResource(R.string.like_upper),
+                        modifier = Modifier.fillMaxWidth(),
-                    moreIcon = false
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Image(
+                            painter = painterResource(id = R.mipmap.invalid_name_10),
+                            contentDescription = "network error",
+                            modifier = Modifier.size(181.dp)
+                        )
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_title),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600,
+                        )
+                        Spacer(modifier = Modifier.size(8.dp))
+                        Text(
+                            text = stringResource(R.string.friend_chat_no_network_subtitle),
+                            color = AppColors.text,
+                            fontSize = 14.sp,
+                            fontWeight = FontWeight.W400
+                        )
+                        Spacer(modifier = Modifier.height(16.dp))
+                        ReloadButton(
+                            onClick = {
+                                LikeNoticeViewModel.reload(force = true)
+                            }
                         )
                     }
-
+                }
-            if (likes.itemCount == 0) {
+            } else if (likes.itemCount == 0) {
                 Box(
                     modifier = Modifier.fillMaxSize()
                         .padding(top=149.dp),
@@ -95,14 +123,15 @@ fun LikeNoticeScreen() {
                     ) {
                         Image(
                             painter = painterResource(
-                                id =if(AppState.darkMode) R.mipmap.qst_z_qs_as_img
+                                id = if(AppState.darkMode) R.mipmap.sanqiu_dark
-                                else R.mipmap.qst_z_qs_img),
+                                else R.mipmap.invalid_name_6),
                             contentDescription = "No Notice",
-                            modifier = Modifier.size(181.dp)
+                            modifier = Modifier
+                                .size(width = 181.dp, height = 153.dp)
                         )
-                        Spacer(modifier = Modifier.height(24.dp))
+                        Spacer(modifier = Modifier.height(if (AppState.darkMode) 9.dp else 24.dp))
                         Text(
-                            text = "你的赞在路上～",
+                            text = "你的赞在赶来的路上",
                             color = AppColors.text,
                             fontSize = 16.sp,
                             fontWeight = FontWeight.W600,

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

@@ -1,15 +1,19 @@
 package com.aiosman.ravenow.ui.login
 
 import android.widget.Toast
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -19,9 +23,13 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
+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 com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.LocalAppTheme
@@ -33,25 +41,28 @@ import com.aiosman.ravenow.data.ServiceException
 import com.aiosman.ravenow.data.AccountServiceImpl
 import com.aiosman.ravenow.data.api.getErrorMessageCode
 import com.aiosman.ravenow.ui.NavigationRoute
-import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.ActionButton
 import com.aiosman.ravenow.ui.composables.CheckboxWithLabel
 import com.aiosman.ravenow.ui.composables.PolicyCheckbox
 import com.aiosman.ravenow.ui.composables.StatusBarSpacer
 import com.aiosman.ravenow.ui.composables.TextInputField
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.utils.PasswordValidator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
+private val LightGrayBackground = Color(red = 250f / 255f, green = 249f / 255f, blue = 251f / 255f)
+private val IconGray = Color(red = 151f / 255f, green = 148f / 255f, blue = 153f / 255f)
+private val PurpleButton = Color(0xFF7C45ED)
+
 @Composable
 fun EmailSignupScreen() {
-    var appColor = LocalAppTheme.current
+    val appColor = LocalAppTheme.current
     var email by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
     var confirmPassword by remember { mutableStateOf("") }
     var rememberMe by remember { mutableStateOf(false) }
     var acceptTerms by remember { mutableStateOf(false) }
-    var acceptPromotions by remember { mutableStateOf(false) }
     val scope = rememberCoroutineScope()
     val navController = LocalNavController.current
     val context = LocalContext.current
@@ -60,14 +71,13 @@ fun EmailSignupScreen() {
     var passwordError by remember { mutableStateOf<String?>(null) }
     var confirmPasswordError by remember { mutableStateOf<String?>(null) }
     var termsError by remember { mutableStateOf<Boolean>(false) }
-    var promotionsError by remember { mutableStateOf<Boolean>(false) }
     fun validateForm(): Boolean {
         emailError = when {
             // 非空
             email.isEmpty() -> context.getString(R.string.text_error_email_required)
             // 邮箱格式
             !android.util.Patterns.EMAIL_ADDRESS.matcher(email)
-                .matches() -> context.getString(R.string.text_error_email_format)
+                .matches() -> context.getString(R.string.text_error_email_format_1)
 
             else -> null
         }
@@ -88,22 +98,8 @@ fun EmailSignupScreen() {
             }
             termsError = true
             return false
-        } else {
+        }
         termsError = false
-        }
-        if (!acceptPromotions) {
-            scope.launch(Dispatchers.Main) {
-                Toast.makeText(
-                    context,
-                    context.getString(R.string.error_not_accept_recive_notice),
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-            promotionsError = true
-            return false
-        } else {
-            promotionsError = false
-        }
 
         return emailError == null && passwordError == null && confirmPasswordError == null
     }
@@ -158,63 +154,127 @@ fun EmailSignupScreen() {
     }
 
     Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
             .fillMaxSize()
             .background(appColor.background)
     ) {
         StatusBarSpacer()
-        Box(
+        // 顶部导航栏：返回箭头 + "注册"标题，左对齐
+        Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = 16.dp, start = 16.dp, end = 16.dp)
+                .padding(top = 15.dp, start = 16.dp, bottom = 15.dp, end = 16.dp),
+            verticalAlignment = Alignment.CenterVertically
         ) {
-            NoticeScreenHeader(stringResource(R.string.sign_up_upper), moreIcon = false)
+            Image(
+                painter = painterResource(id = R.drawable.rider_pro_back_icon),
+                contentDescription = "Back",
+                modifier = Modifier
+                    .size(24.dp)
+                    .noRippleClickable {
+                        navController.navigateUp()
+                    },
+                colorFilter = ColorFilter.tint(Color.Black)
+            )
+            Spacer(modifier = Modifier.width(8.dp))
+            Text(
+                text = stringResource(R.string.sign_up_upper),
+                fontSize = 20.sp,
+                fontWeight = FontWeight.W600,
+                color = Color.Black
+            )
         }
-        Spacer(modifier = Modifier.padding(32.dp))
+        
+        // 输入区域
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .weight(1f)
-                .padding(horizontal = 24.dp)
+                .padding(horizontal = 0.dp)
         ) {
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            // 邮箱输入框
             TextInputField(
                 modifier = Modifier
-                    .fillMaxWidth(),
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp),
                 text = email,
                 onValueChange = {
                     email = it
                 },
-                hint = stringResource(R.string.text_hint_email),
+                label = stringResource(R.string.login_email_label),
-                error = emailError
+                hint = "输入电子邮件",
+                error = emailError,
+                leadingIcon = {
+                    Image(
+                        painter = painterResource(id = R.mipmap.icon_email_light),
+                        contentDescription = "Email",
+                        modifier = Modifier.size(24.dp),
+                        colorFilter = ColorFilter.tint(IconGray)
                     )
-            Spacer(modifier = Modifier.padding(4.dp))
+                },
+                customBackgroundColor = LightGrayBackground,
+                customCornerRadius = 16f
+            )
+            
+            // 密码输入框
             TextInputField(
                 modifier = Modifier
-                    .fillMaxWidth(),
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp),
                 text = password,
                 onValueChange = {
                     password = it
                 },
                 password = true,
+                label = stringResource(R.string.text_hint_password).replace("输入", ""),
                 hint = stringResource(R.string.text_hint_password),
-                error = passwordError
+                error = passwordError,
+                leadingIcon = {
+                    Image(
+                        painter = painterResource(id = R.mipmap.icon_lock_light),
+                        contentDescription = "Lock",
+                        modifier = Modifier.size(24.dp),
+                        colorFilter = ColorFilter.tint(IconGray)
                     )
-            Spacer(modifier = Modifier.padding(4.dp))
+                },
+                customBackgroundColor = LightGrayBackground,
+                customCornerRadius = 16f
+            )
+            
+            // 确认密码输入框
             TextInputField(
                 modifier = Modifier
-                    .fillMaxWidth(),
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp),
                 text = confirmPassword,
                 onValueChange = {
                     confirmPassword = it
                 },
                 password = true,
-                hint = stringResource(R.string.text_hint_confirm_password),
+                label = stringResource(R.string.confirm_password_label),
-                error = confirmPasswordError
+                hint = stringResource(R.string.text_hint_password),
+                error = confirmPasswordError,
+                leadingIcon = {
+                    Image(
+                        painter = painterResource(id = R.mipmap.icon_lock_light),
+                        contentDescription = "Lock",
+                        modifier = Modifier.size(24.dp),
+                        colorFilter = ColorFilter.tint(IconGray)
                     )
-            Spacer(modifier = Modifier.height(8.dp))
+                },
+                customBackgroundColor = LightGrayBackground,
+                customCornerRadius = 16f
+            )
+            
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            // 功能选项区域
             Column(
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp),
                 horizontalAlignment = Alignment.Start,
             ) {
                 CheckboxWithLabel(
@@ -236,42 +296,31 @@ fun EmailSignupScreen() {
                         termsError = false
                     }
                 }
-                Spacer(modifier = Modifier.height(16.dp))
-                CheckboxWithLabel(
-                    checked = acceptPromotions,
-                    checkSize = 16,
-                    fontSize = 12,
-                    label = stringResource(R.string.agree_promotion),
-                    error = promotionsError
-                ) {
-                    acceptPromotions = it
-                    // 当用户勾选时，立即清除错误状态
-                    if (it) {
-                        promotionsError = false
-                    }
-                }
             }
 
-            Spacer(modifier = Modifier.height(32.dp))
+            Spacer(modifier = Modifier.height(76.dp))
+            
+            // 底部注册按钮
             Box(
-                modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp),
                 contentAlignment = Alignment.Center
             ) {
                 ActionButton(
-                    modifier = Modifier
+                    modifier = Modifier.fillMaxWidth(),
-                        .width(345.dp),
+                    text = stringResource(R.string.sign_up_upper),
-                    text = stringResource(R.string.lets_ride_upper),
+                    backgroundColor = PurpleButton,
-                    backgroundColor = Color(0xffda3832),
+                    color = Color.White,
-                    color = Color.White
+                    fontSize = 17.sp,
+                    fontWeight = FontWeight.W600
                 ) {
                     scope.launch(Dispatchers.IO) {
                         registerUser()
                     }
                 }
             }
-
         }
-
     }
 
 }

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

@@ -6,9 +6,11 @@ import android.util.Log
 import android.widget.Toast
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.rememberScrollableState
 import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -40,12 +42,14 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -70,6 +74,11 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.LottieConstants
+import com.airbnb.lottie.compose.rememberLottieComposition
+
 @Preview
 @Composable
 fun LoginPage() {
@@ -209,14 +218,14 @@ fun LoginPage() {
                     saveData()
                 }
                 
-                // 显示成功提示
+//                // 显示成功提示
-                coroutineScope.launch(Dispatchers.Main) {
+//                coroutineScope.launch(Dispatchers.Main) {
-                    Toast.makeText(
+//                    Toast.makeText(
-                        context,
+//                        context,
-                        "游客登录成功",
+//                        "游客登录成功",
-                        Toast.LENGTH_SHORT
+//                        Toast.LENGTH_SHORT
-                    ).show()
+//                    ).show()
-                }
+//                }
                 
                 // 初始化应用状态（游客模式会自动跳过推送和TRTC初始化）
                 try {
@@ -259,14 +268,38 @@ fun LoginPage() {
         modifier = Modifier
             .fillMaxSize()
             .background(AppColors.background)
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 24.dp)
+                .padding(top = 60.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
         ) {
             Box(
                 modifier = Modifier
-                .fillMaxSize()
+                    .size(30.dp)
+                    .background(
+                        color = AppColors.text.copy(alpha = 0.1f),
+                        shape = androidx.compose.foundation.shape.CircleShape
+                    )
+                    .noRippleClickable {
+                        guestLogin()
+                    },
+                contentAlignment = Alignment.Center
             ) {
-            val localContext = LocalContext.current // 获取 Context
+                Image(
-            MovingImageWall(localContext.resources) // 将 resources 传递给 MovingImageWall
+                    painter = painterResource(id = R.drawable.rider_pro_close),
+                    contentDescription = "Close",
+                    modifier = Modifier.size(16.dp),
+                    colorFilter = ColorFilter.tint(AppColors.text)
+                )
             }
+        }
+
+
+        Spacer(modifier = Modifier.height(20.dp))
         Column(
             modifier = Modifier
                 .fillMaxSize()
@@ -274,78 +307,109 @@ fun LoginPage() {
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Spacer(modifier = Modifier.weight(1f))
-            Image(
+            Box(
-                painter = painterResource(id = R.mipmap.invalid_name),
-                contentDescription = "Rave Now",
                 modifier = Modifier
-                    .size(52.dp)
+                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(10.dp))
+                    .height(400.dp)
+
+            ) {
+                val lottieFile = if (AppState.darkMode) "login.lottie" else "login_light.lottie"
+                LottieAnimation(
+                    composition = rememberLottieComposition(LottieCompositionSpec.Asset(lottieFile)).value,
+                    iterations = LottieConstants.IterateForever,
+                    modifier = Modifier.fillMaxSize()
                 )
-            Spacer(modifier = Modifier.height(8.dp))
+            }
             Text(
-                "Rave Now",
+                text = stringResource(R.string.join_party_carnival),
-                fontSize = 28.sp,
+                fontSize = 17.sp,
-                fontWeight = FontWeight.W900,
+                fontWeight = FontWeight.W600,
                 color = AppColors.text
             )
-            Spacer(modifier = Modifier.height(16.dp))
+//            Image(
-            Text(
+//                painter = painterResource(id = R.mipmap.invalid_name),
-                "Your Night Starts Here",
+//                contentDescription = "Rave Now",
-                fontSize = 20.sp,
+//                modifier = Modifier
-                fontWeight = FontWeight.W700,
+//                    .size(52.dp)
-                color = AppColors.text
+//                    .clip(RoundedCornerShape(10.dp))
-            )
+//            )
-            Spacer(modifier = Modifier.height(8.dp))
+//            Spacer(modifier = Modifier.height(8.dp))
+//            Text(
+//                "Rave Now",
+//                fontSize = 28.sp,
+//                fontWeight = FontWeight.W900,
+//                color = AppColors.text
+//            )
+//            Spacer(modifier = Modifier.height(16.dp))
+//            Text(
+//                "Your Night Starts Here",
+//                fontSize = 20.sp,
+//                fontWeight = FontWeight.W700,
+//                color = AppColors.text
+//            )
+            //注册tab
+            Spacer(modifier = Modifier.height(48.dp))
             ActionButton(
                 modifier = Modifier.fillMaxWidth(),
                 text = stringResource(R.string.sign_up_upper),
-                color = AppColors.mainText,
+                color = if (AppState.darkMode) Color.Black else Color.White,
-                backgroundColor = AppColors.main
+                backgroundColor = if (AppState.darkMode) Color.White else Color.Black
             ) {
                 navController.navigate(
                     NavigationRoute.EmailSignUp.route,
                 )
             }
-            if (showGoogleLogin) {
+           //谷歌登录tab
                 Spacer(modifier = Modifier.height(16.dp))
                 ActionButton(
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(52.dp)
+                        .border(
+                            width = 1.5.dp,
+                            color = if (AppState.darkMode) Color.White else Color.Black,
+                            shape = RoundedCornerShape(24.dp)
+                        ),
                     text = stringResource(R.string.sign_in_with_google),
-                    color = AppColors.text,
+                    color = if (AppState.darkMode) Color.White else Color.Black,
+                    backgroundColor = if (AppState.darkMode) Color.Black else Color.White,
                     leading = {
                         Image(
-                            painter = painterResource(id = R.drawable.rider_pro_google),
+                            painter = painterResource(id = R.mipmap.rider_pro_signup_google),
                             contentDescription = "Google",
-                            modifier = Modifier.size(36.dp)
+                            modifier = Modifier.size(18.dp),
                         )
                     },
                     expandText = true,
-                    contentPadding = PaddingValues(vertical = 8.dp, horizontal = 8.dp)
+                    contentPadding = PaddingValues(vertical = 8.dp, horizontal = 10.dp)
                 ) {
                     googleLogin()
                 }
-            }
+
             //登录tab
             Spacer(modifier = Modifier.height(24.dp))
-            ActionButton(
+            Text(
-                modifier = Modifier.fillMaxWidth(),
                 text = stringResource(R.string.login_upper),
-                color = AppColors.text,
+                color = AppColors.text.copy(alpha = 0.5f),
-            ) {
+                fontSize = 16.sp,
+                textAlign = TextAlign.Center,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .noRippleClickable {
                         navController.navigate(
                             NavigationRoute.UserAuth.route,
                         )
                     }
-            
+            )
-            // 游客登录按钮
+//            // 游客登录按钮
-            Spacer(modifier = Modifier.height(16.dp))
+//            Spacer(modifier = Modifier.height(16.dp))
-            ActionButton(
+//            ActionButton(
-                modifier = Modifier.fillMaxWidth(),
+//                modifier = Modifier.fillMaxWidth(),
-                text = "游客模式",
+//                text = "游客模式",
-                color = AppColors.text.copy(alpha = 0.7f),
+//                color = AppColors.text.copy(alpha = 0.7f),
-            ) {
+//            ) {
-                guestLogin()
+//                guestLogin()
-            }
+//            }
             Spacer(modifier = Modifier.height(70.dp))
         }
     }

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

@@ -22,6 +22,8 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -60,7 +62,7 @@ fun UserAuthScreen() {
     val AppColors = LocalAppTheme.current
     var email by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
-    var rememberMe by remember { mutableStateOf(false) }
+    var rememberMe by remember { mutableStateOf(true) }
     val accountService: AccountService = AccountServiceImpl()
     val captchaService: CaptchaService = CaptchaServiceImpl()
     val scope = rememberCoroutineScope()
@@ -70,8 +72,17 @@ fun UserAuthScreen() {
     var passwordError by remember { mutableStateOf<String?>(null) }
     var captchaInfo by remember { mutableStateOf<CaptchaInfo?>(null) }
     fun validateForm(): Boolean {
-        emailError =
+        // 如果密码为空，先检查邮箱格式
-            if (email.isEmpty()) context.getString(R.string.text_error_email_required) else null
+        if (password.isEmpty()) {
+            emailError = when {
+                email.isEmpty() -> context.getString(R.string.text_error_email_required)
+                !android.util.Patterns.EMAIL_ADDRESS.matcher(email).matches() -> 
+                    context.getString(R.string.text_error_email_format)
+                else -> null
+            }
+        } else {
+            emailError = if (email.isEmpty()) context.getString(R.string.text_error_email_required) else null
+        }
         
         // 使用通用密码校验器
         val passwordValidation = PasswordValidator.validateCurrentPassword(password, context)
@@ -299,32 +310,38 @@ fun UserAuthScreen() {
             ActionButton(
                 modifier = Modifier.fillMaxWidth(),
                 text = stringResource(R.string.lets_ride_upper),
-                backgroundColor = AppColors.main,
+                backgroundBrush = Brush.linearGradient(
+                    colors = listOf(
+                        Color(0xFF7c45ed),
+                        Color(0x777c68ef),
+                        Color(0x777bd8f8)
+                    )
+                ),
                 color = AppColors.mainText,
             ) {
                 onLogin()
             }
-            if (AppState.enableGoogleLogin) {
+//            if (AppState.enableGoogleLogin) {
-                Spacer(modifier = Modifier.height(16.dp))
+//                Spacer(modifier = Modifier.height(16.dp))
-                Text(stringResource(R.string.or_login_with), color = AppColors.secondaryText)
+//                Text(stringResource(R.string.or_login_with), color = AppColors.secondaryText)
-                Spacer(modifier = Modifier.height(16.dp))
+//                Spacer(modifier = Modifier.height(16.dp))
-                ActionButton(
+//                ActionButton(
-                    modifier = Modifier.fillMaxWidth(),
+//                    modifier = Modifier.fillMaxWidth(),
-                    text = stringResource(R.string.sign_in_with_google),
+//                    text = stringResource(R.string.sign_in_with_google),
-                    color = AppColors.text,
+//                    color = AppColors.text,
-                    leading = {
+//                    leading = {
-                        Image(
+//                        Image(
-                            painter = painterResource(id = R.drawable.rider_pro_google),
+//                            painter = painterResource(id = R.drawable.rider_pro_google),
-                            contentDescription = "Google",
+//                            contentDescription = "Google",
-                            modifier = Modifier.size(36.dp)
+//                            modifier = Modifier.size(36.dp)
-                        )
+//                        )
-                    },
+//                    },
-                    expandText = true,
+//                    expandText = true,
-                    contentPadding = PaddingValues(vertical = 8.dp, horizontal = 8.dp)
+//                    contentPadding = PaddingValues(vertical = 8.dp, horizontal = 8.dp)
-                ) {
+//                ) {
-                    googleLogin()
+//                    googleLogin()
-                }
+//                }
-            }
+//            }
 
         }
 

app/src/main/java/com/aiosman/ravenow/ui/network/Reload.kt

@@ -0,0 +1,64 @@
+package com.aiosman.ravenow.ui.network
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.R
+@Composable
+fun ReloadButton(
+    onClick: () -> Unit
+) {
+    val gradientBrush = Brush.linearGradient(
+        colors = listOf(
+            Color(0xFF7c45ed),
+            Color(0xFF7c68ef),
+            Color(0xFF7bd8f8)
+        )
+    )
+
+    Button(
+        onClick = onClick,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 120.dp)
+            .height(48.dp),
+        shape = RoundedCornerShape(30.dp),
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = Color.Transparent
+        ),
+        contentPadding = PaddingValues(0.dp)
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(gradientBrush),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text = stringResource(R.string.Reload),
+                fontSize = 16.sp,
+                fontWeight = FontWeight.Bold,
+                color = Color.White,
+                textAlign = TextAlign.Center
+            )
+        }
+    }
+}

app/src/main/java/com/aiosman/ravenow/ui/notification/Notification.kt

@@ -0,0 +1,144 @@
+package com.aiosman.ravenow.ui.notification
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+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 com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.R
+import com.aiosman.ravenow.ui.comment.notice.CommentNoticeScreen
+import com.aiosman.ravenow.ui.composables.StatusBarSpacer
+import com.aiosman.ravenow.ui.composables.TabItem
+import com.aiosman.ravenow.ui.composables.TabSpacer
+import com.aiosman.ravenow.ui.composables.rememberDebouncer
+import com.aiosman.ravenow.ui.follower.FollowerNoticeScreen
+import com.aiosman.ravenow.ui.like.LikeNoticeScreen
+import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun NotificationScreen() {
+    val AppColors = LocalAppTheme.current
+    val navController = LocalNavController.current
+    val scope = rememberCoroutineScope()
+    val pagerState = rememberPagerState(pageCount = { 3 })
+    val Debouncer = rememberDebouncer()
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(color = AppColors.background)
+    ) {
+        StatusBarSpacer()
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(56.dp)
+                .padding(horizontal = 16.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Image(
+                painter = painterResource(id = R.drawable.rider_pro_back_icon),
+                contentDescription = "Back",
+                modifier = Modifier
+                    .size(24.dp)
+                    .noRippleClickable {
+                        Debouncer {
+                            navController.popBackStack()
+                        }
+                    },
+                colorFilter = ColorFilter.tint(AppColors.text)
+            )
+
+            Spacer(modifier = Modifier.width(16.dp))
+
+            Text(
+                text = stringResource(R.string.group_info_notice_setting),
+                fontSize = 20.sp,
+                fontWeight = FontWeight.W900,
+                color = AppColors.text
+            )
+        }
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight()
+                .padding(start = 16.dp, top = 8.dp, bottom = 16.dp),
+            horizontalArrangement = Arrangement.Start,
+            verticalAlignment = Alignment.Bottom
+        ) {
+            TabItem(
+                text = stringResource(R.string.like),
+                isSelected = pagerState.currentPage == 0,
+                onClick = {
+                    scope.launch {
+                        pagerState.animateScrollToPage(0)
+                    }
+                }
+            )
+
+            TabSpacer()
+
+            TabItem(
+                text = stringResource(R.string.followers_upper),
+                isSelected = pagerState.currentPage == 1,
+                onClick = {
+                    scope.launch {
+                        pagerState.animateScrollToPage(1)
+                    }
+                }
+            )
+
+            TabSpacer()
+
+            TabItem(
+                text = stringResource(R.string.comment).uppercase(),
+                isSelected = pagerState.currentPage == 2,
+                onClick = {
+                    scope.launch {
+                        pagerState.animateScrollToPage(2)
+                    }
+                }
+            )
+        }
+
+        HorizontalPager(
+            state = pagerState,
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f)
+        ) { page ->
+            when (page) {
+                0 -> LikeNoticeScreen()
+                1 -> FollowerNoticeScreen()
+                2 -> CommentNoticeScreen()
+            }
+        }
+    }
+}

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

@@ -52,6 +52,8 @@ import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.PathEffect
@@ -151,71 +153,42 @@ fun NewPostScreen() {
                 modifier = Modifier
                     .fillMaxWidth()
                     .height(1.dp)
+                    .padding(horizontal = 16.dp)
                     .background(AppColors.divider)
             )
+            Spacer(modifier = Modifier.height(24.dp))
             Row(
                 modifier = Modifier
-                    .fillMaxWidth()
+                    .padding(start = 16.dp)
-                    .padding(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 8.dp),
+                    .width(100.dp)
-                verticalAlignment = Alignment.CenterVertically
+                    .height(40.dp)
+                    .clip(RoundedCornerShape(20.dp))
+                    .background(
+                        brush = Brush.linearGradient(
+                            colors = listOf(
+                                Color(0xFF8CDDFF),
+                                Color(0xFF9887FF),
+                                Color(0xFFFF8D28)
+                            ),
+                        )
+                    )
+                    .padding(horizontal = 14.dp, vertical = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.Center
             ) {
                 Image(
-                    painter = painterResource(id = R.mipmap.rider_pro_moment_ai),
+                    painter = painterResource(id = R.mipmap.icon_ai),
                     contentDescription = null,
                     modifier = Modifier
-                        .size(24.dp)
+                        .size(16.dp)
-
                 )
                 Text(
                     text = stringResource(R.string.moment_ai_co),
-                    fontWeight = FontWeight.Bold,
+                    fontWeight = FontWeight.Normal,
-                    fontSize = 15.sp,
+                    fontSize = 13.sp,
                     modifier = Modifier
-                        .padding(start = 8.dp)
+                        .padding(start = 2.dp),
-                        .weight(1f),
+                    color = Color.White,
-                    color = AppColors.text,
-                )
-                Switch(
-                    checked = isAiEnabled,
-                    onCheckedChange = {
-                            isChecked ->
-                        isAiEnabled = isChecked
-                        if (isChecked) {
-                            // 收起键盘
-                            keyboardController?.hide()
-                            isRequesting = true
-                            isRotating = true
-                            model.viewModelScope.launch {
-                                try {
-                                    model.agentMoment(model.textContent)
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }finally {
-                                    isRequesting = false
-                                    isRotating = false
-                                    isAiEnabled = false
-                                }
-                            }
-
-                        } else {
-
-                        }
-                    },
-                    enabled = !isRequesting && model.textContent.isNotEmpty(),
-                    colors = SwitchDefaults.colors(
-                        checkedThumbColor = Color.White,
-                        checkedTrackColor = AppColors.brandColorsColor,
-                        uncheckedThumbColor = Color.White,
-                        uncheckedTrackColor = AppColors.nonActive,
-                        uncheckedBorderColor = Color.White,
-                        disabledCheckedTrackColor = AppColors.brandColorsColor.copy(alpha = 0.8f),
-                        disabledCheckedThumbColor= Color.White,
-                        disabledUncheckedTrackColor = AppColors.nonActive,
-                        disabledUncheckedThumbColor= Color.White
-
-                    ),
-                    modifier = Modifier.scale(0.8f)
-
                 )
             }
 
@@ -352,7 +325,7 @@ fun NewPostTopBar(onSendClick: () -> Unit = {}) {
             modifier = Modifier.align(Alignment.CenterStart),
         ) {
             Image(
-                painter = painterResource(id = R.drawable.rider_pro_close),
+                painter = painterResource(id = R.drawable.rider_pro_back_icon),
                 contentDescription = "Back",
                 modifier = Modifier
                     .size(24.dp)
@@ -366,9 +339,31 @@ fun NewPostTopBar(onSendClick: () -> Unit = {}) {
                     },
                 colorFilter = ColorFilter.tint(AppColors.text)
             )
+            Spacer(modifier = Modifier.width(8.dp))
+            Text(
+                modifier = Modifier.align(Alignment.CenterVertically),
+                text = stringResource(R.string.publish_dynamic),
+                fontSize = 17.sp,
+                color = AppColors.text,
+            )
             Spacer(modifier = Modifier.weight(1f))
             Image(
-                painter = painterResource(id = R.mipmap.rider_pro_moment_post),
+                painter = painterResource(id = R.mipmap.icon_draft_box_light),
+                contentDescription = "",
+                modifier = Modifier
+                    .size(24.dp)
+                    .noRippleClickable {
+                        // 添加防抖逻辑
+                        val currentTime = System.currentTimeMillis()
+                        if (currentTime - lastSendClickTime > debounceTime) {
+                            lastSendClickTime = currentTime
+                        }
+                    },
+                colorFilter = ColorFilter.tint(AppColors.text)
+            )
+            Spacer(modifier = Modifier.width(20.dp))
+            Image(
+                painter = painterResource(id = R.mipmap.icon_released_light),
                 contentDescription = "Send",
                 modifier = Modifier
                     .size(24.dp)
@@ -391,11 +386,8 @@ fun NewPostTopBar(onSendClick: () -> Unit = {}) {
                             }finally {
                                 uploading = false
                             }
-
-
-
-                        }
                         }
+                    },
             )
         }
 
@@ -488,72 +480,24 @@ fun AddImageGrid() {
     }
 
     val addImageDebouncer = rememberDebouncer()
-    val takePhotoDebouncer = rememberDebouncer()
-
-    val stroke = Stroke(
-        width = 2f,
-        pathEffect = PathEffect.dashPathEffect(floatArrayOf(10f, 10f), 0f)
-    )
-    DraggableGrid(
-        items = NewPostViewModel.imageList,
-        onMove = { from, to ->
-            NewPostViewModel.imageList = NewPostViewModel.imageList.toMutableList().apply {
-                add(to, removeAt(from))
-            }
-        },
-        lockedIndices = listOf(
-
-        ),
-        onDragModeEnd = {},
-        onDragModeStart = {},
-        additionalItems = listOf(
-
-        ),
-        getItemId = { it.id }
-    ) { item, isDrag ->
-        Box(
-            modifier = Modifier
-        ) {
-            CustomAsyncImage(
-                LocalContext.current,
-                item.bitmap,
-                contentDescription = "Image",
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .aspectRatio(1f)
-                    .noRippleClickable {
-                        navController.navigate(NavigationRoute.NewPostImageGrid.route)
-                    },
-                contentScale = ContentScale.Crop
-            )
-            if (isDrag) {
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .background(Color.Black.copy(alpha = 0.4f))
-                )
-            }
-        }
-    }
     val canAddMoreImages = model.imageList.size < 9
 
     LazyVerticalGrid(
         columns = GridCells.Fixed(5),
-        contentPadding = PaddingValues(8.dp),
+        contentPadding = PaddingValues(horizontal = 19.dp, vertical = 4.dp),
-        modifier = Modifier
+        modifier = Modifier.fillMaxWidth(),
-            .fillMaxWidth()
-            .padding(horizontal = 8.dp),
         horizontalArrangement = Arrangement.spacedBy(8.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
+        // 添加按钮
         if (canAddMoreImages) {
             item {
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
                         .aspectRatio(1f)
-                        .clip(RoundedCornerShape(16.dp)) // 设置圆角
+                        .clip(RoundedCornerShape(24.dp))
-                        .background(AppColors.basicMain) // 设置背景色
+                        .background(Color(0xFFFAF9FB))
                         .noRippleClickable {
                             addImageDebouncer {
                                 if (model.imageList.size < 9) {
@@ -572,20 +516,21 @@ fun AddImageGrid() {
                         painter = painterResource(id = R.drawable.rider_pro_new_post_add_pic),
                         contentDescription = "Add Image",
                         modifier = Modifier
-                            .size(24.dp)
+                            .size(23.3.dp)
                             .align(Alignment.Center),
                         tint = AppColors.nonActiveText
-
                     )
                 }
             }
+            
+            // 相机按钮
             item {
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
                         .aspectRatio(1f)
-                        .clip(RoundedCornerShape(16.dp)) // 设置圆角
+                        .clip(RoundedCornerShape(24.dp))
-                        .background(AppColors.basicMain) // 设置背景色
+                        .background(Color(0xFFFAF9FB))
                         .noRippleClickable {
                             if (model.imageList.size < 9) {
                                 val photoFile = File(context.cacheDir, "photo.jpg")
@@ -605,13 +550,60 @@ fun AddImageGrid() {
                         painter = painterResource(id = R.drawable.rider_pro_camera),
                         contentDescription = "Take Photo",
                         modifier = Modifier
-                            .size(24.dp)
+                            .size(23.3.dp)
                             .align(Alignment.Center),
                         tint = AppColors.nonActiveText
                     )
                 }
             }
         }
+        
+        // 已添加的图片，显示在相机按钮后面
+        items(model.imageList.size) { index ->
+            val item = model.imageList[index]
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .aspectRatio(1f)
+                    .clip(RoundedCornerShape(24.dp))
+                    .background(Color(0xFFFAF9FB))
+            ) {
+                CustomAsyncImage(
+                    context,
+                    item.bitmap,
+                    contentDescription = "Image",
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .noRippleClickable {
+                            navController.navigate(NavigationRoute.NewPostImageGrid.route)
+                        },
+                    contentScale = ContentScale.Crop
+                )
+                
+//                // 删除按钮 - 右上角
+//                Box(
+//                    modifier = Modifier
+//                        .align(Alignment.TopEnd)
+//                        .padding(4.dp)
+//                        .size(20.dp)
+//                        .clip(RoundedCornerShape(10.dp))
+//                        .background(Color.Black.copy(alpha = 0.6f))
+//                        .noRippleClickable {
+//                            model.imageList = model.imageList.toMutableList().apply {
+//                                removeAt(index)
+//                            }
+//                        },
+//                    contentAlignment = Alignment.Center
+//                ) {
+//                    Icon(
+//                        painter = painterResource(id = R.drawable.rider_pro_close),
+//                        contentDescription = "Delete",
+//                        modifier = Modifier.size(12.dp),
+//                        tint = Color.White
+//                    )
+//                }
+            }
+        }
     }
 }
 

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

@@ -799,7 +799,7 @@ fun CommentContent(
                 modifier = Modifier.fillMaxWidth()
             ) {
                 Image(
-                    painter = painterResource(id = R.mipmap.qs_plq_qs_img),
+                    painter = painterResource(id = R.mipmap.invalid_name_3),
                     contentDescription = null,
                     modifier = Modifier.size(181.dp)
                 )

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

@@ -13,6 +13,7 @@ import com.aiosman.ravenow.data.UserServiceImpl
 import com.aiosman.ravenow.entity.AccountProfileEntity
 import com.aiosman.ravenow.entity.MomentEntity
 import com.aiosman.ravenow.entity.MomentServiceImpl
+import com.aiosman.ravenow.event.FollowChangeEvent
 import com.aiosman.ravenow.event.MomentFavouriteChangeEvent
 import com.aiosman.ravenow.event.MomentLikeChangeEvent
 import com.aiosman.ravenow.event.MomentRemoveEvent
@@ -166,7 +167,8 @@ class PostViewModel(
         moment?.let {
             userService.followUser(it.authorId.toString())
             moment = moment?.copy(followStatus = true)
-            // 更新我的关注页面的关注数
+            // 发送关注事件，通知动态列表更新关注状态
+            EventBus.getDefault().post(FollowChangeEvent(it.authorId, true))
         }
     }
 
@@ -174,7 +176,8 @@ class PostViewModel(
         moment?.let {
             userService.unFollowUser(it.authorId.toString())
             moment = moment?.copy(followStatus = false)
-            // 更新我的关注页面的关注数
+            // 发送取消关注事件，通知动态列表更新关注状态
+            EventBus.getDefault().post(FollowChangeEvent(it.authorId, false))
         }
     }
 

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

@@ -1,20 +1,19 @@
 package com.aiosman.ravenow.ui.splash
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 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
@@ -22,38 +21,36 @@ import com.aiosman.ravenow.R
 
 @Composable
 fun SplashScreen() {
-    Scaffold {
-        it
     Box(
         modifier = Modifier.fillMaxSize()
     ) {
-            // to bottom
+        // 居中的图标
-            Box(
+        Image(
-                contentAlignment = Alignment.TopCenter,
+            painter = painterResource(id = R.mipmap.kp_logo_img),
-                modifier = Modifier.padding(top = 211.dp)
+            contentDescription = "App Logo",
-            ) {
+            modifier = Modifier
+                .align(Alignment.Center)
+                .size(120.dp)
+        )
+
+        // 底部文字
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = Modifier.fillMaxWidth()
+            verticalArrangement = Arrangement.Bottom,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(bottom = 80.dp)
         ) {
             Image(
-                        painter = painterResource(id = R.mipmap.rider_pro_logo),
+                painterResource(id = R.mipmap.kp_p_img),
-                        contentDescription = "Rave Now",
+                contentDescription = "",
-                        modifier = Modifier
+                modifier = Modifier.size(85.dp, 25.dp)
-                            .width(108.dp)
-                            .height(45.dp)
             )
-                    Spacer(modifier = Modifier.height(32.dp))
+            Spacer(modifier = Modifier.padding(top = 16.dp))
             Text(
-                        "Rave Now".uppercase(),
+                stringResource(R.string.splash_title),
-                        fontSize = 28.sp,
+                fontSize = 13.sp
-                        fontWeight = FontWeight.Bold
             )
-                    Text("Your Night Starts Here".uppercase(), fontSize = 20.sp, fontWeight = FontWeight.W700)
         }
-
-            }
-        }
-
     }
 }

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

@@ -63,6 +63,23 @@ object Utils {
         return Locale.getDefault().language
     }
 
+    /**
+     * 获取完整的语言标记，如 "zh-CN", "en-US"
+     * 优先使用完整的 BCP-47 语言标记，提升与后端 translations 键的匹配率
+     */
+    fun getPreferredLanguageTag(): String {
+        val locale = Locale.getDefault()
+        val language = locale.language
+        val country = locale.country
+        
+        // 如果有国家/地区代码，返回完整的语言标记
+        return if (country.isNotEmpty()) {
+            "$language-$country"
+        } else {
+            language
+        }
+    }
+
     fun compressImage(context: Context, uri: Uri, maxSize: Int = 512, quality: Int = 85): File {
         val inputStream = context.contentResolver.openInputStream(uri)
         val originalBitmap = BitmapFactory.decodeStream(inputStream)