缁х画瀹屽杽鍔熻兘鏇存柊

feat: 新增短视频功能

.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/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/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

@@ -4,6 +4,7 @@ import com.aiosman.ravenow.R
 import com.aiosman.ravenow.data.api.ApiClient
 import com.aiosman.ravenow.entity.MomentEntity
 import com.aiosman.ravenow.entity.MomentImageEntity
+import com.aiosman.ravenow.entity.MomentVideoEntity
 import com.google.gson.annotations.SerializedName
 import java.io.File
 
@@ -12,8 +13,12 @@ data class Moment(
     val id: Long,
     @SerializedName("textContent")
     val textContent: String,
+    @SerializedName("url")
+    val url: String? = null,
     @SerializedName("images")
-    val images: List<Image>,
+    val images: List<Image>? = null,
+    @SerializedName("videos")
+    val videos: List<Video>? = null,
     @SerializedName("user")
     val user: User,
     @SerializedName("likeCount")
@@ -24,7 +29,7 @@ data class Moment(
     val favoriteCount: Long,
     @SerializedName("isFavorite")
     val isFavorite: Boolean,
-    @SerializedName("shareCount")
+    @SerializedName("isCommented")
     val isCommented: Boolean,
     @SerializedName("commentCount")
     val commentCount: Long,
@@ -47,6 +52,14 @@ data class Moment(
     val newsLanguage: String? = null,
     @SerializedName("newsContent")
     val newsContent: String? = null,
+    @SerializedName("hasFullText")
+    val hasFullText: Boolean = false,
+    @SerializedName("summary")
+    val summary: String? = null,
+    @SerializedName("publishedAt")
+    val publishedAt: String? = null,
+    @SerializedName("imageCached")
+    val imageCached: Boolean = false
 ) {
     fun toMomentItem(): MomentEntity {
         return MomentEntity(
@@ -62,7 +75,7 @@ data class Moment(
             commentCount = commentCount.toInt(),
             shareCount = 0,
             favoriteCount = favoriteCount.toInt(),
-            images = images.map {
+            images = images?.map {
                 MomentImageEntity(
                     url = "${ApiClient.BASE_SERVER}${it.url}",
                     thumbnail = "${ApiClient.BASE_SERVER}${it.thumbnail}",
@@ -71,10 +84,28 @@ data class Moment(
                     width = it.width,
                     height = it.height
                 )
-            },
+            } ?: emptyList(),
             authorId = user.id.toInt(),
             liked = isLiked,
             isFavorite = isFavorite,
+            url = url,
+            videos = videos?.map {
+                MomentVideoEntity(
+                    id = it.id,
+                    url = "${ApiClient.BASE_SERVER}${it.url}",
+                    originalUrl = it.originalUrl,
+                    directUrl = it.directUrl,
+                    thumbnailUrl = it.thumbnailUrl?.let { thumb -> "${ApiClient.BASE_SERVER}$thumb" },
+                    thumbnailDirectUrl = it.thumbnailDirectUrl,
+                    duration = it.duration,
+                    width = it.width,
+                    height = it.height,
+                    size = it.size,
+                    format = it.format,
+                    bitrate = it.bitrate,
+                    frameRate = it.frameRate
+                )
+            },
             // 新闻相关字段
             isNews = isNews,
             newsTitle = newsTitle ?: "",
@@ -82,7 +113,11 @@ data class Moment(
             newsSource = newsSource ?: "",
             newsCategory = newsCategory ?: "",
             newsLanguage = newsLanguage ?: "",
-            newsContent = newsContent ?: ""
+            newsContent = newsContent ?: "",
+            hasFullText = hasFullText,
+            summary = summary,
+            publishedAt = publishedAt,
+            imageCached = imageCached
         )
     }
 }
@@ -92,8 +127,26 @@ data class Image(
     val id: Long,
     @SerializedName("url")
     val url: String,
+    @SerializedName("original_url")
+    val originalUrl: String? = null,
+    @SerializedName("directUrl")
+    val directUrl: String? = null,
     @SerializedName("thumbnail")
     val thumbnail: String,
+    @SerializedName("thumbnailDirectUrl")
+    val thumbnailDirectUrl: String? = null,
+    @SerializedName("small")
+    val small: String? = null,
+    @SerializedName("smallDirectUrl")
+    val smallDirectUrl: String? = null,
+    @SerializedName("medium")
+    val medium: String? = null,
+    @SerializedName("mediumDirectUrl")
+    val mediumDirectUrl: String? = null,
+    @SerializedName("large")
+    val large: String? = null,
+    @SerializedName("largeDirectUrl")
+    val largeDirectUrl: String? = null,
     @SerializedName("blurHash")
     val blurHash: String?,
     @SerializedName("width")
@@ -102,13 +155,68 @@ data class Image(
     val height: Int?
 )
 
+data class Video(
+    @SerializedName("id")
+    val id: Long,
+    @SerializedName("url")
+    val url: String,
+    @SerializedName("original_url")
+    val originalUrl: String? = null,
+    @SerializedName("directUrl")
+    val directUrl: String? = null,
+    @SerializedName("thumbnailUrl")
+    val thumbnailUrl: String? = null,
+    @SerializedName("thumbnailDirectUrl")
+    val thumbnailDirectUrl: String? = null,
+    @SerializedName("duration")
+    val duration: Int? = null,
+    @SerializedName("width")
+    val width: Int? = null,
+    @SerializedName("height")
+    val height: Int? = null,
+    @SerializedName("size")
+    val size: Long? = null,
+    @SerializedName("format")
+    val format: String? = null,
+    @SerializedName("bitrate")
+    val bitrate: Int? = null,
+    @SerializedName("frameRate")
+    val frameRate: String? = null
+)
+
 data class User(
     @SerializedName("id")
     val id: Long,
     @SerializedName("nickName")
     val nickName: String,
     @SerializedName("avatar")
-    val avatar: String
+    val avatar: String,
+    @SerializedName("avatarMedium")
+    val avatarMedium: String? = null,
+    @SerializedName("avatarLarge")
+    val avatarLarge: String? = null,
+    @SerializedName("originAvatar")
+    val originAvatar: String? = null,
+    @SerializedName("avatarDirectUrl")
+    val avatarDirectUrl: String? = null,
+    @SerializedName("avatarMediumDirectUrl")
+    val avatarMediumDirectUrl: String? = null,
+    @SerializedName("avatarLargeDirectUrl")
+    val avatarLargeDirectUrl: String? = null,
+    @SerializedName("aiAccount")
+    val aiAccount: Boolean = false,
+    @SerializedName("aiRoleAvatar")
+    val aiRoleAvatar: String? = null,
+    @SerializedName("aiRoleAvatarMedium")
+    val aiRoleAvatarMedium: String? = null,
+    @SerializedName("aiRoleAvatarLarge")
+    val aiRoleAvatarLarge: String? = null,
+    @SerializedName("aiRoleAvatarDirectUrl")
+    val aiRoleAvatarDirectUrl: String? = null,
+    @SerializedName("aiRoleAvatarMediumDirectUrl")
+    val aiRoleAvatarMediumDirectUrl: String? = null,
+    @SerializedName("aiRoleAvatarLargeDirectUrl")
+    val aiRoleAvatarLargeDirectUrl: String? = null
 )
 
 data class UploadImage(

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

@@ -489,7 +489,7 @@ data class CategoryListResponse(
     val list: List<CategoryTemplate>
 )
 
-// ========== Prompt Rule 相关数据类 ==========
+// ========== Agent Rule 相关数据类 ==========
 
 /**
  * 创建规则请求体
@@ -497,7 +497,7 @@ data class CategoryListResponse(
  * @param promptId 智能体ID，与 openId 二选一，promptId 优先
  * @param openId 智能体的 OpenID（UUID格式），与 promptId 二选一
  */
-data class CreatePromptRuleRequestBody(
+data class CreateAgentRuleRequestBody(
     @SerializedName("rule")
     val rule: String,
     @SerializedName("promptId")
@@ -513,7 +513,7 @@ data class CreatePromptRuleRequestBody(
  * @param promptId 要更改关联的智能体ID（可选）
  * @param openId 要更改关联的智能体 OpenID（可选）
  */
-data class UpdatePromptRuleRequestBody(
+data class UpdateAgentRuleRequestBody(
     @SerializedName("id")
     val id: Int,
     @SerializedName("rule")
@@ -530,7 +530,7 @@ data class UpdatePromptRuleRequestBody(
  * @param title 智能体标题
  * @param avatar 智能体头像URL
  */
-data class PromptRuleAgent(
+data class AgentRuleAgent(
     @SerializedName("id")
     val id: Int,
     @SerializedName("title")
@@ -550,7 +550,7 @@ data class PromptRuleAgent(
  * @param createdAt 创建时间（ISO 8601 格式）
  * @param updatedAt 更新时间（ISO 8601 格式）
  */
-data class PromptRule(
+data class AgentRule(
     @SerializedName("id")
     val id: Int,
     @SerializedName("rule")
@@ -562,7 +562,7 @@ data class PromptRule(
     @SerializedName("scope")
     val scope: String,
     @SerializedName("prompt")
-    val prompt: PromptRuleAgent,
+    val prompt: AgentRuleAgent,
     @SerializedName("created_at")
     val createdAt: String,
     @SerializedName("updated_at")
@@ -576,7 +576,7 @@ data class PromptRule(
  * @param total 总记录数
  * @param list 规则列表
  */
-data class PromptRuleListResponse(
+data class AgentRuleListResponse(
     @SerializedName("page")
     val page: Int,
     @SerializedName("pageSize")
@@ -584,7 +584,7 @@ data class PromptRuleListResponse(
     @SerializedName("total")
     val total: Int,
     @SerializedName("list")
-    val list: List<PromptRule>
+    val list: List<AgentRule>
 )
 
 /**
@@ -598,7 +598,7 @@ data class PromptRuleListResponse(
  * @param remainingCount 剩余可用条数
  * @param usagePercent 使用百分比（0-100）
  */
-data class PromptRuleQuota(
+data class AgentRuleQuota(
     @SerializedName("promptId")
     val promptId: Int,
     @SerializedName("promptTitle")
@@ -617,6 +617,150 @@ data class PromptRuleQuota(
     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")
@@ -656,6 +800,7 @@ interface RaveNowAPI {
         @Query("favouriteUserId") favouriteUserId: Int? = null,
         @Query("explore") explore: String? = null,
         @Query("newsFilter") newsFilter: String? = null,
+        @Query("videoFilter") videoFilter: String? = null,
     ): Response<ListContainer<Moment>>
 
     @Multipart
@@ -810,7 +955,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>>
 
@@ -992,7 +1137,7 @@ interface RaveNowAPI {
         @Query("pageSize") pageSize: Int? = null
     ): Response<ListContainer<Agent>>
 
-    // ========== Prompt Rule API ==========
+// ========== Agent Rule API ==========
 
     /**
      * 创建智能体规则
@@ -1020,8 +1165,8 @@ interface RaveNowAPI {
      * ```
      */
     @POST("outside/prompt/rule")
-    suspend fun createPromptRule(
-        @Body body: CreatePromptRuleRequestBody
+    suspend fun createAgentRule(
+        @Body body: CreateAgentRuleRequestBody
     ): Response<Unit>
 
     /**
@@ -1054,8 +1199,8 @@ interface RaveNowAPI {
      * ```
      */
     @retrofit2.http.PUT("outside/prompt/rule")
-    suspend fun updatePromptRule(
-        @Body body: UpdatePromptRuleRequestBody
+    suspend fun updateAgentRule(
+        @Body body: UpdateAgentRuleRequestBody
     ): Response<Unit>
 
     /**
@@ -1079,7 +1224,7 @@ interface RaveNowAPI {
      * ```
      */
     @DELETE("outside/prompt/rule/{id}")
-    suspend fun deletePromptRule(
+    suspend fun deleteAgentRule(
         @Path("id") id: Int
     ): Response<Unit>
 
@@ -1134,12 +1279,12 @@ interface RaveNowAPI {
      * ```
      */
     @GET("outside/prompt/{promptId}/rule/list")
-    suspend fun getPromptRuleList(
+    suspend fun getAgentRuleList(
         @Path("promptId") promptId: String,
         @Query("rule") rule: String? = null,
         @Query("page") page: Int = 1,
         @Query("pageSize") pageSize: Int = 10
-    ): Response<DataContainer<PromptRuleListResponse>>
+    ): Response<DataContainer<AgentRuleListResponse>>
 
     /**
      * 查询智能体规则配额信息
@@ -1189,9 +1334,264 @@ interface RaveNowAPI {
      * ```
      */
     @GET("outside/prompt/{promptId}/rule/count")
-    suspend fun getPromptRuleQuota(
+    suspend fun getAgentRuleQuota(
         @Path("promptId") promptId: String
-    ): Response<DataContainer<PromptRuleQuota>>
+    ): 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

@@ -260,6 +260,38 @@ data class MomentImageEntity(
     var height: Int? = null
 )
 
+/**
+ * 动态视频
+ */
+data class MomentVideoEntity(
+    // 视频ID
+    val id: Long,
+    // 视频URL
+    val url: String,
+    // 原始文件名
+    val originalUrl: String? = null,
+    // 直接访问URL
+    val directUrl: String? = null,
+    // 视频缩略图URL
+    val thumbnailUrl: String? = null,
+    // 视频缩略图直接访问URL
+    val thumbnailDirectUrl: String? = null,
+    // 视频时长（秒）
+    val duration: Int? = null,
+    // 宽度
+    val width: Int? = null,
+    // 高度
+    val height: Int? = null,
+    // 文件大小（字节）
+    val size: Long? = null,
+    // 视频格式
+    val format: String? = null,
+    // 视频比特率（kbps）
+    val bitrate: Int? = null,
+    // 帧率
+    val frameRate: String? = null
+)
+
 /**
  * 动态
  */
@@ -300,6 +332,10 @@ data class MomentEntity(
     var relMoment: MomentEntity? = null,
     // 是否收藏
     var isFavorite: Boolean = false,
+    // 外部链接
+    val url: String? = null,
+    // 动态视频列表
+    val videos: List<MomentVideoEntity>? = null,
     // 新闻相关字段
     val isNews: Boolean = false,
     val newsTitle: String = "",
@@ -307,13 +343,22 @@ data class MomentEntity(
     val newsSource: String = "",
     val newsCategory: String = "",
     val newsLanguage: String = "",
-    val newsContent: String = ""
+    val newsContent: String = "",
+    // 是否已获取完整正文
+    val hasFullText: Boolean = false,
+    // 新闻摘要
+    val summary: String? = null,
+    // 新闻发布时间
+    val publishedAt: String? = null,
+    // 是否已缓存图片
+    val imageCached: Boolean = false
 )
 class MomentLoaderExtraArgs(
     val explore: Boolean? = false,
     val timelineId: Int? = null,
     val authorId : Int? = null,
-    val newsOnly: Boolean? = null
+    val newsOnly: Boolean? = null,
+    val videoOnly: Boolean? = null
 )
 class MomentLoader : DataLoader<MomentEntity,MomentLoaderExtraArgs>() {
     override suspend fun fetchData(
@@ -327,7 +372,8 @@ class MomentLoader : DataLoader<MomentEntity,MomentLoaderExtraArgs>() {
             explore = if (extra.explore == true) "true" else "",
             timelineId = extra.timelineId,
             authorId = extra.authorId,
-            newsFilter = if (extra.newsOnly == true) "news_only" else ""
+            newsFilter = if (extra.newsOnly == true) "news_only" else "",
+            videoFilter = if (extra.videoOnly == true) "video_only" else ""
         )
         val data =  result.body()?.let {
             ListContainer(

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

@@ -71,4 +71,29 @@ object AppStore {
         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,8 +35,10 @@ 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
@@ -120,6 +122,8 @@ sealed class NavigationRoute(
     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")
 }
 
 
@@ -421,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()
         }

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

@@ -21,11 +21,16 @@ object AccountEditViewModel : ViewModel() {
     var name by mutableStateOf("")
     var bio by mutableStateOf("")
     var imageUrl by mutableStateOf<Uri?>(null)
+    var bannerImageUrl by mutableStateOf<Uri?>(null)
+    var bannerFile by mutableStateOf<File?>(null)
     val accountService: AccountService = AccountServiceImpl()
     var profile by mutableStateOf<AccountProfileEntity?>(null)
     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 +43,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,
@@ -73,6 +84,30 @@ object AccountEditViewModel : ViewModel() {
             it.compress(Bitmap.CompressFormat.JPEG, 100, file.outputStream())
             UploadImage(file, "avatar.jpg", "", "jpg")
         }
+        
+        // 处理背景图更新
+        val newBanner = bannerImageUrl?.let { uri ->
+            bannerFile?.let { file ->
+                val cursor = context.contentResolver.query(uri, null, null, null, null)
+                var uploadBanner: UploadImage? = null
+                cursor?.use { cur ->
+                    val columnIndex = cur.getColumnIndex("_display_name")
+                    if (cur.moveToFirst() && columnIndex != -1) {
+                        val displayName = cur.getString(columnIndex)
+                        val extension = displayName.substringAfterLast(".")
+                        Log.d("AccountEditViewModel", "Banner file name: $displayName, extension: $extension")
+                        uploadBanner = UploadImage(file, displayName, uri.toString(), extension)
+                    } else {
+                        // 如果无法获取文件名，使用默认值
+                        val displayName = "banner.jpg"
+                        val extension = "jpg"
+                        uploadBanner = UploadImage(file, displayName, uri.toString(), extension)
+                    }
+                }
+                uploadBanner
+            }
+        }
+        
         // 去除换行符，确保昵称和个人简介不包含换行
         val cleanName = name.trim().replace("\n", "").replace("\r", "")
         val cleanBio = bio.trim().replace("\n", "").replace("\r", "")
@@ -80,10 +115,20 @@ object AccountEditViewModel : ViewModel() {
         val newName = if (cleanName == profile?.nickName) null else cleanName
         accountService.updateProfile(
             avatar = newAvatar,
-            banner = null,
+            banner = newBanner,
             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) { }
+        // 清除背景图状态
+        bannerImageUrl = null
+        bannerFile = null
         // 刷新用户资料
         reloadProfile()
         // 刷新个人资料页面的用户资料
@@ -100,6 +145,8 @@ object AccountEditViewModel : ViewModel() {
         name = ""
         bio = ""
         imageUrl = null
+        bannerImageUrl = null
+        bannerFile = null
         croppedBitmap = null
         isUpdating = false
         isLoading = false

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.WindowInsets
+import androidx.compose.foundation.layout.Row
 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(
-                title = stringResource(R.string.account_and_security),
-                moreIcon = false
+            CircularBackButton(
+                onClick = { navController.navigateUp() },
+                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)
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(
+                    color = appColors.background,
+                    shape = RoundedCornerShape(AccountSettingConstants.CARD_CORNER_RADIUS.dp)
+                )
         ) {
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 8.dp)
-            ) {
-                NavItem(
-                    iconRes = R.mipmap.rider_pro_change_password,
-                    label = stringResource(R.string.change_password),
-                    modifier = Modifier.noRippleClickable {
-                        navController.navigate(NavigationRoute.ChangePasswordScreen.route)
-                    }
-                )
-            }
-
-            // 分割线
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(appColors.divider)
+            SecurityOptionItem(
+                iconRes = R.mipmap.icons_padlock,
+                label = stringResource(R.string.change_password),
+                onClick = { navController.navigate(NavigationRoute.ChangePasswordScreen.route) }
             )
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 8.dp)
-            ) {
-                NavItem(
-                    iconRes = R.drawable.rider_pro_moment_delete,
-                    label = stringResource(R.string.remove_account),
-                    modifier = Modifier.noRippleClickable {
-                        navController.navigate(NavigationRoute.RemoveAccountScreen.route)
-                    }
-                )
-            }
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(appColors.divider)
+
+            SecurityOptionItem(
+                iconRes = R.mipmap.icons_block,
+                label = stringResource(R.string.blocked_users),
+                onClick = {
+                    // TODO: 导航到屏蔽用户页面
+                }
+            )
+
+            SecurityOptionItem(
+                iconRes = R.mipmap.icons_remove,
+                label = stringResource(R.string.remove_account),
+                onClick = { navController.navigate(NavigationRoute.RemoveAccountScreen.route) },
+                applyColorFilter = false
             )
         }
-
     }
 }

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

@@ -4,19 +4,26 @@ 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
@@ -28,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
@@ -39,28 +50,29 @@ 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.width
+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.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
+import androidx.compose.ui.graphics.SolidColor
 import com.aiosman.ravenow.ConstVars
 import com.aiosman.ravenow.ui.composables.pickupAndCompressLauncher
+import android.widget.Toast
 import java.io.File
 
 /**
@@ -86,6 +98,10 @@ fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,)
         quality = 100
     ) { uri, file ->
         // 处理选中的图片
+        // 保存到 ViewModel 中，等待保存时一起上传
+        model.bannerImageUrl = uri
+        model.bannerFile = file
+        // 如果提供了回调，也调用它（用于个人主页直接更新）
         onUpdateBanner?.invoke(uri, file, context)
     }
 
@@ -93,10 +109,21 @@ fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,)
         // 去除换行符，确保昵称不包含换行
         val cleanValue = value.replace("\n", "").replace("\r", "")
         model.name = cleanValue
+        // 实时验证，但不显示错误（只在保存时显示）
         usernameError = when {
-            cleanValue.trim().isEmpty() -> "昵称不能为空"
-            cleanValue.length < 3 -> "昵称长度不能小于3"
-            cleanValue.length > 20 -> "昵称长度不能大于20"
+            cleanValue.trim().isEmpty() -> context.getString(R.string.error_nickname_empty)
+            cleanValue.length < 3 -> context.getString(R.string.error_nickname_too_short)
+            cleanValue.length > 20 -> context.getString(R.string.error_nickname_too_long)
+            else -> null
+        }
+    }
+    
+    fun validateNickname(): String? {
+        val cleanValue = model.name.replace("\n", "").replace("\r", "")
+        return when {
+            cleanValue.trim().isEmpty() -> context.getString(R.string.error_nickname_empty)
+            cleanValue.length < 3 -> context.getString(R.string.error_nickname_too_short)
+            cleanValue.length > 20 -> context.getString(R.string.error_nickname_too_long)
             else -> null
         }
     }
@@ -107,8 +134,17 @@ fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,)
         // 去除换行符，确保个人简介不包含换行
         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
+        }
+    }
+    
+    fun validateBio(): String? {
+        val cleanValue = model.bio.replace("\n", "").replace("\r", "")
+        return when {
+            cleanValue.length > 100 -> context.getString(R.string.error_bio_too_long)
             else -> null
         }
     }
@@ -134,192 +170,28 @@ fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,)
         // 确保显示的是当前登录用户的信息，而不是之前用户的缓存数据
         model.reloadProfile()
     }
+    
+    // 设置状态栏为透明，根据暗色模式决定图标颜色
+    val systemUiController = rememberSystemUiController()
+    LaunchedEffect(Unit) {
+        systemUiController.setStatusBarColor(Color.Transparent, darkIcons = !AppState.darkMode)
+    }
+    
     StatusBarMaskLayout(
-        modifier = Modifier.background(color = appColors.background).padding(horizontal = 16.dp),
-        darkIcons = !AppState.darkMode,
-        maskBoxBackgroundColor = appColors.background
+        modifier = Modifier.background(appColors.background),
+        darkIcons = !AppState.darkMode, // 根据暗色模式决定图标颜色
+        maskBoxBackgroundColor = Color.Transparent
     ) {
-    Column(
+    Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(color = appColors.background),
-        horizontalAlignment = Alignment.CenterHorizontally
+            .background(appColors.background)
     ) {
-        //StatusBarSpacer()
-        Box(
-            modifier = Modifier.padding(horizontal = 0.dp, vertical = 16.dp)
-        ) {
-            NoticeScreenHeader(
-                title = stringResource(R.string.edit_profile),
-                moreIcon = false
-            ) {
-
-                Icon(
-                    modifier = Modifier
-                        .size(24.dp)
-                        .debouncedClickable(
-                            enabled = validate() && !model.isUpdating,
-                            debounceTime = 1000L
-                        ) {
-                            if (validate() && !model.isUpdating) {
-                                model.viewModelScope.launch {
-                                    model.isUpdating = true
-                                    model.updateUserProfile(context)
-                                    model.viewModelScope.launch(Dispatchers.Main) {
-                                        debouncedNavigation {
-                                            navController.navigateUp()
-                                        }
-                                        model.isUpdating = false
-                                    }
-                                }
-                            }
-                        },
-                    imageVector = Icons.Default.Check,
-                    contentDescription = "保存",
-                    tint = if (validate() && !model.isUpdating) appColors.text else appColors.nonActiveText
-                )
-            }
-        }
-
-
-        // 添加横幅图片区域
-        val banner = model.profile?.banner
-
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(300.dp)
-                    .clip(RoundedCornerShape(12.dp))
-            ) {
-                if (banner != null) {
-                CustomAsyncImage(
-                    context = LocalContext.current,
-                    imageUrl = banner,
-                    modifier = Modifier.fillMaxSize(),
-                    contentDescription = "Banner",
-                    contentScale = ContentScale.Crop
-                )
-            } else {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .background(Color.Gray.copy(alpha = 0.1f))
-                    )
-            }
-                Box(
-                    modifier = Modifier
-                        .width(120.dp)
-                        .height(42.dp)
-                        .align(Alignment.BottomEnd)
-                        .padding(end = 12.dp, bottom = 12.dp)
-                        .background(
-                            color = Color.Black.copy(alpha = 0.4f),
-                            shape = RoundedCornerShape(9.dp)
-                        )
-                        .noRippleClickable {
-                            Intent(Intent.ACTION_PICK).apply {
-                                type = "image/*"
-                                pickBannerImageLauncher.launch(this)
-                            }
-                        }
-                ){
-                    Text(
-                        text = "change",
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.W600,
-                        color = Color.White,
-                        modifier = Modifier.align(Alignment.Center)
-                    )
-                }
-        }
-
-        Spacer(modifier = Modifier.height(20.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(
-                        context,
-                        model.croppedBitmap ?: it.avatar,
-                        modifier = Modifier
-                            .size(88.dp)
-                            .clip(
-                                RoundedCornerShape(88.dp)
-                            ),
-                        contentDescription = "",
-                        contentScale = ContentScale.Crop
-                    )
-                    Box(
-                        modifier = Modifier
-                            .size(32.dp)
-                            .clip(CircleShape)
-                            .background(
-                                brush = Brush.linearGradient(
-                                colors = listOf(
-                                    Color(0xFF7c45ed),
-                                    Color(0x997c68ef),
-                                    Color(0xFF7bd8f8)
-                                )
-                            ),
-                                )
-                            .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(18.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),
+                    modifier = Modifier.fillMaxSize(),
                     contentAlignment = Alignment.Center
                 ) {
                     androidx.compose.material3.CircularProgressIndicator(
@@ -327,24 +199,468 @@ fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,)
                     )
                 }
             }
+            model.profile != null -> {
+                Column(
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    // 顶部背景区域（圆角在底部，覆盖状态栏）
+                    // 优先显示新选择的背景图，如果没有则显示原有的背景图
+                    val banner = model.bannerImageUrl?.toString() ?: model.profile?.banner
+                    val statusBarPadding = WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
+                    Box(
+                        modifier = Modifier
+                            .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 = 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, appColors.background, 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 = 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(appColors.secondaryBackground)
+                        ) {
+                            // 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(appColors.divider)
+                                    .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 = !model.isUpdating,
+                                    debounceTime = 1000L
+                                ) {
+                                    if (model.isUpdating) return@debouncedClickable
+                                    
+                                    // 点击保存时重新验证
+                                    val nicknameErrorMsg = validateNickname()
+                                    val bioErrorMsg = validateBio()
+                                    
+                                    // 如果有错误，显示对应的错误提示
+                                    when {
+                                        nicknameErrorMsg != null -> {
+                                            Toast.makeText(context, nicknameErrorMsg, Toast.LENGTH_SHORT).show()
+                                            return@debouncedClickable
+                                        }
+                                        bioErrorMsg != null -> {
+                                            Toast.makeText(context, bioErrorMsg, Toast.LENGTH_SHORT).show()
+                                            return@debouncedClickable
+                                        }
+                                    }
+                                    
+                                    // 验证通过，执行保存
+                                    model.viewModelScope.launch {
+                                        model.isUpdating = true
+                                        model.updateUserProfile(context)
+                                        model.viewModelScope.launch(Dispatchers.Main) {
+                                            debouncedNavigation {
+                                                navController.navigateUp()
+                                            }
+                                            model.isUpdating = false
+                                        }
+                                    }
+                                },
+                            contentAlignment = Alignment.Center
+                        ) {
+                            Text(
+                                text = stringResource(R.string.save),
+                                fontSize = 17.sp,
+                                fontWeight = FontWeight.Normal,
+                                color = Color.White
+                            )
+                        }
+                    }
+                }
+            }
             else -> {
-                Log.d("AccountEditScreen2", "显示错误信息 - 没有数据且不在加载中")
                 // 没有数据且不在加载中，显示错误信息
                 Box(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(16.dp),
+                    modifier = Modifier.fillMaxSize(),
                     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(appColors.secondaryBackground),
+        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 = appColors.text,
+                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 = appColors.secondaryText,
+                        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 = appColors.text
+                    ),
+                    cursorBrush = SolidColor(appColors.text),
+                    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
+) {
+    val appColors = LocalAppTheme.current
+    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) {
+                        // 暗色模式下使用和亮色模式一样的图标
+                        iconResLight ?: iconResDark ?: R.mipmap.naoz
+                    } else {
+                        iconResLight ?: R.mipmap.naoz // 使用传入的亮色模式图标，或默认占位
+                    }
+                ),
+                contentDescription = null,
+                modifier = Modifier.size(24.dp),
+                tint = iconColor
+            )
+            
+            Text(
+                text = label,
+                fontSize = 17.sp,
+                fontWeight = FontWeight.Normal,
+                color = appColors.text
+            )
+        }
+        
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            Text(
+                text = value,
+                fontSize = 17.sp,
+                fontWeight = FontWeight.Normal,
+                color = appColors.secondaryText
+            )
+            
+            Icon(
+                imageVector = Icons.Default.ArrowForward,
+                contentDescription = null,
+                modifier = Modifier.size(8.dp),
+                tint = appColors.secondaryText
+            )
+        }
+    }
 }

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

@@ -125,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.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/AnimatedCounter.kt

@@ -10,6 +10,7 @@ import androidx.compose.animation.togetherWith
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import com.aiosman.ravenow.LocalAppTheme
 
@@ -36,6 +37,13 @@ fun AnimatedCounter(count: Int, modifier: Modifier = Modifier, fontSize: Int = 2
             )
         }
     ) { targetCount ->
-        Text(text = "$targetCount", modifier = modifier, fontSize = fontSize.sp, color = AppColors.text)
+        Text(
+            text = "$targetCount",
+            modifier = modifier,
+            fontSize = fontSize.sp,
+            color = AppColors.text,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis
+        )
     }
 }

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(
-                R.string.follow_upper
-            ),
+            text = if (isFollowing) stringResource(R.string.follow_upper_had) else stringResource(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

@@ -426,7 +426,6 @@ fun MomentOperateBtn(count: String, content: @Composable () -> Unit) {
             fontSize = 14,
             modifier = Modifier
                 .padding(start = 7.dp)
-                .width(24.dp)
         )
     }
 }

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,69 +56,96 @@ 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)
-            Spacer(modifier = Modifier.height(16.dp))
+            Text(
+                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))
-                .background(AppColors.inputBackground)
+                .clip(RoundedCornerShape(customCornerRadius.dp))
+                .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){
-                BasicTextField(
-                    value = text,
-                    onValueChange = onValueChange,
-                    modifier = Modifier
-                        .weight(1f)
-                        .onFocusChanged { focusState ->
-                            isFocused = focusState.isFocused
-                        },
-                    textStyle = TextStyle(
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W500,
-                        color = AppColors.text
-                    ),
-                    keyboardOptions = KeyboardOptions(
-                        keyboardType = if (password) KeyboardType.Password else KeyboardType.Text
-                    ),
-                    visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
-                    singleLine = true,
-                    enabled = enabled,
-                    cursorBrush = SolidColor(AppColors.text),
-                )
+            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
+                            .fillMaxWidth()
+                            .onFocusChanged { focusState ->
+                                isFocused = focusState.isFocused
+                            },
+                        textStyle = TextStyle(
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W400,
+                            color = AppColors.text
+                        ),
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = if (password) KeyboardType.Password else KeyboardType.Email
+                        ),
+                        visualTransformation = if (showPassword) VisualTransformation.None else PasswordVisualTransformation(),
+                        singleLine = true,
+                        enabled = enabled,
+                        cursorBrush = SolidColor(AppColors.text),
+                    )
+                    if (text.isEmpty() && hint != null) {
+                        Text(
+                            text = hint,
+                            color = HintTextColor,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W400
+                        )
+                    }
+                }
                 if (password) {
                     Image(
-                        painter = painterResource(id = R.drawable.rider_pro_eye),
+                        painter = painterResource(
+                            id = if (showPassword) {
+                                R.drawable.rider_pro_eye
+                            } else {
+                                R.mipmap.icon_eyes_closed_light
+                            }
+                        ),
                         contentDescription = "Password",
                         modifier = Modifier
-                            .size(18.dp)
+                            .size(24.dp)
                             .noRippleClickable {
                                 showPassword = !showPassword
                             },
-                        colorFilter = ColorFilter.tint(AppColors.text)
+                        colorFilter = ColorFilter.tint(PasswordIconColor)
                     )
                 }
             }
-
-            if (text.isEmpty()) {
-                hint?.let {
-                    Text(it, modifier = Modifier.padding(start = 5.dp), color = AppColors.inputHint, fontWeight = FontWeight.W600)
-                }
-            }
         }
         Spacer(modifier = Modifier.height(8.dp))
         Row(

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

@@ -137,9 +137,9 @@ fun FavouriteListPage() {
                                     id = if (com.aiosman.ravenow.AppState.darkMode) R.mipmap.invalid_dark
                                     else R.mipmap.invalid_name_1),
                                 contentDescription = "No favourites",
-                                modifier = Modifier.size(110.dp)
+                                modifier = Modifier.size(181.dp, 153.dp)
                             )
-                            Spacer(modifier = Modifier.size(24.dp))
+                            Spacer(modifier = Modifier.size(9.dp)) // 调整间距为9dp
                             Text(
                                 text = stringResource(R.string.favourites_null),
                                 color = AppColors.text,

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

@@ -24,6 +24,8 @@ 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 androidx.lifecycle.viewmodel.compose.viewModel
@@ -124,24 +126,32 @@ 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.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 = stringResource(R.string.follower_empty_title),
                         color = appColors.text,
                         fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
+                        fontWeight = FontWeight.W600,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis
                     )
                     Spacer(modifier = Modifier.size(8.dp))
                     androidx.compose.material.Text(
-                        text = "去发布动态，吸引更多粉丝～",
+                        text = stringResource(R.string.follower_empty_subtitle),
                         color = appColors.text,
                         fontSize = 14.sp,
-                        fontWeight = FontWeight.W400
+                        fontWeight = FontWeight.W400,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 3,
+                        overflow = TextOverflow.Ellipsis
                     )
                 }
             }

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

@@ -25,6 +25,8 @@ 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 androidx.paging.compose.collectAsLazyPagingItems
@@ -114,24 +116,33 @@ 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.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 = stringResource(R.string.follower_empty_title),
                         color = AppColors.text,
                         fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
+                        fontWeight = FontWeight.W600,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis
                     )
                     Spacer(modifier = Modifier.size(8.dp))
                     androidx.compose.material.Text(
-                        text = "去发布动态，吸引更多粉丝～",
+                        text = stringResource(R.string.follower_empty_subtitle),
                         color = AppColors.text,
                         fontSize = 14.sp,
-                        fontWeight = FontWeight.W400
+                        fontWeight = FontWeight.W400,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 3,
+                        overflow = TextOverflow.Ellipsis
                     )
                 }
             }

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

@@ -24,6 +24,8 @@ 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 androidx.lifecycle.viewmodel.compose.viewModel
@@ -126,24 +128,32 @@ 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.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 = stringResource(R.string.following_empty_title),
                         color = appColors.text,
                         fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
+                        fontWeight = FontWeight.W600,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis
                     )
                     Spacer(modifier = Modifier.size(8.dp))
                     androidx.compose.material.Text(
-                        text = "探索一下，总有一个你想靠近的光点 ✨",
+                        text = stringResource(R.string.following_empty_subtitle),
                         color = appColors.secondaryText,
                         fontSize = 14.sp,
-                        fontWeight = FontWeight.W400
+                        fontWeight = FontWeight.W400,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 3,
+                        overflow = TextOverflow.Ellipsis
                     )
                 }
             }

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,11 @@ 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.parseErrorResponse
 import com.aiosman.ravenow.entity.ChatNotification
 import com.aiosman.ravenow.entity.GroupInfo
 import com.aiosman.ravenow.entity.GroupMember
@@ -22,9 +28,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 +104,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/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,151 +141,16 @@ fun IndexScreen() {
             gesturesEnabled = drawerState.isOpen,
             drawerContent = {
                 CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
-                    Column(
-                        modifier = Modifier
-                            .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)
-                                }
-
+                    SideMenuContent(
+                        onClose = {
+                            coroutineScope.launch {
+                                drawerState.close()
                             }
-                        )
-                        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()
-                                    },
-
-                                    colors = SwitchDefaults.colors(
-                                        checkedThumbColor = Color.White,
-                                        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)
-                                }
-                            }
-                        )
-
-                    }
+                        },
+                        navController = navController,
+                        context = context,
+                        isDrawerOpen = drawerState.isOpen
+                    )
                 }
             }
         ) {
@@ -447,7 +330,6 @@ fun IndexScreen() {
             )
         }
     }
-
 }
 
 @Composable
@@ -624,3 +506,369 @@ 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) }
+    
+    // 同步暗色模式状态
+    LaunchedEffect(AppState.darkMode) {
+        darkModeEnabled = AppState.darkMode
+    }
+    
+    // 菜单背景色 - 根据暗色模式适配
+    val menuBackgroundColor = if (darkModeEnabled) {
+        appColors.secondaryBackground // 暗色模式：深灰色
+    } else {
+        Color(0xFFFAF9FB) // 亮色模式：浅灰色
+    }
+    // 遮罩颜色 黑色透明度0.6
+    val overlayColor = Color.Black.copy(alpha = 0.6f)
+    // 卡片背景色 - 根据暗色模式适配
+    val cardBackgroundColor = if (darkModeEnabled) {
+        appColors.background // 暗色模式：深色背景
+    } else {
+        Color.White // 亮色模式：白色
+    }
+    // 文字颜色 - 根据暗色模式适配
+    val textColor = appColors.text
+    // 图标颜色 - 根据暗色模式适配
+    val iconColor = appColors.text
+    // 跟随系统文字颜色 - 根据暗色模式适配
+    val followSystemTextColor = appColors.secondaryText
+    // 开关开启颜色 #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(iconColor)
+                )
+            }
+// 绝对定位的"扫一扫"文字：上方71.5dp，右侧66dp
+            Text(
+                text = stringResource(R.string.scan_qr),
+                fontSize = 14.sp,
+                color = textColor,
+                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(iconColor)
+            )
+            
+            // 菜单选项卡片组 - 第一组卡片上方距离上方108pt（绝对定位）
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .offset(y = 128.dp) // 直接距离顶部128dp（整体下移20dp）
+                    .padding(horizontal = 16.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                // 第一组卡片：编辑资料、账号安全、收藏
+                MenuCard(
+                    backgroundColor = cardBackgroundColor,
+                    textColor = textColor,
+                    iconColor = iconColor,
+                    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,
+                    textColor = textColor,
+                    iconColor = iconColor,
+                    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,
+                    textColor = textColor,
+                    iconColor = iconColor,
+                    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,
+    textColor: Color,
+    iconColor: 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, textColor = textColor, iconColor = iconColor) // 传递颜色参数
+            }
+        }
+    }
+}
+
+@Composable
+fun MenuItemRow(item: MenuItem, compact: Boolean = false, textColor: Color, iconColor: Color) {
+    val appColors = LocalAppTheme.current
+    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(iconColor)
+            )
+            Text(
+                text = item.label,
+                fontSize = 14.sp,
+                color = textColor
+            )
+        }
+        
+        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(appColors.text)
+            )
+        }
+    }
+}

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

@@ -50,6 +50,8 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -981,9 +983,13 @@ fun ChatRoomCard(
                 Text(
                     text = "${chatRoom.memberCount} ${stringResource(R.string.chatting_now)}",
                     fontSize = 12.sp,
-                    modifier = Modifier.alpha(0.6f),
+                    modifier = Modifier
+                        .alpha(0.6f)
+                        .weight(1f),
                     color = AppColors.text,
-                    fontWeight = androidx.compose.ui.text.font.FontWeight.W500
+                    fontWeight = androidx.compose.ui.text.font.FontWeight.W500,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
             }
         }

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

@@ -234,22 +234,24 @@ object AgentViewModel: ViewModel() {
             
             try {
                 // 获取完整的语言标记（如 "zh-CN"）
-                val sysLang = com.aiosman.ravenow.utils.Utils.getPreferredLanguageTag()
+                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,
+//                    withChildren = false,
+//                    withParent = false,
+//                    withCount = true,
+//                    hideEmpty = true,
                     lang = sysLang
                 )
-                println("分类数据请求完成，响应成功: ${response.isSuccessful}, 语言标记: $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, sysLang)
                     }
@@ -266,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)
     }

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

@@ -34,6 +34,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 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
@@ -95,26 +96,34 @@ fun AgentChatListScreen() {
 
                     if (isNetworkAvailable) {
                     Spacer(modifier = Modifier.height(39.dp))
-                    Image(
-                        painter = painterResource(
-                            id = if(AppState.darkMode) R.mipmap.qs_znt_qs_as_img
-                            else R.mipmap.invalid_name_5),
-                        contentDescription = "null data",
-                        modifier = Modifier
-                            .size(181.dp)
-                    )
-                    Spacer(modifier = Modifier.height(24.dp))
-                    Text(
-                        text = stringResource(R.string.agent_chat_empty_title),
-                        color = AppColors.text,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
-                    )
+                        Image(
+                            painter = painterResource(
+                                id = if(AppState.darkMode) R.mipmap.juhao_dark
+                                else R.mipmap.invalid_name_5),
+                            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.agent_chat_empty_title),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
+                        )
                     Spacer(modifier = Modifier.height(8.dp))
                     Text(
                         text = stringResource(R.string.agent_chat_empty_subtitle),
                         color = AppColors.secondaryText,
-                        fontSize = 14.sp
+                        fontSize = 14.sp,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 3,
+                        overflow = TextOverflow.Ellipsis
                     )
                 }
                     else {
@@ -130,13 +139,21 @@ fun AgentChatListScreen() {
                             text = stringResource(R.string.friend_chat_no_network_title),
                             color = AppColors.text,
                             fontSize = 16.sp,
-                            fontWeight = FontWeight.W600
+                            fontWeight = FontWeight.W600,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                         Text(
                             text = stringResource(R.string.friend_chat_no_network_subtitle),
                             color = AppColors.secondaryText,
-                            fontSize = 14.sp
+                            fontSize = 14.sp,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 3,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(16.dp))
                         ReloadButton(

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

@@ -175,24 +175,32 @@ fun AllChatListScreen() {
                         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.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,
                             fontSize = 16.sp,
-                            fontWeight = FontWeight.W600
+                            fontWeight = FontWeight.W600,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                         Text(
                             text = stringResource(R.string.friend_chat_empty_subtitle),
                             color = AppColors.secondaryText,
-                            fontSize = 14.sp
+                            fontSize = 14.sp,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 3,
+                            overflow = TextOverflow.Ellipsis
                         )
                     } else {
                         Spacer(modifier = Modifier.height(39.dp))
@@ -207,13 +215,21 @@ fun AllChatListScreen() {
                             text = stringResource(R.string.friend_chat_no_network_title),
                             color = AppColors.text,
                             fontSize = 16.sp,
-                            fontWeight = FontWeight.W600
+                            fontWeight = FontWeight.W600,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                         Text(
                             text = stringResource(R.string.friend_chat_no_network_subtitle),
                             color = AppColors.secondaryText,
-                            fontSize = 14.sp
+                            fontSize = 14.sp,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 3,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(16.dp))
                         ReloadButton(

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

@@ -83,26 +83,34 @@ fun FriendChatListScreen() {
 
                     if (isNetworkAvailable) {
                     Spacer(modifier = Modifier.height(39.dp))
-                    Image(
-                        painter = painterResource(
-                            id = if(AppState.darkMode) R.mipmap.qs_py_qs_as_img
-                            else R.mipmap.invalid_name_2),
-                        contentDescription = "null data",
-                        modifier = Modifier
-                            .size(181.dp)
-                    )
-                    Spacer(modifier = Modifier.height(24.dp))
-                    Text(
-                        text = stringResource(R.string.friend_chat_empty_title),
-                        color = AppColors.text,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
-                    )
+                        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,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
+                        )
                     Spacer(modifier = Modifier.height(8.dp))
                     Text(
                         text = stringResource(R.string.friend_chat_empty_subtitle),
                         color = AppColors.secondaryText,
-                        fontSize = 14.sp
+                        fontSize = 14.sp,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 3,
+                        overflow = TextOverflow.Ellipsis
                     )
                 }else {
                         Spacer(modifier = Modifier.height(39.dp))
@@ -117,13 +125,21 @@ fun FriendChatListScreen() {
                             text = stringResource(R.string.friend_chat_no_network_title),
                             color = AppColors.text,
                             fontSize = 16.sp,
-                            fontWeight = FontWeight.W600
+                            fontWeight = FontWeight.W600,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                         Text(
                             text = stringResource(R.string.friend_chat_no_network_subtitle),
                             color = AppColors.secondaryText,
-                            fontSize = 14.sp
+                            fontSize = 14.sp,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 3,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(16.dp))
                         ReloadButton(

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

@@ -23,6 +23,7 @@ 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
@@ -75,26 +76,34 @@ fun GroupChatListScreen() {
 
                     if (isNetworkAvailable) {
                     Spacer(modifier = Modifier.height(39.dp))
-                    Image(
-                        painter = painterResource(
-                            id = if(AppState.darkMode) R.mipmap.qs_ql_qs_as_img
-                            else R.mipmap.invalid_name_12),
-                        contentDescription = "null data",
-                        modifier = Modifier
-                            .size(181.dp)
-                    )
-                    Spacer(modifier = Modifier.height(24.dp))
-                    Text(
-                        text = stringResource(R.string.group_chat_empty),
-                        color = AppColors.text,
-                        fontSize = 16.sp,
-                        fontWeight = FontWeight.W600
-                    )
+                        Image(
+                            painter = painterResource(
+                                id = if(AppState.darkMode) R.mipmap.fei_dark
+                                else R.mipmap.invalid_name_12),
+                            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.group_chat_empty),
+                            color = AppColors.text,
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.W600,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
+                        )
                     Spacer(modifier = Modifier.height(8.dp))
                     Text(
                         text = stringResource(R.string.group_chat_empty_join),
                         color = AppColors.secondaryText,
-                        fontSize = 14.sp
+                        fontSize = 14.sp,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.padding(horizontal = 24.dp),
+                        maxLines = 3,
+                        overflow = TextOverflow.Ellipsis
                     )
                 }else {
                         Spacer(modifier = Modifier.height(39.dp))
@@ -109,13 +118,21 @@ fun GroupChatListScreen() {
                             text = stringResource(R.string.friend_chat_no_network_title),
                             color = AppColors.text,
                             fontSize = 16.sp,
-                            fontWeight = FontWeight.W600
+                            fontWeight = FontWeight.W600,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(8.dp))
                         Text(
                             text = stringResource(R.string.friend_chat_no_network_subtitle),
                             color = AppColors.secondaryText,
-                            fontSize = 14.sp
+                            fontSize = 14.sp,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(horizontal = 24.dp),
+                            maxLines = 3,
+                            overflow = TextOverflow.Ellipsis
                         )
                         Spacer(modifier = Modifier.height(16.dp))
                         ReloadButton(

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
@@ -122,10 +123,11 @@ open class BaseMomentModel :ViewModel(){
                     userService.unFollowUser(moment.authorId.toString())
                     EventBus.getDefault().post(FollowChangeEvent(moment.authorId, false))
                 } else {
-                    userService.followUser(moment.authorId.toString())
-                    EventBus.getDefault().post(FollowChangeEvent(moment.authorId, true))
+                    // 调用 FollowerNoticeViewModel.followUser() 实现与 FollowerNotice.kt 相同的效果
+                    // 该方法内部会调用 userService.followUser() 并发布 FollowChangeEvent 事件
+                    FollowerNoticeViewModel.followUser(moment.authorId)
                 }
-            } catch (e: Exception) {
+            }  catch (e: Exception) {
                 e.printStackTrace()
             }
         }

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

@@ -59,6 +59,7 @@ import androidx.compose.ui.graphics.ColorFilter
 import com.aiosman.ravenow.ui.composables.TabItem
 import com.aiosman.ravenow.ui.composables.UnderlineTabItem
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
+import com.aiosman.ravenow.ui.index.tabs.moment.tabs.shorts.ShortVideoScreen
 
 /**
  * 动态列表
@@ -71,8 +72,8 @@ fun MomentsList() {
     val navigationBarPaddings =
         WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() + 48.dp
     val statusBarPaddingValues = WindowInsets.systemBars.asPaddingValues()
-    // 现在有6个tab：推荐、短视频、新闻、探索、关注、热门
-    val tabCount = 6
+    // 根据登录状态设置标签页数量：游客模式5个tab，非游客模式6个tab
+    val tabCount = if (AppStore.isGuest) 5 else 6
     var pagerState = rememberPagerState { tabCount }
     var scope = rememberCoroutineScope()
     Column(
@@ -173,14 +174,14 @@ fun MomentsList() {
                         }
                     )
                 } else {
-                    // 热门标签 (游客模式)
+                    // 热门标签 (游客模式) - 在游客模式下，热门标签对应第3页
                     UnderlineTabItem(
                         text = stringResource(R.string.index_hot),
-                        isSelected = pagerState.currentPage == 4,
+                        isSelected = pagerState.currentPage == 3,
                         onClick = {
                             tabDebouncer {
                                 scope.launch {
-                                    pagerState.animateScrollToPage(4)
+                                    pagerState.animateScrollToPage(3)
                                 }
                             }
                         }
@@ -188,14 +189,15 @@ fun MomentsList() {
                 }
 
 
-                // 新闻标签
+                // 新闻标签 - 在游客模式下对应第4页，非游客模式下对应第5页
+                val newsPageIndex = if (AppStore.isGuest) 4 else 5
                 UnderlineTabItem(
                     text = stringResource(R.string.tab_news),
-                    isSelected = pagerState.currentPage == 5,
+                    isSelected = pagerState.currentPage == newsPageIndex,
                     onClick = {
                         tabDebouncer {
                             scope.launch {
-                                pagerState.animateScrollToPage(5)
+                                pagerState.animateScrollToPage(newsPageIndex)
                             }
                         }
                     }
@@ -234,6 +236,7 @@ fun MomentsList() {
                 }
                 1 -> {
                     // 短视频页面
+                    ShortVideoScreen()
                 }
                 2 -> {
                     // 动态页面 - 暂时显示时间线内容
@@ -248,12 +251,18 @@ fun MomentsList() {
                     }
                 }
                 4 -> {
-                    // 热门页面 (仅非游客用户)
-                    HotMomentsList()
+                    // 热门页面 (仅非游客用户) 或 新闻页面 (游客用户)
+                    if (AppStore.isGuest) {
+                        NewsScreen()
+                    } else {
+                        HotMomentsList()
+                    }
                 }
                 5 -> {
-                    // 新闻页面
-                    NewsScreen()
+                    // 新闻页面 (仅非游客用户)
+                    if (!AppStore.isGuest) {
+                        NewsScreen()
+                    }
                 }
             }
         }

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

@@ -15,6 +15,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
 import androidx.compose.foundation.lazy.staggeredgrid.items
 import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
@@ -137,8 +139,18 @@ fun DiscoverView() {
             val debouncer = rememberDebouncer()
 
             val textContent = momentItem.momentTextContent
+            // 对于英文和日文，每行字符数会更少，使用更保守的估算
+            val estimatedCharsPerLine = if (textContent.isNotEmpty()) {
+                // 检测是否包含非中文字符（英文、日文等）
+                val hasNonChinese = textContent.any { 
+                    val code = it.code
+                    !(code >= 0x4E00 && code <= 0x9FFF) // 不在中文字符范围内
+                }
+                if (hasNonChinese) 15 else 20 // 英文/日文每行更少字符
+            } else {
+                20
+            }
             val textLines = if (textContent.isNotEmpty()) {
-                val estimatedCharsPerLine = 20
                 val estimatedLines = (textContent.length / estimatedCharsPerLine) + 1
                 minOf(estimatedLines, 2) // 最多2行
             } else {
@@ -146,21 +158,20 @@ fun DiscoverView() {
             }
 
             val baseHeight = 200.dp
-            val singleLineTextHeight = 20.dp
-            val doubleLineTextHeight = 40.dp
+            val singleLineTextHeight = 24.dp // 增加高度以适应英文/日文
+            val doubleLineTextHeight = 44.dp // 增加高度以适应英文/日文
             val authorInfoHeight = 25.dp
             val paddingHeight = 10.dp
-            val paddingHeight2 =3.dp
+            val paddingHeight2 = 3.dp
             val totalHeight = baseHeight + when (textLines) {
                 0 -> authorInfoHeight + paddingHeight
                 1 -> singleLineTextHeight + authorInfoHeight + paddingHeight
-                else -> doubleLineTextHeight + authorInfoHeight +paddingHeight2
+                else -> doubleLineTextHeight + authorInfoHeight + paddingHeight2
             }
             
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(totalHeight)
                     .padding(2.dp)
                     .noRippleClickable {
                         debouncer {
@@ -173,7 +184,9 @@ fun DiscoverView() {
                     }
             ) {
                 Column(
-                    modifier = Modifier.fillMaxSize().background(AppColors.secondaryBackground, RoundedCornerShape(12.dp))
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(AppColors.secondaryBackground, RoundedCornerShape(12.dp))
                 ) {
                     CustomAsyncImage(
                         imageUrl = momentItem.images[0].thumbnail,
@@ -193,9 +206,9 @@ fun DiscoverView() {
                     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,
@@ -203,13 +216,19 @@ fun DiscoverView() {
                                 fontSize = 12.sp,
                                 color = AppColors.text,
                                 maxLines = 2,
-                                overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis
+                                overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+                                lineHeight = 16.sp // 设置行高以适应不同语言
                             )
                         }
 
+                        // 使用 Spacer 确保头像昵称栏始终在底部，有足够的空间
+                        Spacer(modifier = Modifier.weight(1f))
+
+                        // 头像昵称栏，确保始终完整显示，设置最小高度避免被挤压
                         Row(
                             modifier = Modifier
                                 .fillMaxWidth()
+                                .heightIn(min = 25.dp) // 最小高度确保完整显示，自适应避免被挤压
                                 .padding(top = 5.dp),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
@@ -225,7 +244,9 @@ fun DiscoverView() {
 
                             androidx.compose.material3.Text(
                                 text = momentItem.nickname,
-                                modifier = Modifier.padding(start = 4.dp),
+                                modifier = Modifier
+                                    .padding(start = 4.dp)
+                                    .weight(1f),
                                 fontSize = 11.sp,
                                 color = AppColors.text.copy(alpha = 0.6f),
                                 maxLines = 1,

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

@@ -0,0 +1,185 @@
+package com.aiosman.ravenow.ui.index.tabs.moment.tabs.shorts
+
+import android.util.Log
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.aiosman.ravenow.GuestLoginCheckOut
+import com.aiosman.ravenow.GuestLoginCheckOutScene
+import com.aiosman.ravenow.LocalAppTheme
+import com.aiosman.ravenow.LocalNavController
+import com.aiosman.ravenow.entity.MomentEntity
+import com.aiosman.ravenow.ui.NavigationRoute
+import com.aiosman.ravenow.ui.index.tabs.shorts.ShortViewCompose
+import kotlinx.coroutines.launch
+
+/**
+ * 短视频页面
+ */
+@Composable
+fun ShortVideoScreen() {
+    val viewModel = ShortVideoViewModel
+    val allMoments = viewModel.moments
+    val navController = LocalNavController.current
+    val scope = rememberCoroutineScope()
+    val AppColors = LocalAppTheme.current
+    val momentLoader = viewModel.momentLoader
+    // 记录当前播放的短视频索引，切换 Tab 返回时恢复
+    val currentIndex = rememberSaveable { androidx.compose.runtime.mutableStateOf(0) }
+    
+    // 过滤出包含视频的动态
+    val videoMoments = remember(allMoments) {
+        val filtered = allMoments.filter { it.videos != null && it.videos.isNotEmpty() }
+        Log.d("ShortVideoScreen", "过滤视频动态 - 总动态数: ${allMoments.size}, 包含视频的动态数: ${filtered.size}")
+        filtered.forEach { moment ->
+            Log.d("ShortVideoScreen", "视频动态 ID: ${moment.id}, 视频数: ${moment.videos?.size}, 第一个视频URL: ${moment.videos?.firstOrNull()?.url}")
+        }
+        filtered
+    }
+    
+    // 初始加载数据
+    LaunchedEffect(Unit) {
+        Log.d("ShortVideoScreen", "开始加载数据")
+        viewModel.refreshPager()
+    }
+    
+    // 加载更多数据
+    LaunchedEffect(allMoments.size, videoMoments.size) {
+        Log.d("ShortVideoScreen", "检查是否需要加载更多 - allMoments: ${allMoments.size}, videoMoments: ${videoMoments.size}, hasNext: ${momentLoader.hasNext}, isLoading: ${momentLoader.isLoading}")
+        if (allMoments.isNotEmpty() && videoMoments.size < 10 && momentLoader.hasNext && !momentLoader.isLoading) {
+            // 如果视频数量少于10个，尝试加载更多
+            Log.d("ShortVideoScreen", "开始加载更多数据")
+            viewModel.loadMore()
+        }
+    }
+    
+    // 加载状态
+    if (momentLoader.isLoading && videoMoments.isEmpty()) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(AppColors.background),
+            contentAlignment = Alignment.Center
+        ) {
+            Column(
+                modifier = Modifier.padding(16.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = androidx.compose.foundation.layout.Arrangement.Center
+            ) {
+                CircularProgressIndicator(color = AppColors.main)
+                Text(
+                    text = "加载中...",
+                    modifier = Modifier.padding(top = 16.dp),
+                    color = AppColors.text,
+                    fontSize = 14.sp
+                )
+            }
+        }
+    }
+    // 错误状态
+    else if (momentLoader.error != null && videoMoments.isEmpty()) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(AppColors.background),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text = "加载失败: ${momentLoader.error}",
+                color = AppColors.error,
+                fontSize = 14.sp
+            )
+        }
+    }
+    // 空状态 - 已加载但无视频
+    else if (!momentLoader.isLoading && videoMoments.isEmpty() && allMoments.isNotEmpty()) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(AppColors.background),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text = "暂无短视频\n已加载 ${allMoments.size} 条动态，但都不包含视频",
+                color = AppColors.text,
+                fontSize = 16.sp
+            )
+        }
+    }
+    // 初始状态 - 还没有加载过数据
+    else if (!momentLoader.isLoading && videoMoments.isEmpty() && allMoments.isEmpty() && momentLoader.error == null) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(AppColors.background),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text = "准备加载...",
+                color = AppColors.text,
+                fontSize = 16.sp
+            )
+        }
+    }
+    // 显示视频列表
+    else if (videoMoments.isNotEmpty()) {
+        ShortViewCompose(
+            videoMoments = videoMoments,
+            clickItemPosition = currentIndex.value,
+            onLikeClick = { moment ->
+                if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.LIKE_MOMENT)) {
+                    navController.navigate(NavigationRoute.Login.route)
+                } else {
+                    scope.launch {
+                        if (moment.liked) {
+                            viewModel.dislikeMoment(moment.id)
+                        } else {
+                            viewModel.likeMoment(moment.id)
+                        }
+                    }
+                }
+            },
+            onCommentClick = { moment ->
+                if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.COMMENT_MOMENT)) {
+                    navController.navigate(NavigationRoute.Login.route)
+                } else {
+                    scope.launch {
+                        viewModel.onAddComment(moment.id)
+                    }
+                }
+            },
+            onFavoriteClick = { moment ->
+                if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.LIKE_MOMENT)) {
+                    navController.navigate(NavigationRoute.Login.route)
+                } else {
+                    scope.launch {
+                        if (moment.isFavorite) {
+                            viewModel.unfavoriteMoment(moment.id)
+                        } else {
+                            viewModel.favoriteMoment(moment.id)
+                        }
+                    }
+                }
+            },
+            onShareClick = { moment ->
+                // TODO: 实现分享功能
+            },
+            onPageChanged = { idx -> currentIndex.value = idx }
+        )
+    }
+}
+

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

@@ -0,0 +1,21 @@
+package com.aiosman.ravenow.ui.index.tabs.moment.tabs.shorts
+
+import com.aiosman.ravenow.entity.MomentLoaderExtraArgs
+import com.aiosman.ravenow.ui.index.tabs.moment.BaseMomentModel
+import org.greenrobot.eventbus.EventBus
+
+object ShortVideoViewModel : BaseMomentModel() {
+    init {
+        EventBus.getDefault().register(this)
+    }
+    
+    override fun extraArgs(): MomentLoaderExtraArgs {
+        return MomentLoaderExtraArgs(explore = true, videoOnly = true)
+    }
+    
+    // 获取包含视频的动态列表
+    fun getVideoMoments(): List<com.aiosman.ravenow.entity.MomentEntity> {
+        return moments.filter { it.videos != null && it.videos.isNotEmpty() }
+    }
+}
+

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
@@ -100,6 +101,13 @@ 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
@@ -118,10 +126,11 @@ fun ProfileV3(
     onLike: (MomentEntity) -> Unit = {},
     onComment: (MomentEntity) -> Unit = {},
     onAgentClick: (AgentEntity) -> Unit = {},
-    postCount: Int? = null, // 新增参数用于传递帖子总数
+    postCount: Long? = null, // 新增参数用于传递帖子总数
 ) {
     val model = MyProfileViewModel
-    val pagerState = rememberPagerState(pageCount = { if (isAiAccount) 1 else 2 })
+    // Tabs: 动态、(可选)智能体、群聊
+    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) }
@@ -134,7 +143,8 @@ fun ProfileV3(
     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,
@@ -156,12 +166,13 @@ fun ProfileV3(
     val gridState = rememberLazyGridState()
     val scrollState = rememberScrollState()
 
-    val toolbarAlpha by remember {
+    // 计算导航栏背景透明度，根据滚动位置从0到1
+    val toolbarBackgroundAlpha by remember {
         derivedStateOf {
             if (!isSelf) {
                 1f
             } else {
-                val maxScroll = 500f // 最大滚动距离，可调整
+                val maxScroll = 600f // 增加最大滚动距离，让渐变更平缓
                 val progress = (scrollState.value.coerceAtMost(maxScroll.toInt()) / maxScroll).coerceIn(0f, 1f)
                 progress
             }
@@ -308,12 +319,19 @@ fun ProfileV3(
                     modifier = Modifier
                         .fillMaxWidth()
                         .height(bannerHeight.dp)
-                        .background(AppColors.profileBackground)
+                        .background(AppColors.profileBackground),
+                    contentAlignment = Alignment.Center
                 ) {
                     Box(
                         modifier = Modifier
-                            .fillMaxWidth()
-                            .height(bannerHeight.dp - 24.dp)
+                            .width(bannerWidth.dp)
+                            .height(bannerHeight.dp)
+                            .clip(
+                                RoundedCornerShape(
+                                    bottomStart = 32.dp,
+                                    bottomEnd = 32.dp
+                                )
+                            )
                             .let {
                                 if (isSelf && isMain) {
                                     it.noRippleClickable {
@@ -326,13 +344,6 @@ fun ProfileV3(
                                     it
                                 }
                             }
-                            .shadow(
-                                elevation = 6.dp,
-                                shape = RoundedCornerShape(
-                                    bottomStart = 32.dp,
-                                    bottomEnd = 32.dp
-                                ),
-                            )
                     ) {
                         CustomAsyncImage(
                             LocalContext.current,
@@ -347,6 +358,9 @@ fun ProfileV3(
                 Spacer(modifier = Modifier.height(100.dp))
             }
 
+            // 壁纸下方间距
+            Spacer(modifier = Modifier.height(16.dp))
+
             // 用户信息
             Box(
                 modifier = Modifier
@@ -357,41 +371,34 @@ fun ProfileV3(
                 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 {
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
-                ) {
-                    if (isSelf) {
-                        SelfProfileAction(
-                            onEditProfile = {
-                                navController.navigate(NavigationRoute.AccountEdit.route)
+                if (!isSelf && it.id != AppState.UserId) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 16.dp)
+                    ) {
+                        OtherProfileAction(
+                            it,
+                            onFollow = {
+                                onFollowClick()
                             },
-                            onPremiumClick = {
-                                navController.navigate(NavigationRoute.VipSelPage.route)
+                            onChat = {
+                                onChatClick()
                             }
                         )
-                    } else {
-                        if (it.id != AppState.UserId) {
-                            OtherProfileAction(
-                                it,
-                                onFollow = {
-                                    onFollowClick()
-                                },
-                                onChat = {
-                                    onChatClick()
-                                }
-                            )
-                        }
                     }
                 }
             }
@@ -445,39 +452,50 @@ fun ProfileV3(
                     pagerState = pagerState,
                     showAgentTab = !isAiAccount
                 )
-                Spacer(modifier = Modifier.height(8.dp))
                 HorizontalPager(
                     state = pagerState,
                     modifier = Modifier.height(500.dp) // 固定滚动高度
                 ) { idx ->
                     when (idx) {
-                        0 ->
-                            GalleryGrid(moments = moments)
-                        1 ->
-                            UserAgentsList(
-                                agents = agents,
-                                onAgentClick = onAgentClick,
-                                onAvatarClick = { agent ->
-                                    // 导航到智能体个人主页，需要通过openId获取用户ID
-                                    scope.launch {
-                                        try {
-                                            val userService = com.aiosman.ravenow.data.UserServiceImpl()
-                                            val profile = userService.getUserProfileByOpenId(agent.openId)
-                                            navController.navigate(
-                                                NavigationRoute.AccountProfile.route
-                                                    .replace("{id}", profile.id.toString())
-                                                    .replace("{isAiAccount}", "true")
-                                            )
-                                        } catch (e: Exception) {
-                                            // 处理错误
+                        0 -> GalleryGrid(moments = moments)
+                        1 -> {
+                            if (!isAiAccount) {
+                                UserAgentsList(
+                                    agents = agents,
+                                    onAgentClick = onAgentClick,
+                                    onAvatarClick = { agent ->
+                                        // 导航到智能体个人主页，需要通过openId获取用户ID
+                                        scope.launch {
+                                            try {
+                                                val userService = com.aiosman.ravenow.data.UserServiceImpl()
+                                                val profile = userService.getUserProfileByOpenId(agent.openId)
+                                                navController.navigate(
+                                                    NavigationRoute.AccountProfile.route
+                                                        .replace("{id}", profile.id.toString())
+                                                        .replace("{isAiAccount}", "true")
+                                                )
+                                            } catch (e: Exception) {
+                                                // 处理错误
+                                            }
                                         }
-                                    }
-                                },
-                                modifier = Modifier.fillMaxSize()
-                            )
+                                    },
+                                    modifier = Modifier.fillMaxSize()
+                                )
+                            } else {
+                                GroupChatPlaceholder()
+                            }
+                        }
+                        2 -> {
+                            if (!isAiAccount) {
+                                GroupChatPlaceholder()
+                            }
+                        }
                     }
                 }
             }
+            
+            // 底部间距，增加滚动距离
+            Spacer(modifier = Modifier.height(100.dp))
         }
 
         // 顶部导航栏
@@ -486,9 +504,13 @@ fun ProfileV3(
             isSelf = isSelf,
             profile = profile,
             navController = navController,
-            alpha = toolbarAlpha,
+            backgroundAlpha = toolbarBackgroundAlpha,
+            interactionCount = moments.sumOf { it.likeCount }, // 计算总点赞数作为互动数据
             onMenuClick = {
                 showOtherUserMenu = true
+            },
+            onShareClick = {
+                // TODO: 实现分享功能
             }
         )
 
@@ -562,6 +584,11 @@ fun ProfileV3(
 }
 }
 
+@Composable
+private fun GroupChatPlaceholder() {
+    GroupChatEmptyContent()
+}
+
 //顶部导航栏组件
 @Composable
 fun TopNavigationBar(
@@ -569,100 +596,201 @@ fun TopNavigationBar(
     isSelf: Boolean,
     profile: AccountProfileEntity?,
     navController: androidx.navigation.NavController,
-    alpha: Float,
-    onMenuClick: () -> Unit = {}
+    backgroundAlpha: Float,
+    interactionCount: Int = 0,
+    onMenuClick: () -> Unit = {},
+    onShareClick: () -> Unit = {}
 ) {
     val appColors = LocalAppTheme.current
+    val numberFormat = remember { NumberFormat.getNumberInstance(Locale.getDefault()) }
+    
+    // 根据背景透明度和暗色模式决定图标颜色
+    // 暗色模式下：图标始终为白色
+    // 亮色模式下：根据背景透明度决定，透明度为1时变黑，否则为白色
+    val iconColor = if (AppState.darkMode) {
+        Color.White // 暗色模式下图标始终为白色
+    } else {
+        if (backgroundAlpha >= 1f) Color.Black else Color.White
+    }
+    val cardBorderColor = if (AppState.darkMode) {
+        Color.White // 暗色模式下边框应为白色
+    } else {
+        if (backgroundAlpha >= 1f) Color.Black else Color.White
+    }
+    
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .graphicsLayer { this.alpha = alpha }
     ) {
-        Column(
+        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)
+            
+            if (AppState.darkMode) {
+                // 暗色模式下：从黑色（透明度0）逐渐变为黑色（透明度1）
+                val alpha = smoothProgress.coerceIn(0f, 1f)
+                Color.Black.copy(alpha = alpha)
+            } else {
+                // 亮色模式：初始状态：半透明深色，让白色图标清晰可见
+                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()
-                .background(appColors.profileBackground)
+                .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
         ) {
-            StatusBarSpacer()
+            // 左侧：互动数据卡片
             Row(
                 modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .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 = if (AppState.darkMode) Color.White else 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()
+            // 判断是否有背景图
+            val hasBanner = profile?.banner != null
+            
+            Row(
+                modifier = Modifier
+                    .align(Alignment.TopStart)
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .padding(top = statusBarPadding.calculateTopPadding()),
                 verticalAlignment = Alignment.CenterVertically
             ) {
-                if (!isMain) {
-                    Image(
-                        painter = painterResource(id = R.drawable.rider_pro_back_icon),
-                        contentDescription = "Back",
-                        modifier = Modifier
-                            .noRippleClickable {
-                                navController.navigateUp()
-                            }
-                            .size(24.dp),
-                        colorFilter = ColorFilter.tint(appColors.text)
-                    )
+                // 返回按钮：深色模式下为白色，亮色模式下为黑色
+                val backButtonColor = if (AppState.darkMode) Color.White else Color.Black
+                Image(
+                    painter = painterResource(id = R.drawable.rider_pro_back_icon),
+                    contentDescription = "Back",
+                    modifier = Modifier
+                        .noRippleClickable {
+                            navController.navigateUp()
+                        }
+                        .size(24.dp),
+                    colorFilter = ColorFilter.tint(backButtonColor) // 深色模式下为白色，亮色模式下为黑色
+                )
+                
+                // 未设置背景的用户（自己的主页且没有背景图）显示昵称
+                if (isSelf && !hasBanner && profile != null) {
                     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 ?: "",
+                        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)
-                    )
-                } else if (!isSelf) {
-                    Box(
-                        modifier = Modifier
-                            .noRippleClickable {
-                                onMenuClick()
-                            }
-                            .padding(16.dp)
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.rider_pro_more_horizon),
-                            contentDescription = "菜单",
-                            tint = appColors.text,
-                            modifier = Modifier.size(24.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
+                        color = backButtonColor // 深色模式下为白色，亮色模式下为黑色
                     )
                 }
             }
@@ -670,6 +798,77 @@ fun TopNavigationBar(
     }
 }
 
+// 分享图标（向上箭头）
+@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
+        )
+    }
+}
+
 /**
  * Agent菜单弹窗
  */

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

@@ -42,6 +42,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
 import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel
@@ -189,28 +191,37 @@ 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.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
+                fontWeight = FontWeight.W600,
+                textAlign = TextAlign.Center,
+                modifier = Modifier.padding(horizontal = 24.dp),
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis
             )
 
             Spacer(modifier = Modifier.height(8.dp))
 
             Text(
-                text = "发布一条动态，和世界打个招呼吧",
+                text = stringResource(R.string.publish_moment_greeting),
                 fontSize = 14.sp,
                 color = AppColors.secondaryText,
-                fontWeight = FontWeight.W400
+                fontWeight = FontWeight.W400,
+                textAlign = TextAlign.Center,
+                modifier = Modifier.padding(horizontal = 24.dp),
+                maxLines = 3,
+                overflow = TextOverflow.Ellipsis
             )
         }
     } else {
@@ -220,7 +231,7 @@ fun GalleryGrid(
             modifier = Modifier.fillMaxSize().padding(bottom = 8.dp),
         ) {
             itemsIndexed(moments) { idx, moment ->
-                if (moment != null) {
+                if (moment != null && moment.images.isNotEmpty()) {
                     val itemDebouncer = rememberDebouncer()
                     Box(
                         modifier = Modifier

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

@@ -0,0 +1,177 @@
+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.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.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
+
+@Composable
+fun GroupChatEmptyContent() {
+    var selectedSegment by remember { mutableStateOf(0) } // 0: 全部, 1: 公开, 2: 私有
+    val AppColors = LocalAppTheme.current
+    
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp)
+    ) {
+        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 = AppColors.text,
+                textAlign = TextAlign.Center,
+                modifier = Modifier.padding(horizontal = 24.dp),
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis
+            )
+        }
+    }
+}
+
+@Composable
+private fun SegmentedControl(
+    selectedIndex: Int,
+    onSegmentSelected: (Int) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val AppColors = LocalAppTheme.current
+    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,
+            appColors = AppColors
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 公开
+        SegmentButton(
+            text = stringResource(R.string.public_label),
+            isSelected = selectedIndex == 1,
+            onClick = { onSegmentSelected(1) },
+            width = 59.dp,
+            appColors = AppColors
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 私有
+        SegmentButton(
+            text = stringResource(R.string.private_label),
+            isSelected = selectedIndex == 2,
+            onClick = { onSegmentSelected(2) },
+            width = 54.dp,
+            appColors = AppColors
+        )
+    }
+}
+
+@Composable
+private fun SegmentButton(
+    text: String,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+    width: androidx.compose.ui.unit.Dp,
+    appColors: com.aiosman.ravenow.AppThemeData
+) {
+    Box(
+        modifier = Modifier
+            .width(width)
+            .height(32.dp)
+            .background(
+                color = if (isSelected) {
+                    appColors.checkedBackground // 使用选中背景色（暗色模式下是白色，亮色模式下是黑色）
+                } 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) {
+                appColors.checkedText // 选中时使用选中文本颜色（暗色模式下是黑色，亮色模式下是白色）
+            } else {
+                appColors.text // 未选中时使用文本颜色
+            }
+        )
+    }
+}
+
+@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

@@ -98,7 +98,7 @@ 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.W900,
                 color = if (profile.isFollowing) {

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

@@ -34,6 +34,7 @@ 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
@@ -60,15 +61,14 @@ fun UserAgentsList(
 ) {
     val AppColors = LocalAppTheme.current
 
-    LazyColumn(
-        modifier = modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-        if (agents.isEmpty()) {
-            item {
-                EmptyAgentsView()
-            }
-        } else {
+    if (agents.isEmpty()) {
+        // 使用带分段控制器的空状态布局
+        AgentEmptyContentWithSegments()
+    } else {
+        LazyColumn(
+            modifier = modifier.fillMaxSize(),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
             items(agents) { agent ->
                 UserAgentCard(
                     agent = agent,
@@ -76,11 +76,11 @@ fun UserAgentsList(
                     onAvatarClick = onAvatarClick
                 )
             }
-        }
             
-        // 底部间距
-        item {
-            Spacer(modifier = Modifier.height(120.dp))
+            // 底部间距
+            item {
+                Spacer(modifier = Modifier.height(120.dp))
+            }
         }
     }
 }
@@ -198,6 +198,188 @@ 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)
+    ) {
+        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,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.padding(horizontal = 24.dp),
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis
+                )
+
+                Spacer(modifier = Modifier.height(8.dp))
+
+                Text(
+                    text = stringResource(R.string.ai_companion_not_tool),
+                    fontSize = 14.sp,
+                    color = AppColors.secondaryText,
+                    fontWeight = FontWeight.W400,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.padding(horizontal = 24.dp),
+                    maxLines = 3,
+                    overflow = TextOverflow.Ellipsis
+                )
+            } 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
+) {
+    val AppColors = LocalAppTheme.current
+    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,
+            appColors = AppColors
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 公开
+        AgentSegmentButton(
+            text = stringResource(R.string.public_label),
+            isSelected = selectedIndex == 1,
+            onClick = { onSegmentSelected(1) },
+            width = 59.dp,
+            appColors = AppColors
+        )
+        
+        Spacer(modifier = Modifier.width(8.dp))
+        
+        // 私有
+        AgentSegmentButton(
+            text = stringResource(R.string.private_label),
+            isSelected = selectedIndex == 2,
+            onClick = { onSegmentSelected(2) },
+            width = 54.dp,
+            appColors = AppColors
+        )
+    }
+}
+
+@Composable
+private fun AgentSegmentButton(
+    text: String,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+    width: androidx.compose.ui.unit.Dp,
+    appColors: com.aiosman.ravenow.AppThemeData
+) {
+    Box(
+        modifier = Modifier
+            .width(width)
+            .height(32.dp)
+            .background(
+                color = if (isSelected) {
+                    appColors.checkedBackground // 使用选中背景色（暗色模式下是白色，亮色模式下是黑色）
+                } 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) {
+                appColors.checkedText // 选中时使用选中文本颜色（暗色模式下是黑色，亮色模式下是白色）
+            } else {
+                appColors.text // 未选中时使用文本颜色
+            }
+        )
+    }
+}
+
 @Composable
 fun EmptyAgentsView() {
     val AppColors = LocalAppTheme.current
@@ -212,7 +394,7 @@ fun EmptyAgentsView() {
         if (isNetworkAvailable) {
             Image(
                 painter = painterResource(
-                    id =if(AppState.darkMode) R.mipmap.ai_dark
+                    id = if(AppState.darkMode) R.mipmap.ai_dark
                     else R.mipmap.ai),
                 contentDescription = "暂无Agent",
                 modifier = Modifier
@@ -220,7 +402,8 @@ fun EmptyAgentsView() {
                     .align(Alignment.CenterHorizontally),
             )
 
-            Spacer(modifier = Modifier.height(24.dp))
+// 根据是否为深色模式调整间距
+            Spacer(modifier = Modifier.height(if(AppState.darkMode) 9.dp else 24.dp))
 
             Text(
                 text = "专属AI等你召唤",

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(
-                    painter = painterResource(id = R.drawable.rider_pro_images),
-                    contentDescription = "Gallery",
-                    tint = if (pagerState.currentPage == 0) AppColors.text else AppColors.text.copy(alpha = 0.6f),
-                    modifier = Modifier.size(24.dp)
+                Text(
+                    text = stringResource(R.string.index_dynamic),
+                    fontSize = 16.sp,
+                    fontWeight = if (pagerState.currentPage == 0) FontWeight.SemiBold else FontWeight.Medium,
+                    color = if (pagerState.currentPage == 0) AppColors.text else AppColors.secondaryText
                 )
+                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(AppColors.text)
+                    )
+                }
             }
             
-            // Agent Tab (只在非智能体用户时显示)
+            // 智能体 Tab (只在非智能体用户时显示)
             if (showAgentTab) {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
@@ -85,39 +87,53 @@ fun UserContentPageIndicator(
                         }
                         .padding(vertical = 12.dp)
                 ) {
-                    Icon(
-                        painter = painterResource(id = R.drawable.rider_pro_nav_ai),
-                        contentDescription = "Agents",
-                        tint = if (pagerState.currentPage == 1) AppColors.text else AppColors.text.copy(alpha = 0.6f),
-                        modifier = Modifier.size(24.dp)
+                    Text(
+                        text = stringResource(R.string.chat_ai),
+                        fontSize = 16.sp,
+                        fontWeight = if (pagerState.currentPage == 1) FontWeight.SemiBold else FontWeight.Medium,
+                        color = if (pagerState.currentPage == 1) AppColors.text else AppColors.secondaryText
                     )
+                    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(AppColors.text)
+                        )
+                    }
                 }
             }
-        }
             
-        // 下划线指示器
-        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
-                    )
-            )
+            // 群聊 Tab (只在非智能体用户时显示)
             if (showAgentTab) {
-                Box(
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
                     modifier = Modifier
                         .weight(1f)
-                        .height(2.dp)
-                        .background(
-                            if (pagerState.currentPage == 1) AppColors.text else Color.Transparent
+                        .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) AppColors.text else AppColors.secondaryText
+                    )
+                    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(AppColors.text)
                         )
-                )
+                    }
+                }
             }
         }
     }

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,
-                        fontSize = 16.sp,
-                        color = AppColors.text
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 15.sp,
+                        color = AppColors.text,
+                        textAlign = TextAlign.Center
                     )
-                    Spacer(modifier = Modifier.height(8.dp))
+                    Spacer(modifier = Modifier.height(2.dp))
                     Text(
-                        text = "帖子",
-                        color = AppColors.text
+                        text = stringResource(R.string.posts),
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 11.sp,
+                        color = AppColors.text,
+                        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(),
-                        fontWeight = FontWeight.W600,
-                        fontSize = 16.sp,
-                        color = AppColors.text
+                        text = formattedFollowerCount,
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 15.sp,
+                        color = AppColors.text,
+                        textAlign = TextAlign.Center
                     )
-                    Spacer(modifier = Modifier.height(8.dp))
+                    Spacer(modifier = Modifier.height(2.dp))
                     Text(
-                        text = "粉丝",
-                        color = AppColors.text
+                        text = stringResource(R.string.followers_upper),
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 11.sp,
+                        color = AppColors.text,
+                        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,
-                        fontSize = 16.sp,
-                        color = AppColors.text
+                        fontWeight = FontWeight.Medium,
+                        fontSize = 15.sp,
+                        color = AppColors.text,
+                        textAlign = TextAlign.Center
                     )
-                    Spacer(modifier = Modifier.height(8.dp))
+                    Spacer(modifier = Modifier.height(2.dp))
                     Text(
-                        text = "关注",
-                        color = AppColors.text
+                        text = stringResource(R.string.following_upper),
+                        fontWeight = FontWeight.Normal,
+                        fontSize = 11.sp,
+                        color = AppColors.text,
+                        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()){
+        
+        // 中间：昵称、简介、创建者信息
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+        ) {
+            // 昵称
             Text(
-                text = accountProfileEntity.bio,
-                fontSize = 14.sp,
-                color = AppColors.secondaryText,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                text = accountProfileEntity.nickName,
+                fontWeight = FontWeight.Bold,
+                fontSize = 22.sp,
+                letterSpacing = (-0.3).sp,
+                color = AppColors.text
             )
-        }else{
+            
+            Spacer(modifier = Modifier.height(4.dp))
+            
+            // 个人简介
+            if (accountProfileEntity.bio.isNotEmpty()) {
+                Text(
+                    text = accountProfileEntity.bio,
+                    fontSize = 13.sp,
+                    color = AppColors.secondaryText,
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis
+                )
+            } else {
+                Text(
+                    text = "Welcome to my fantiac word i will show you something about magic",
+                    fontSize = 13.sp,
+                    color = AppColors.secondaryText,
+                    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 = AppColors.text
+                )
+            }
+            
+            // 星座标签
+            if (!zodiac.isNullOrEmpty()) {
+                ProfileTag(
+                    text = zodiac,
+                    backgroundColor = Color(0x33FFCC00), // 255/255, 204/255, 0/255, alpha 0.2
+                    textColor = AppColors.text
+                )
+            }
+            
+            // 编辑标签（仅自己可见）
+            if (isSelf) {
+                ProfileTag(
+                    text = stringResource(R.string.edit_profile),
+                    backgroundColor = Color(0x14947A80), // 124/255, 116/255, 128/255, alpha 0.08
+                    textColor = AppColors.text,
+                    leadingIcon = {
+                        EditIcon(
+                            color = AppColors.text,
+                            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 = "No bio here.",
-                fontSize = 14.sp,
-                color = AppColors.secondaryText,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                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/shorts/ShortViewCompose.kt

@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -61,27 +62,65 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.common.util.Util
 import androidx.media3.datasource.DataSource
 import androidx.media3.datasource.DefaultDataSourceFactory
+import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
 import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.PlayerView
 import com.aiosman.ravenow.R
+import com.aiosman.ravenow.entity.MomentEntity
 import com.aiosman.ravenow.ui.comment.CommentModalContent
+import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 @Composable
 fun ShortViewCompose(
-    videoItemsUrl: List<String>,
+    videoItemsUrl: List<String> = emptyList(),
+    videoMoments: List<MomentEntity> = emptyList(),
     clickItemPosition: Int = 0,
     videoHeader: @Composable () -> Unit = {},
-    videoBottom: @Composable () -> Unit = {}
+    videoBottom: @Composable ((MomentEntity) -> Unit)? = null,
+    onLikeClick: ((MomentEntity) -> Unit)? = null,
+    onCommentClick: ((MomentEntity) -> Unit)? = null,
+    onFavoriteClick: ((MomentEntity) -> Unit)? = null,
+    onShareClick: ((MomentEntity) -> Unit)? = null,
+    onPageChanged: ((Int) -> Unit)? = null
 ) {
-    val pagerState: PagerState = run {
-        remember {
-            PagerState(clickItemPosition, 0, videoItemsUrl.size - 1)
+    // 优先使用 videoMoments，如果没有则使用 videoItemsUrl
+    val items = if (videoMoments.isNotEmpty()) {
+        videoMoments.mapNotNull { moment ->
+            // MomentVideoEntity 的 url 已经在 toMomentItem() 中添加了 BASE_SERVER 前缀
+            moment.videos?.firstOrNull()?.url
         }
+    } else {
+        videoItemsUrl
+    }
+    
+    // 如果视频列表为空，显示空状态
+    if (items.isEmpty()) {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text = "暂无视频",
+                color = Color.White,
+                fontSize = 16.sp
+            )
+        }
+        return
+    }
+    
+    // 确保 items 不为空后再创建 PagerState
+    val pagerState: PagerState = remember(items.size) {
+        val maxPage = maxOf(0, items.size - 1)
+        PagerState(
+            currentPage = clickItemPosition.coerceIn(0, maxPage),
+            minPage = 0,
+            maxPage = maxPage
+        )
     }
     val initialLayout = remember {
         mutableStateOf(true)
@@ -89,20 +128,39 @@ fun ShortViewCompose(
     val pauseIconVisibleState = remember {
         mutableStateOf(false)
     }
+    
     Pager(
+        modifier = Modifier
+            .fillMaxSize()
+            .clip(RectangleShape),
         state = pagerState,
         orientation = Orientation.Vertical,
         offscreenLimit = 1
     ) {
         pauseIconVisibleState.value = false
+        val currentMoment = if (videoMoments.isNotEmpty() && page < videoMoments.size) {
+            videoMoments[page]
+        } else {
+            null
+        }
+        
+        // 同步页码到外部（用于返回时恢复进度）
+        LaunchedEffect(pagerState.currentPage) {
+            onPageChanged?.invoke(pagerState.currentPage)
+        }
         SingleVideoItemContent(
-            videoItemsUrl[page],
-            pagerState,
-            page,
-            initialLayout,
-            pauseIconVisibleState,
-            videoHeader,
-            videoBottom
+            videoUrl = items[page],
+            moment = currentMoment,
+            pagerState = pagerState,
+            pager = page,
+            initialLayout = initialLayout,
+            pauseIconVisibleState = pauseIconVisibleState,
+            VideoHeader = videoHeader,
+            VideoBottom = videoBottom,
+            onLikeClick = onLikeClick,
+            onCommentClick = onCommentClick,
+            onFavoriteClick = onFavoriteClick,
+            onShareClick = onShareClick
         )
     }
 
@@ -116,18 +174,39 @@ fun ShortViewCompose(
 @Composable
 private fun SingleVideoItemContent(
     videoUrl: String,
+    moment: MomentEntity?,
     pagerState: PagerState,
     pager: Int,
     initialLayout: MutableState<Boolean>,
     pauseIconVisibleState: MutableState<Boolean>,
-    VideoHeader: @Composable() () -> Unit,
-    VideoBottom: @Composable() () -> Unit,
+    VideoHeader: @Composable() () -> Unit = {},
+    VideoBottom: @Composable ((MomentEntity) -> Unit)? = null,
+    onLikeClick: ((MomentEntity) -> Unit)? = null,
+    onCommentClick: ((MomentEntity) -> Unit)? = null,
+    onFavoriteClick: ((MomentEntity) -> Unit)? = null,
+    onShareClick: ((MomentEntity) -> Unit)? = null
 ) {
-    Box(modifier = Modifier.fillMaxSize()) {
-        VideoPlayer(videoUrl, pagerState, pager, pauseIconVisibleState)
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .clip(RectangleShape) // 确保内容不会溢出到box外
+    ) {
+        VideoPlayer(
+            videoUrl = videoUrl,
+            moment = moment,
+            pagerState = pagerState,
+            pager = pager,
+            pauseIconVisibleState = pauseIconVisibleState,
+            onLikeClick = onLikeClick,
+            onCommentClick = onCommentClick,
+            onFavoriteClick = onFavoriteClick,
+            onShareClick = onShareClick
+        )
         VideoHeader.invoke()
-        Box(modifier = Modifier.align(Alignment.BottomStart)) {
-            VideoBottom.invoke()
+        if (moment != null && VideoBottom != null) {
+            Box(modifier = Modifier.align(Alignment.BottomStart)) {
+                VideoBottom.invoke(moment)
+            }
         }
         if (initialLayout.value) {
             Box(
@@ -143,9 +222,14 @@ private fun SingleVideoItemContent(
 @Composable
 fun VideoPlayer(
     videoUrl: String,
+    moment: MomentEntity?,
     pagerState: PagerState,
     pager: Int,
     pauseIconVisibleState: MutableState<Boolean>,
+    onLikeClick: ((MomentEntity) -> Unit)? = null,
+    onCommentClick: ((MomentEntity) -> Unit)? = null,
+    onFavoriteClick: ((MomentEntity) -> Unit)? = null,
+    onShareClick: ((MomentEntity) -> Unit)? = null,
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -158,9 +242,20 @@ fun VideoPlayer(
         ExoPlayer.Builder(context)
             .build()
             .apply {
+                // 创建带有认证头的 HttpDataSource.Factory
+                val httpDataSourceFactory = DefaultHttpDataSource.Factory()
+                    .setUserAgent(Util.getUserAgent(context, context.packageName))
+                    .setDefaultRequestProperties(
+                        mapOf(
+                            "Authorization" to "Bearer ${com.aiosman.ravenow.AppStore.token ?: ""}",
+                            "DEVICE-OS" to "Android"
+                        )
+                    )
+                
+                // 创建 DataSource.Factory，使用自定义的 HttpDataSource.Factory
                 val dataSourceFactory: DataSource.Factory = DefaultDataSourceFactory(
                     context,
-                    Util.getUserAgent(context, context.packageName)
+                    httpDataSourceFactory
                 )
                 val source = ProgressiveMediaSource.Factory(dataSourceFactory)
                     .createMediaSource(MediaItem.fromUri(Uri.parse(videoUrl)))
@@ -275,70 +370,107 @@ fun VideoPlayer(
             modifier = Modifier.padding(bottom = 72.dp, end = 12.dp),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
-            UserAvatar()
-            VideoBtn(icon = R.drawable.rider_pro_video_like, text = "975.9k")
-            VideoBtn(icon = R.drawable.rider_pro_video_comment, text = "1896") {
-                showCommentModal = true
+            if (moment != null) {
+                UserAvatar(avatarUrl = moment.avatar)
+                VideoBtn(
+                    icon = R.drawable.rider_pro_video_like,
+                    text = formatCount(moment.likeCount)
+                ) {
+                    moment?.let { onLikeClick?.invoke(it) }
+                }
+                VideoBtn(
+                    icon = R.drawable.rider_pro_video_comment,
+                    text = formatCount(moment.commentCount)
+                ) {
+                    moment?.let {
+                        showCommentModal = true
+                        onCommentClick?.invoke(it)
+                    }
+                }
+                VideoBtn(
+                    icon = R.drawable.rider_pro_video_favor,
+                    text = formatCount(moment.favoriteCount)
+                ) {
+                    moment?.let { onFavoriteClick?.invoke(it) }
+                }
+                VideoBtn(
+                    icon = R.drawable.rider_pro_video_share,
+                    text = formatCount(moment.shareCount)
+                ) {
+                    moment?.let { onShareClick?.invoke(it) }
+                }
+            } else {
+                UserAvatar()
+                VideoBtn(icon = R.drawable.rider_pro_video_like, text = "0")
+                VideoBtn(icon = R.drawable.rider_pro_video_comment, text = "0") {
+                    showCommentModal = true
+                }
+                VideoBtn(icon = R.drawable.rider_pro_video_favor, text = "0")
+                VideoBtn(icon = R.drawable.rider_pro_video_share, text = "0")
             }
-            VideoBtn(icon = R.drawable.rider_pro_video_favor, text = "234")
-            VideoBtn(icon = R.drawable.rider_pro_video_share, text = "677k")
         }
     }
     // info
-    Box(
-        modifier = Modifier.fillMaxSize(),
-        contentAlignment = Alignment.BottomStart
-    ) {
-        Column(modifier = Modifier.padding(start = 16.dp, bottom = 16.dp)) {
-            Row(
-                modifier = Modifier
-                    .padding(bottom = 8.dp)
-                    .background(color = Color.Gray),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Start,
-            ) {
-                Image(
-                    modifier = Modifier
-                        .size(20.dp)
-                        .padding(start = 4.dp, end = 6.dp),
-                    painter = painterResource(id = R.drawable.rider_pro_video_location),
-                    contentDescription = ""
-                )
+    if (moment != null) {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.BottomStart
+        ) {
+            Column(modifier = Modifier.padding(start = 16.dp, bottom = 16.dp)) {
+                if (moment.location.isNotEmpty() && moment.location != "Worldwide") {
+                    Row(
+                        modifier = Modifier
+                            .padding(bottom = 8.dp)
+                            .background(color = Color.Gray),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Start,
+                    ) {
+                        Image(
+                            modifier = Modifier
+                                .size(20.dp)
+                                .padding(start = 4.dp, end = 6.dp),
+                            painter = painterResource(id = R.drawable.rider_pro_video_location),
+                            contentDescription = ""
+                        )
+                        Text(
+                            modifier = Modifier.padding(end = 4.dp),
+                            text = moment.location,
+                            fontSize = 12.sp,
+                            color = Color.White,
+                            style = TextStyle(fontWeight = FontWeight.Bold)
+                        )
+                    }
+                }
                 Text(
-                    modifier = Modifier.padding(end = 4.dp),
-                    text = "USA",
-                    fontSize = 12.sp,
+                    text = "@${moment.nickname}",
+                    fontSize = 16.sp,
                     color = Color.White,
                     style = TextStyle(fontWeight = FontWeight.Bold)
                 )
+                if (moment.momentTextContent.isNotEmpty()) {
+                    Text(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 4.dp),
+                        text = moment.momentTextContent,
+                        fontSize = 16.sp,
+                        color = Color.White,
+                        style = TextStyle(fontWeight = FontWeight.Bold),
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 2
+                    )
+                }
             }
-            Text(
-                text = "@Kevinlinpr",
-                fontSize = 16.sp,
-                color = Color.White,
-                style = TextStyle(fontWeight = FontWeight.Bold)
-            )
-            Text(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 4.dp), // 确保Text占用可用宽度
-                text = "Pedro Acosta to join KTM in 2025 on a multi-year deal! \uD83D\uDFE0",
-                fontSize = 16.sp,
-                color = Color.White,
-                style = TextStyle(fontWeight = FontWeight.Bold),
-                overflow = TextOverflow.Ellipsis,  // 超出范围时显示省略号
-                maxLines = 2 // 最多显示两行
-            )
         }
     }
 
-    if (showCommentModal) {
+    if (showCommentModal && moment != null) {
         ModalBottomSheet(
             onDismissRequest = { showCommentModal = false },
             containerColor = Color.White,
             sheetState = sheetState
         ) {
-            CommentModalContent() {
+            CommentModalContent(postId = moment.id) {
 
             }
         }
@@ -346,16 +478,37 @@ fun VideoPlayer(
 }
 
 @Composable
-fun UserAvatar() {
-    Image(
+fun UserAvatar(avatarUrl: String? = null) {
+    Box(
         modifier = Modifier
             .padding(bottom = 16.dp)
             .size(40.dp)
             .border(width = 3.dp, color = Color.White, shape = RoundedCornerShape(40.dp))
-            .clip(
-                RoundedCornerShape(40.dp)
-            ), painter = painterResource(id = R.drawable.default_avatar), contentDescription = ""
-    )
+            .clip(RoundedCornerShape(40.dp))
+    ) {
+        if (avatarUrl != null && avatarUrl.isNotEmpty()) {
+            CustomAsyncImage(
+                imageUrl = avatarUrl,
+                contentDescription = "用户头像",
+                modifier = Modifier.fillMaxSize(),
+                defaultRes = R.drawable.default_avatar
+            )
+        } else {
+            Image(
+                painter = painterResource(id = R.drawable.default_avatar),
+                contentDescription = "用户头像"
+            )
+        }
+    }
+}
+
+// 格式化数字显示
+private fun formatCount(count: Int): String {
+    return when {
+        count >= 1_000_000 -> String.format("%.1fM", count / 1_000_000.0)
+        count >= 1_000 -> String.format("%.1fK", count / 1_000.0)
+        else -> count.toString()
+    }
 }
 
 @Composable

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

@@ -123,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.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
         }
+        termsError = 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
                 },
+                label = stringResource(R.string.login_email_label),
                 hint = stringResource(R.string.text_hint_email),
-                error = emailError
+                error = emailError,
+                leadingIcon = {
+                    Image(
+                        painter = painterResource(id = R.mipmap.icon_email_light),
+                        contentDescription = "Email",
+                        modifier = Modifier.size(24.dp),
+                        colorFilter = ColorFilter.tint(IconGray)
+                    )
+                },
+                customBackgroundColor = LightGrayBackground,
+                customCornerRadius = 16f
             )
-            Spacer(modifier = Modifier.padding(4.dp))
+            
+            // 密码输入框
             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)
+                    )
+                },
+                customBackgroundColor = LightGrayBackground,
+                customCornerRadius = 16f
             )
-            Spacer(modifier = Modifier.padding(4.dp))
+            
+            // 确认密码输入框
             TextInputField(
                 modifier = Modifier
-                    .fillMaxWidth(),
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp),
                 text = confirmPassword,
                 onValueChange = {
                     confirmPassword = it
                 },
                 password = true,
-                hint = stringResource(R.string.text_hint_confirm_password),
-                error = confirmPasswordError
+                label = stringResource(R.string.confirm_password_label),
+                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)
+                    )
+                },
+                customBackgroundColor = LightGrayBackground,
+                customCornerRadius = 16f
             )
-            Spacer(modifier = Modifier.height(8.dp))
+            
+            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
-                        .width(345.dp),
-                    text = stringResource(R.string.lets_ride_upper),
-                    backgroundColor = Color(0xffda3832),
-                    color = Color.White
+                    modifier = Modifier.fillMaxWidth(),
+                    text = stringResource(R.string.sign_up_upper),
+                    backgroundColor = PurpleButton,
+                    color = Color.White,
+                    fontSize = 17.sp,
+                    fontWeight = FontWeight.W600
                 ) {
                     scope.launch(Dispatchers.IO) {
                         registerUser()
                     }
                 }
             }
-
         }
-
     }
 
 }

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

@@ -72,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)

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

@@ -26,6 +26,8 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -52,6 +54,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
@@ -66,6 +70,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.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -151,71 +156,45 @@ 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(top = 8.dp, start = 16.dp, end = 16.dp, bottom = 8.dp),
-                verticalAlignment = Alignment.CenterVertically
+                    .padding(start = 16.dp)
+                    .height(40.dp)
+                    .widthIn(min = 100.dp, max = 200.dp)
+                    .wrapContentWidth()
+                    .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,
-                    fontSize = 15.sp,
+                    fontWeight = FontWeight.Normal,
+                    fontSize = 13.sp,
                     modifier = Modifier
-                        .padding(start = 8.dp)
-                        .weight(1f),
-                    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)
-
+                        .padding(start = 2.dp),
+                    color = Color.White,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
                 )
             }
 
@@ -352,7 +331,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 +345,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 +392,8 @@ fun NewPostTopBar(onSendClick: () -> Unit = {}) {
                             }finally {
                                 uploading = false
                             }
-
-
-
                         }
-                    }
+                    },
             )
         }
 
@@ -488,72 +486,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),
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 8.dp),
+        contentPadding = PaddingValues(horizontal = 19.dp, vertical = 4.dp),
+        modifier = Modifier.fillMaxWidth(),
         horizontalArrangement = Arrangement.spacedBy(8.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
+        // 添加按钮
         if (canAddMoreImages) {
             item {
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
                         .aspectRatio(1f)
-                        .clip(RoundedCornerShape(16.dp)) // 设置圆角
-                        .background(AppColors.basicMain) // 设置背景色
+                        .clip(RoundedCornerShape(24.dp))
+                        .background(Color(0xFFFAF9FB))
                         .noRippleClickable {
                             addImageDebouncer {
                                 if (model.imageList.size < 9) {
@@ -572,20 +522,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)) // 设置圆角
-                        .background(AppColors.basicMain) // 设置背景色
+                        .clip(RoundedCornerShape(24.dp))
+                        .background(Color(0xFFFAF9FB))
                         .noRippleClickable {
                             if (model.imageList.size < 9) {
                                 val photoFile = File(context.cacheDir, "photo.jpg")
@@ -605,13 +556,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/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

@@ -26,7 +26,7 @@ fun SplashScreen() {
     ) {
         // 居中的图标
         Image(
-            painter = painterResource(id = R.mipmap.invalid_name),
+            painter = painterResource(id = R.mipmap.kp_logo_img),
             contentDescription = "App Logo",
             modifier = Modifier
                 .align(Alignment.Center)