A

Revert "lottie依赖"

This reverts commit 89227edccf.

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

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

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

@@ -43,7 +43,12 @@ import com.google.firebase.analytics.analytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import com.aiosman.ravenow.ui.splash.SplashScreen
 
 class MainActivity : ComponentActivity() {
     // Firebase Analytics
@@ -79,10 +84,10 @@ class MainActivity : ComponentActivity() {
     @RequiresApi(Build.VERSION_CODES.P)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        
+
         // 设置屏幕方向为竖屏
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-        
+
         // 监听应用生命周期
         ProcessLifecycleOwner.get().lifecycle.addObserver(MainActivityLifecycleObserver())
         // 创建通知渠道
@@ -122,75 +127,84 @@ class MainActivity : ComponentActivity() {
             }
 
             setContent {
-                CompositionLocalProvider(
-                    LocalAppTheme provides AppState.appTheme
-                ) {
-                    CheckUpdateDialog()
-                    Navigation(startDestination) { navController ->
-                        // 处理带有 postId 的通知点击
-                        val postId = intent.getStringExtra("POST_ID")
-                        var commentId = intent.getStringExtra("COMMENT_ID")
-                        val action = intent.getStringExtra("ACTION")
-                        if (action == "newFollow") {
-                            navController.navigate(NavigationRoute.Followers.route)
-                            return@Navigation
-                        }
-                        if (action == "followCount") {
-                            navController.navigate(NavigationRoute.Followers.route)
-                            return@Navigation
-                        }
-                        if (action == "TRTC_NEW_MESSAGE") {
-                            val userService:UserService = UserServiceImpl()
-                            val sender = intent.getStringExtra("SENDER")
-                            sender?.let {
-                                scope.launch {
-                                    try {
-                                        val profile = userService.getUserProfileByTrtcUserId(it,0)
-                                        navController.navigate(NavigationRoute.Chat.route.replace(
-                                            "{id}",
-                                            profile.id.toString()
-                                        ))
-                                    }catch (e:Exception){
-                                        e.printStackTrace()
+                var showSplash by remember { mutableStateOf(true) }
+
+                LaunchedEffect(Unit) {
+                    kotlinx.coroutines.delay(2000)
+                    showSplash = false
+                }
+
+                if (showSplash) {
+                    SplashScreen()
+                } else {
+                    CompositionLocalProvider(
+                        LocalAppTheme provides AppState.appTheme
+                    ) {
+                        CheckUpdateDialog()
+                        Navigation(startDestination) { navController ->
+
+                            // 处理带有 postId 的通知点击
+                            val postId = intent.getStringExtra("POST_ID")
+                            var commentId = intent.getStringExtra("COMMENT_ID")
+                            val action = intent.getStringExtra("ACTION")
+                            if (action == "newFollow") {
+                                navController.navigate(NavigationRoute.Followers.route)
+                                return@Navigation
+                            }
+                            if (action == "followCount") {
+                                navController.navigate(NavigationRoute.Followers.route)
+                                return@Navigation
+                            }
+                            if (action == "TRTC_NEW_MESSAGE") {
+                                val userService:UserService = UserServiceImpl()
+                                val sender = intent.getStringExtra("SENDER")
+                                sender?.let {
+                                    scope.launch {
+                                        try {
+                                            val profile = userService.getUserProfileByTrtcUserId(it,0)
+                                            navController.navigate(NavigationRoute.Chat.route.replace(
+                                                "{id}",
+                                                profile.id.toString()
+                                            ))
+                                        }catch (e:Exception){
+                                            e.printStackTrace()
+                                        }
                                     }
                                 }
+                                return@Navigation
                             }
-                            return@Navigation
-                        }
 
-                        if (commentId == null) {
-                            commentId = "0"
-                        }
-
-                        if (postId != null) {
-                            Log.d("MainActivity", "Navigation to Post$postId")
-                            navController.navigateToPost(
-                                id = postId.toInt(),
-                                highlightCommentId = commentId.toInt(),
-                                initImagePagerIndex = 0
-                            )
-                        }
-                        // 处理分享过来的图片
-                        if (intent?.action == Intent.ACTION_SEND || intent?.action == Intent.ACTION_SEND_MULTIPLE) {
-                            val imageUris: List<Uri>? = if (intent.action == Intent.ACTION_SEND) {
-                                listOf(intent.getParcelableExtra(Intent.EXTRA_STREAM)!!)
-                            } else {
-                                intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM)
+                            if (commentId == null) {
+                                commentId = "0"
                             }
-                            NewPostViewModel.asNewPostWithImageUris(imageUris!!.map { it.toString() })
-                            navController.navigate(NavigationRoute.NewPost.route)
 
+                            if (postId != null) {
+                                Log.d("MainActivity", "Navigation to Post$postId")
+                                navController.navigateToPost(
+                                    id = postId.toInt(),
+                                    highlightCommentId = commentId.toInt(),
+                                    initImagePagerIndex = 0
+                                )
+                            }
+                            // 处理分享过来的图片
+                            if (intent?.action == Intent.ACTION_SEND || intent?.action == Intent.ACTION_SEND_MULTIPLE) {
+                                val imageUris: List<Uri>? = if (intent.action == Intent.ACTION_SEND) {
+                                    listOf(intent.getParcelableExtra(Intent.EXTRA_STREAM)!!)
+                                } else {
+                                    intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM)
+                                }
+                                NewPostViewModel.asNewPostWithImageUris(imageUris!!.map { it.toString() })
+                                navController.navigate(NavigationRoute.NewPost.route)
+                            }
                         }
                     }
                 }
-
-
             }
-
         }
     }
 
 
+
     /**
      * 请求通知权限
      */

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

@@ -67,7 +67,7 @@ data class SendChatAiRequestBody(
     @SerializedName("skipTrtc")
     val skipTrtc: Boolean? = true,
 
-)
+    )
 
 
 data class CreateGroupChatRequestBody(
@@ -77,11 +77,13 @@ data class CreateGroupChatRequestBody(
     val userIds: List<String>,
     @SerializedName("promptIds")
     val promptIds: List<String>,
-    )
+)
 
 data class JoinGroupChatRequestBody(
     @SerializedName("trtcId")
-    val trtcId: String,
+    val trtcId: String? = null,
+    @SerializedName("roomId")
+    val roomId: Int? = null,
 )
 
 data class LoginUserRequestBody(
@@ -271,6 +273,132 @@ data class RemoveAccountRequestBody(
     val password: String,
 )
 
+// API 错误响应（用于加入房间等接口的错误处理）
+data class ApiErrorResponse(
+    @SerializedName("err")
+    val error: String,
+    @SerializedName("success")
+    val success: Boolean
+)
+
+// 群聊中的用户信息
+data class GroupChatUser(
+    @SerializedName("ID")
+    val id: Int,
+    @SerializedName("CreatedAt")
+    val createdAt: String,
+    @SerializedName("UpdatedAt")
+    val updatedAt: String,
+    @SerializedName("DeletedAt")
+    val deletedAt: String?,
+    @SerializedName("userSessionId")
+    val userSessionId: String,
+    @SerializedName("sessions")
+    val sessions: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("prompts")
+    val prompts: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("isAgent")
+    val isAgent: Boolean
+)
+
+// 智能体角色信息
+data class GroupChatPrompt(
+    @SerializedName("ID")
+    val id: Int,
+    @SerializedName("CreatedAt")
+    val createdAt: String,
+    @SerializedName("UpdatedAt")
+    val updatedAt: String,
+    @SerializedName("DeletedAt")
+    val deletedAt: String?,
+    @SerializedName("Title")
+    val title: String,
+    @SerializedName("Desc")
+    val desc: String,
+    @SerializedName("Value")
+    val value: String,
+    @SerializedName("Enable")
+    val enable: Boolean,
+    @SerializedName("UserSessions")
+    val userSessions: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("Avatar")
+    val avatar: String,
+    @SerializedName("AuthorId")
+    val authorId: Int?,
+    @SerializedName("Author")
+    val author: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("TokenCount")
+    val tokenCount: Int,
+    @SerializedName("OpenId")
+    val openId: String,
+    @SerializedName("Public")
+    val public: Boolean,
+    @SerializedName("BreakMode")
+    val breakMode: Boolean,
+    @SerializedName("DocNamespace")
+    val docNamespace: String,
+    @SerializedName("UseRag")
+    val useRag: Boolean,
+    @SerializedName("RagThreshold")
+    val ragThreshold: Double,
+    @SerializedName("WorkflowId")
+    val workflowId: Int?,
+    @SerializedName("Workflow")
+    val workflow: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("WorkflowInputs")
+    val workflowInputs: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("Source")
+    val source: String,
+    @SerializedName("categories")
+    val categories: Any? // 根据实际需要可以定义具体类型
+)
+
+// 群聊详细信息响应
+data class GroupChatResponse(
+    @SerializedName("ID")
+    val id: Int,
+    @SerializedName("CreatedAt")
+    val createdAt: String,
+    @SerializedName("UpdatedAt")
+    val updatedAt: String,
+    @SerializedName("DeletedAt")
+    val deletedAt: String?,
+    @SerializedName("name")
+    val name: String,
+    @SerializedName("description")
+    val description: String,
+    @SerializedName("creatorId")
+    val creatorId: Int,
+    @SerializedName("creator")
+    val creator: Any?, // 根据实际需要可以定义具体类型
+    @SerializedName("trtcRoomId")
+    val trtcRoomId: String,
+    @SerializedName("trtcType")
+    val trtcType: String,
+    @SerializedName("cover")
+    val cover: String,
+    @SerializedName("avatar")
+    val avatar: String,
+    @SerializedName("recommendBanner")
+    val recommendBanner: String,
+    @SerializedName("isRecommended")
+    val isRecommended: Boolean,
+    @SerializedName("allowInHot")
+    val allowInHot: Boolean,
+    @SerializedName("users")
+    val users: List<GroupChatUser>,
+    @SerializedName("prompts")
+    val prompts: List<GroupChatPrompt>,
+    @SerializedName("source")
+    val source: String
+)
+class CategoryTemplateTranslation(
+    @SerializedName("name")
+    val name: String,
+    @SerializedName("description")
+    val description: String,
+)
+
 data class CategoryTemplate(
     @SerializedName("id")
     val id: Int,
@@ -295,19 +423,19 @@ data class CategoryTemplate(
     @SerializedName("createdAt")
     val createdAt: String,
     @SerializedName("updatedAt")
-    val updatedAt: String
-)
-
-data class CategoryListResponse(
-    @SerializedName("page")
-    val page: Int,
-    @SerializedName("pageSize")
-    val pageSize: Int,
-    @SerializedName("total")
-    val total: Int,
-    @SerializedName("list")
-    val list: List<CategoryTemplate>
-)
+    val updatedAt: String,
+    @SerializedName("translations")
+    val translations: Map<String, CategoryTemplateTranslation>?
+) {
+    /**
+     * 获取本地化名称，优先使用当前语言的翻译，如果没有则使用默认名称
+     */
+    fun getLocalizedName(): String {
+        // 这里可以根据需要添加国际化逻辑
+        // 目前直接返回默认名称
+        return name
+    }
+}
 
 interface RaveNowAPI {
     @GET("membership/config")
@@ -588,9 +716,26 @@ interface RaveNowAPI {
     suspend fun getAgent(
         @Query("page") page: Int = 1,
         @Query("pageSize") pageSize: Int = 20,
-        @Query("withWorkflow") withWorkflow: Int = 1,
+        @Query("order") order: String? = null,
+        @Query("orderKey") orderKey: String? = null,
+        @Query("createdAt") createdAt: String? = null,
+        @Query("updatedAt") updatedAt: String? = null,
+        @Query("createdStart") createdStart: String? = null,
+        @Query("createdEnd") createdEnd: String? = null,
+        @Query("updatedStart") updatedStart: String? = null,
+        @Query("updatedEnd") updatedEnd: String? = null,
+        @Query("title") title: String? = null,
         @Query("authorId") authorId: Int? = null,
+        @Query("authorOpenId") authorOpenId: String? = null,
+        @Query("showPrivate") showPrivate: String? = null,
+        @Query("explore") explore: String? = null,
+        @Query("desc") desc: String? = null,
+        @Query("withWorkflow") withWorkflow: String? = null,
+        @Query("hasAvatar") hasAvatar: String? = null,
+        @Query("random") random: String? = null,
+        @Query("categoryName") categoryName: String? = null,
         @Query("categoryIds") categoryIds: List<Int>? = null,
+        @Query("uncategorized") uncategorized: String? = null,
     ): Response<DataContainer<ListContainer<Agent>>>
 
     @GET("outside/my/prompts")
@@ -619,7 +764,10 @@ interface RaveNowAPI {
     suspend fun agentMoment(@Body body: AgentMomentRequestBody): Response<DataContainer<String>>
 
     @GET("outside/rooms/open")
-    suspend fun createGroupChatAi(@Query("trtcGroupId") trtcGroupId: String): Response<DataContainer<Unit>>
+    suspend fun createGroupChatAi(
+        @Query("trtcGroupId") trtcGroupId: String? = null,
+        @Query("roomId") roomId: Int? = null
+    ): Response<DataContainer<GroupChatResponse>>
 
     @POST("outside/rooms/create-single-chat")
     suspend fun createSingleChat(@Body body: SingleChatRequestBody): Response<DataContainer<Unit>>
@@ -634,6 +782,7 @@ interface RaveNowAPI {
     suspend fun getRooms(@Query("page") page: Int = 1,
                          @Query("pageSize") pageSize: Int = 20,
                          @Query("isRecommended") isRecommended: Int = 1,
+                         @Query("random") random: Int? = null,
     ): Response<ListContainer<Room>>
 
     @GET("outside/rooms/detail")
@@ -655,7 +804,7 @@ interface RaveNowAPI {
         @Query("withParent") withParent: Boolean? = null,
         @Query("withCount") withCount: Boolean? = null,
         @Query("hideEmpty") hideEmpty: Boolean? = null
-    ): Response<DataContainer<CategoryListResponse>>
+    ): Response<ListContainer<CategoryTemplate>>
 
     @GET("outside/categories/tree")
     suspend fun getCategoryTree(
@@ -668,14 +817,6 @@ interface RaveNowAPI {
         @Path("id") id: Int
     ): Response<DataContainer<CategoryTemplate>>
 
-    @GET("outside/prompts")
-    suspend fun getPromptsByCategory(
-        @Query("categoryIds") categoryIds: List<Int>? = null,
-        @Query("categoryName") categoryName: String? = null,
-        @Query("uncategorized") uncategorized: String? = null,
-        @Query("page") page: Int? = null,
-        @Query("pageSize") pageSize: Int? = null
-    ): Response<ListContainer<Agent>>
 
 }
 

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

@@ -45,6 +45,7 @@ import com.aiosman.ravenow.ui.chat.ChatScreen
 import com.aiosman.ravenow.ui.chat.GroupChatScreen
 import com.aiosman.ravenow.ui.comment.CommentsScreen
 import com.aiosman.ravenow.ui.comment.notice.CommentNoticeScreen
+import com.aiosman.ravenow.ui.composables.AgentCreatedSuccessIndicator
 import com.aiosman.ravenow.ui.crop.ImageCropScreen
 import com.aiosman.ravenow.ui.favourite.FavouriteListPage
 import com.aiosman.ravenow.ui.favourite.FavouriteNoticeScreen
@@ -70,6 +71,7 @@ import com.aiosman.ravenow.ui.post.NewPostScreen
 import com.aiosman.ravenow.ui.post.PostScreen
 import com.aiosman.ravenow.ui.profile.AccountProfileV2
 import com.aiosman.ravenow.ui.index.tabs.profile.vip.VipSelPage
+import com.aiosman.ravenow.ui.notification.NotificationScreen
 
 sealed class NavigationRoute(
     val route: String,
@@ -115,6 +117,7 @@ sealed class NavigationRoute(
     data object GroupInfo : NavigationRoute("GroupInfo/{id}")
     data object VipSelPage : NavigationRoute("VipSelPage")
     data object RemoveAccountScreen: NavigationRoute("RemoveAccount")
+    data object NotificationScreen : NavigationRoute("NotificationScreen")
 }
 
 
@@ -590,6 +593,13 @@ fun NavigationController(
             }
         }
 
+        composable(route = NavigationRoute.NotificationScreen.route) {
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                NotificationScreen()
+            }
+        }
 
     }
 
@@ -615,6 +625,7 @@ fun Navigation(
                     navController = navController,
                     startDestination = startDestination
                 )
+                AgentCreatedSuccessIndicator()
             }
         }
     }

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

@@ -1,5 +1,8 @@
 package com.aiosman.ravenow.ui.account
 
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -47,12 +50,24 @@ 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.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 com.aiosman.ravenow.ConstVars
+import com.aiosman.ravenow.ui.composables.pickupAndCompressLauncher
+import java.io.File
 
 /**
  * 编辑用户资料界面
  */
 @Composable
-fun AccountEditScreen2() {
+fun AccountEditScreen2(onUpdateBanner: ((Uri, File, Context) -> Unit)? = null,) {
     val model = AccountEditViewModel
     val navController = LocalNavController.current
     val context = LocalContext.current
@@ -61,6 +76,19 @@ fun AccountEditScreen2() {
     
     // 防抖导航器
     val debouncedNavigation = rememberDebouncedNavigation()
+
+    // 添加图片选择启动器
+    val scope = rememberCoroutineScope()
+    val pickBannerImageLauncher = pickupAndCompressLauncher(
+        context,
+        scope,
+        maxSize = ConstVars.BANNER_IMAGE_MAX_SIZE,
+        quality = 100
+    ) { uri, file ->
+        // 处理选中的图片
+        onUpdateBanner?.invoke(uri, file, context)
+    }
+
     fun onNicknameChange(value: String) {
         // 去除换行符，确保昵称不包含换行
         val cleanValue = value.replace("\n", "").replace("\r", "")
@@ -152,8 +180,61 @@ fun AccountEditScreen2() {
                 )
             }
         }
-        Spacer(modifier = Modifier.height(44.dp))
-        
+
+
+        // 添加横幅图片区域
+        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 {
@@ -180,7 +261,15 @@ fun AccountEditScreen2() {
                         modifier = Modifier
                             .size(32.dp)
                             .clip(CircleShape)
-                            .background(appColors.main)
+                            .background(
+                                brush = Brush.linearGradient(
+                                colors = listOf(
+                                    Color(0xFF7c45ed),
+                                    Color(0x997c68ef),
+                                    Color(0xFF7bd8f8)
+                                )
+                            ),
+                                )
                             .align(Alignment.BottomEnd)
                             .debouncedClickable(
                                 debounceTime = 800L
@@ -198,7 +287,7 @@ fun AccountEditScreen2() {
                         )
                     }
                 }
-                Spacer(modifier = Modifier.height(58.dp))
+                Spacer(modifier = Modifier.height(18.dp))
                 Column(
                     modifier = Modifier
                         .weight(1f)

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,18 +4,23 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
@@ -24,7 +29,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.LocalNavController
@@ -35,6 +42,8 @@ import com.aiosman.ravenow.ui.composables.StatusBarSpacer
 import com.aiosman.ravenow.ui.favourite.FavouriteListViewModel.refreshPager
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
+import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.utils.NetworkUtils
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -71,55 +80,120 @@ fun FavouriteListPage() {
                 ) {
                     NoticeScreenHeader(stringResource(R.string.favourites_upper), moreIcon = false)
                 }
-                LazyVerticalGrid(
-                    columns = GridCells.Fixed(3),
-                    modifier = Modifier.fillMaxSize().padding(horizontal = 16.dp)
-                ) {
-                    items(moments.itemCount) { idx ->
-                        val momentItem = moments[idx] ?: return@items
-                        Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .aspectRatio(1f)
-                                .padding(2.dp)
-                                .noRippleClickable {
-                                    navController.navigateToPost(
-                                        id = momentItem.id,
-                                        highlightCommentId = 0,
-                                        initImagePagerIndex = 0
-                                    )
-                                }
+                val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+                var moments = dataFlow.collectAsLazyPagingItems()
+
+                if (!isNetworkAvailable) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(top=149.dp),
+                        contentAlignment = Alignment.TopCenter
+                    ) {
+                        Column(
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            modifier = Modifier.fillMaxWidth()
                         ) {
-                            CustomAsyncImage(
-                                imageUrl = momentItem.images[0].thumbnail,
-                                contentDescription = "",
-                                modifier = Modifier
-                                    .fillMaxSize()
-                                    .clip(RoundedCornerShape(8.dp)),
-                                context = context
+                            Image(
+                                painter = painterResource(id = R.mipmap.invalid_name_10),
+                                contentDescription = "network error",
+                                modifier = Modifier.size(181.dp)
                             )
-                            if (momentItem.images.size > 1) {
-                                Box(
+                            Spacer(modifier = Modifier.size(24.dp))
+                            Text(
+                                text = stringResource(R.string.friend_chat_no_network_title),
+                                color = AppColors.text,
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.W600
+                            )
+                            Spacer(modifier = Modifier.size(8.dp))
+                            Text(
+                                text = stringResource(R.string.friend_chat_no_network_subtitle),
+                                color = AppColors.secondaryText,
+                                fontSize = 14.sp,
+                                fontWeight = FontWeight.W400
+                            )
+                            Spacer(modifier = Modifier.height(16.dp))
+                            ReloadButton(
+                                onClick = {
+                                    model.refreshPager(force = true)
+                                }
+                            )
+                        }
+                    }
+                } else if(moments.itemCount == 0) {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(top=189.dp),
+                        contentAlignment = Alignment.TopCenter
+                    ) {
+                        Column(
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Image(
+                                painter = painterResource(
+                                    id = if (com.aiosman.ravenow.AppState.darkMode) R.mipmap.syss_yh_qs_as_img
+                                    else R.mipmap.invalid_name_1),
+                                contentDescription = "No favourites",
+                                modifier = Modifier.size(110.dp)
+                            )
+                            Spacer(modifier = Modifier.size(24.dp))
+                            Text(
+                                text = stringResource(R.string.favourites_null),
+                                color = AppColors.text,
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.W600
+                            )
+                        }
+                    }
+                }else{
+                    LazyVerticalGrid(
+                        columns = GridCells.Fixed(3),
+                        modifier = Modifier.fillMaxSize().padding(horizontal = 16.dp)
+                    ) {
+                        items(moments.itemCount) { idx ->
+                            val momentItem = moments[idx] ?: return@items
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .aspectRatio(1f)
+                                    .padding(2.dp)
+                                    .noRippleClickable {
+                                        navController.navigateToPost(
+                                            id = momentItem.id,
+                                            highlightCommentId = 0,
+                                            initImagePagerIndex = 0
+                                        )
+                                    }
+                            ) {
+                                CustomAsyncImage(
+                                    imageUrl = momentItem.images[0].thumbnail,
+                                    contentDescription = "",
                                     modifier = Modifier
-                                        .padding(top = 8.dp, end = 8.dp)
-                                        .align(Alignment.TopEnd)
-                                ) {
-                                    Image(
-                                        modifier = Modifier.size(24.dp),
-                                        painter = painterResource(R.drawable.rider_pro_picture_more),
-                                        contentDescription = "",
-                                    )
+                                        .fillMaxSize()
+                                        .clip(RoundedCornerShape(8.dp)),
+                                    context = context
+                                )
+                                if (momentItem.images.size > 1) {
+                                    Box(
+                                        modifier = Modifier
+                                            .padding(top = 8.dp, end = 8.dp)
+                                            .align(Alignment.TopEnd)
+                                    ) {
+                                        Image(
+                                            modifier = Modifier.size(24.dp),
+                                            painter = painterResource(R.drawable.rider_pro_picture_more),
+                                            contentDescription = "",
+                                        )
+                                    }
                                 }
                             }
-
-
                         }
-
                     }
                 }
-
             }
-
             PullRefreshIndicator(
                 FavouriteListViewModel.isLoading,
                 state,

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

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -19,6 +20,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -37,6 +39,8 @@ import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
 import kotlinx.coroutines.launch
+import com.aiosman.ravenow.utils.NetworkUtils
+import com.aiosman.ravenow.ui.network.ReloadButton
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -67,7 +71,47 @@ fun FollowerListScreen(userId: Int) {
         ) {
             NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
         }
-        if (users.itemCount == 0) {
+        val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+        if (!isNetworkAvailable) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = 149.dp),
+                contentAlignment = Alignment.TopCenter
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(181.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = appColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = appColors.text,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            model.loadData(userId, true)
+                        }
+                    )
+                }
+            }
+        } else if (users.itemCount == 0) {
             Box(
                 modifier = Modifier
                     .fillMaxSize()
@@ -81,7 +125,7 @@ fun FollowerListScreen(userId: Int) {
                     Image(
                         painter = painterResource(
                             id =if(AppState.darkMode) R.mipmap.qst_fs_qs_as_img
-                            else R.mipmap.qst_fs_qs_img),
+                            else R.mipmap.invalid_name_8),
                         contentDescription = null,
                         modifier = Modifier.size(181.dp)
                     )

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

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -37,7 +38,9 @@ import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import com.aiosman.ravenow.ui.composables.FollowButton
 import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
+import com.aiosman.ravenow.ui.network.ReloadButton
 import kotlinx.coroutines.launch
+import com.aiosman.ravenow.utils.NetworkUtils
 
 /**
  * 关注消息列表
@@ -54,19 +57,51 @@ fun FollowerNoticeScreen() {
         val model = FollowerNoticeViewModel
         var dataFlow = model.followerItemsFlow
         var followers = dataFlow.collectAsLazyPagingItems()
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(vertical = 16.dp)
-                .background(color = AppColors.background)
-        ) {
-            NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
-        }
         LaunchedEffect(Unit) {
             model.reload()
             model.updateNotice()
         }
-        if (followers.itemCount == 0) {
+        val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
+
+        if (!isNetworkAvailable) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top=149.dp),
+                contentAlignment = Alignment.TopCenter
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Image(
+                        painter = painterResource(id = R.mipmap.invalid_name_10),
+                        contentDescription = "network error",
+                        modifier = Modifier.size(181.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_title),
+                        color = AppColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    androidx.compose.material.Text(
+                        text = stringResource(R.string.friend_chat_no_network_subtitle),
+                        color = AppColors.text,
+                        fontSize = 14.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                    Spacer(modifier = Modifier.height(16.dp))
+                    ReloadButton(
+                        onClick = {
+                            model.reload(force = true)
+                        }
+                    )
+                }
+            }
+        } else if (followers.itemCount == 0) {
             Box(
                 modifier = Modifier
                     .fillMaxSize()
@@ -80,7 +115,7 @@ fun FollowerNoticeScreen() {
                     Image(
                         painter = painterResource(
                             id =if(AppState.darkMode) R.mipmap.qst_fs_qs_as_img
-                            else R.mipmap.qst_fs_qs_img),
+                            else R.mipmap.invalid_name_8),
                         contentDescription = "No Followers",
                         modifier = Modifier.size(181.dp)
                     )

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

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

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

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

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

@@ -12,6 +12,7 @@ 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.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -28,19 +29,15 @@ import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
 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.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -52,6 +49,10 @@ 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.ui.platform.LocalContext
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.material.CircularProgressIndicator
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import com.aiosman.ravenow.AppStore
@@ -78,20 +79,18 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items as gridItems
+import androidx.compose.ui.zIndex
 
 // 检测是否接近列表底部的扩展函数
 fun LazyListState.isScrolledToEnd(buffer: Int = 3): Boolean {
     val layoutInfo = this.layoutInfo
     val totalItemsCount = layoutInfo.totalItemsCount
     val lastVisibleItemIndex = layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
-    
+
     return lastVisibleItemIndex >= (totalItemsCount - buffer)
 }
 
-@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun Agent() {
     val AppColors = LocalAppTheme.current
@@ -111,6 +110,19 @@ fun Agent() {
         viewModel.ensureDataLoaded()
     }
 
+    // 列表滚动状态（用于吸顶与加载更多）
+    val listState = rememberLazyListState()
+
+    // 监听滚动到底部，加载更多网格数据
+    LaunchedEffect(listState) {
+        snapshotFlow { listState.isScrolledToEnd() }
+            .collect { atEnd ->
+                if (atEnd && !viewModel.isLoading) {
+                    viewModel.loadMoreGridAgentData()
+                }
+            }
+    }
+
     // 防抖状态
     var lastClickTime by remember { mutableStateOf(0L) }
 
@@ -122,70 +134,61 @@ fun Agent() {
         }
     }
 
-    val agentItems = viewModel.agentItems
-    var selectedTabIndex by remember { mutableStateOf(0) }
-    
-    // 无限滚动状态
-    val listState = rememberLazyListState()
-    
-    // 创建一个可观察的滚动到底部状态
-    val isScrolledToEnd by remember {
-        derivedStateOf {
-            listState.isScrolledToEnd()
-        }
-    }
-    
-    // 检测滚动到底部并加载更多数据
-    LaunchedEffect(isScrolledToEnd) {
-        if (isScrolledToEnd && !viewModel.isLoadingMore && agentItems.isNotEmpty() && viewModel.hasMoreData) {
-            viewModel.loadMoreAgents()
-        }
-    }
-
-    Scaffold(
-        topBar = {
-            TopAppBar(
-                title = {
-                    androidx.compose.material3.Text(
-                        text = "Rave AI",
-                        fontSize = 20.sp,
-                        fontWeight = FontWeight.W900,
-                        color = AppColors.text
-                    )
-                },
-                actions = {
-                    Image(
-                        painter = painterResource(id = R.drawable.rider_pro_nav_search),
-                        contentDescription = "search",
-                        modifier = Modifier
-                            .size(24.dp)
-                            .noRippleClickable {
-                                navController.navigate(NavigationRoute.Search.route)
-                            },
-                        colorFilter = ColorFilter.tint(AppColors.text)
-                    )
-                },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = AppColors.background
+    Box(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        // 固定顶部搜索条
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(AppColors.background)
+                .zIndex(999.0f)
+                .height(44.dp + statusBarPaddingValues.calculateTopPadding())
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .fillMaxHeight().padding(top = 32.dp, start = 16.dp, end = 16.dp),
+                horizontalArrangement = Arrangement.Start,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = "Rave AI",
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.W900,
+                    color = AppColors.text,
+                    modifier = Modifier
+                        .align(Alignment.CenterVertically)
                 )
-            )
-        },
-        containerColor = AppColors.background,
-        contentWindowInsets = WindowInsets(0, 0, 0, 0)
-    ) { paddingValues ->
+
+                Spacer(modifier = Modifier.weight(1f))
+
+                Image(
+                    painter = painterResource(id = R.drawable.rider_pro_nav_search),
+                    contentDescription = "search",
+                    modifier = Modifier
+                        .size(24.dp)
+                        .noRippleClickable {
+                            navController.navigate(NavigationRoute.Search.route)
+                        },
+                    colorFilter = ColorFilter.tint(AppColors.text)
+                )
+            }
+        }
+
         LazyColumn(
             state = listState,
             modifier = Modifier
                 .fillMaxSize()
-                .padding(paddingValues)
                 .padding(
+                    top = 44.dp + statusBarPaddingValues.calculateTopPadding() + 15.dp,
                     bottom = navigationBarPaddings,
                     start = 16.dp,
                     end = 16.dp
                 )
         ) {
 
-            // 类别标签页 - 吸顶
+            // 动态标签页
             stickyHeader(key = "category_tabs") {
                 Column(
                     modifier = Modifier
@@ -193,101 +196,33 @@ fun Agent() {
                         .background(AppColors.background)
                         .padding(top = 4.dp, bottom = 8.dp)
                 ) {
-                    LazyRow(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .wrapContentHeight()
-                            .padding(bottom = 8.dp),
-                        horizontalArrangement = Arrangement.Start,
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        item {
-                            CustomTabItem(
-                                text = stringResource(R.string.agent_recommend),
-                                isSelected = selectedTabIndex == 0,
-                                onClick = {
-                                    selectedTabIndex = 0
-                                    viewModel.loadAllAgents()
+                    val selectedTabIndex = viewModel.selectedCategoryIndex
+                    if (viewModel.categories.isNotEmpty()) {
+                        LazyRow(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .wrapContentHeight()
+                                .padding(bottom = 16.dp),
+                            horizontalArrangement = Arrangement.Start,
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            viewModel.categories.forEachIndexed { index, category ->
+                                item {
+                                    CustomTabItem(
+                                        text = category.getLocalizedName(),
+                                        isSelected = selectedTabIndex == index,
+                                        onClick = { viewModel.selectCategory(index) }
+                                    )
+                                }
+                                if (index < viewModel.categories.size - 1) {
+                                    item { TabSpacer() }
                                 }
-                            )
-                        }
-
-                        item {
-                            TabSpacer()
-                        }
-
-                        // 动态添加分类标签
-                        viewModel.categories.take(4).forEachIndexed { index, category ->
-                            item {
-                                CustomTabItem(
-                                    text = category.name,
-                                    isSelected = selectedTabIndex == index + 1,
-                                    onClick = {
-                                        selectedTabIndex = index + 1
-                                        viewModel.loadAgentsByCategory(category.id)
-                                    }
-                                )
                             }
-
-                            item {
-                                TabSpacer()
-                            }
-                        }
-
-                        item {
-                            CustomTabItem(
-                                text = "scenes",
-                                isSelected = selectedTabIndex == 1,
-                                onClick = {
-                                    selectedTabIndex = 1
-                                }
-                            )
-                        }
-
-                        item {
-                            TabSpacer()
-                        }
-
-                        item {
-                            CustomTabItem(
-                                text = "voices",
-                                isSelected = selectedTabIndex == 6,
-                                onClick = {
-                                    selectedTabIndex = 6
-                                }
-                            )
-                        }
-
-                        item {
-                            TabSpacer()
-                        }
-
-                        item {
-                            CustomTabItem(
-                                text = "anime",
-                                isSelected = selectedTabIndex == 7,
-                                onClick = {
-                                    selectedTabIndex = 7
-                                }
-                            )
-                        }
-
-                        item {
-                            TabSpacer()
-                        }
-
-                        item {
-                            CustomTabItem(
-                                text = "assist",
-                                isSelected = selectedTabIndex == 8,
-                                onClick = {
-                                    selectedTabIndex = 8
-                                }
-                            )
                         }
                     }
                 }
             }
+
             // 推荐内容区域
             item {
                 Column(
@@ -295,23 +230,59 @@ fun Agent() {
                         .fillMaxWidth()
                         .padding(vertical = 8.dp)
                 ) {
-                    when {
-                        selectedTabIndex == 0 -> {
-                            AgentViewPagerSection(agentItems = viewModel.agentItems.take(15), viewModel)
-                        }
-                        selectedTabIndex in 1..viewModel.categories.size -> {
-                            AgentViewPagerSection(agentItems = viewModel.agentItems.take(15), viewModel)
-                        }
-                        else -> {
-                            val shuffledAgents = viewModel.agentItems.shuffled().take(15)
-                            AgentViewPagerSection(agentItems = shuffledAgents, viewModel)
-                        }
+                    AgentViewPagerSection(agentItems = viewModel.topAgentItems, viewModel)
+                }
+            }
+
+            // 热门聊天室
+            stickyHeader(key = "hot_rooms_header") {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(AppColors.background)
+                        .padding(top = 8.dp, bottom = 12.dp),
+                    horizontalArrangement = Arrangement.Start,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Image(
+                        painter = painterResource(R.mipmap.rider_pro_hot_room),
+                        contentDescription = "chat room",
+                        modifier = Modifier.size(28.dp)
+                    )
+                    Spacer(modifier = Modifier.width(4.dp))
+                    androidx.compose.material3.Text(
+                        text = stringResource(R.string.hot_rooms),
+                        fontSize = 16.sp,
+                        fontWeight = androidx.compose.ui.text.font.FontWeight.W900,
+                        color = AppColors.text
+                    )
+                }
+            }
+
+            // 热门聊天室网格
+            items(viewModel.chatRooms.chunked(2)) { rowRooms ->
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 12.dp),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    rowRooms.forEach { chatRoom ->
+                        ChatRoomCard(
+                            chatRoom = chatRoom,
+                            navController = LocalNavController.current,
+                            modifier = Modifier.weight(1f)
+                        )
+                    }
+                    if (rowRooms.size == 1) {
+                        Spacer(modifier = Modifier.weight(1f))
                     }
                 }
             }
 
+            item { Spacer(modifier = Modifier.height(20.dp)) }
 
-            // "发现更多" 标题 - 吸顶
+            // 发现区域
             stickyHeader(key = "discover_more") {
                 Row(
                     modifier = Modifier
@@ -322,9 +293,9 @@ fun Agent() {
                     verticalAlignment = Alignment.Bottom
                 ) {
                     Image(
-                        painter = painterResource(R.mipmap.rider_pro_agent2),
+                        painter = painterResource(R.mipmap.bars_x_buttons_home_n_copy_2),
                         contentDescription = "agent",
-                        modifier = Modifier.size(28.dp),
+                        modifier = Modifier.size(28.dp)
                     )
                     Spacer(modifier = Modifier.width(4.dp))
                     androidx.compose.material3.Text(
@@ -335,38 +306,42 @@ fun Agent() {
                     )
                 }
             }
+            item { Spacer(modifier = Modifier.height(20.dp)) }
 
-            // Agent网格 - 使用行式布局
-            items(
-                items = agentItems.chunked(2),
-                key = { row -> row.firstOrNull()?.openId ?: "" }
-            ) { rowItems ->
+            // Agent 两列网格行
+            items(viewModel.gridAgentItems.chunked(2)) { rowItems ->
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(vertical = 16.dp),
+                        .padding(
+                            top = 20.dp,
+                            bottom = 20.dp
+                        ),
                     horizontalArrangement = Arrangement.spacedBy(16.dp)
                 ) {
-                    rowItems.forEach { agentItem ->
-                        Box(
-                            modifier = Modifier.weight(1f)
-                        ) {
+                    Box(modifier = Modifier.weight(1f)) {
+                        AgentCardSquare(
+                            agentItem = rowItems[0],
+                            viewModel = viewModel,
+                            navController = LocalNavController.current
+                        )
+                    }
+                    if (rowItems.size > 1) {
+                        Box(modifier = Modifier.weight(1f)) {
                             AgentCardSquare(
-                                agentItem = agentItem,
+                                agentItem = rowItems[1],
                                 viewModel = viewModel,
                                 navController = LocalNavController.current
                             )
                         }
-                    }
-                    // 如果这一行只有一个item，添加一个空的占位符
-                    if (rowItems.size == 1) {
+                    } else {
                         Spacer(modifier = Modifier.weight(1f))
                     }
                 }
             }
-            
+
             // 加载更多指示器
-            if (viewModel.isLoadingMore) {
+            if (viewModel.isLoading) {
                 item {
                     Row(
                         modifier = Modifier
@@ -381,7 +356,7 @@ fun Agent() {
                         )
                         Spacer(modifier = Modifier.width(12.dp))
                         androidx.compose.material3.Text(
-                            text = "加载中...",
+                            text = stringResource(R.string.agent_chat_loading),
                             color = AppColors.secondaryText,
                             fontSize = 14.sp
                         )
@@ -391,11 +366,67 @@ fun Agent() {
         }
     }
 }
+
+@Composable
+fun AgentGridLayout(
+    agentItems: List<AgentItem>,
+    viewModel: AgentViewModel,
+    navController: NavHostController
+) {
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        // 将agentItems按两列分组
+        agentItems.chunked(2).forEachIndexed { rowIndex, rowItems ->
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(
+                        top = if (rowIndex == 0) 30.dp else 20.dp, // 第一行添加更多顶部间距
+                        bottom = 20.dp
+                    ),
+                horizontalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                // 第一列
+                Box(
+                    modifier = Modifier.weight(1f)
+                ) {
+                    AgentCardSquare(
+                        agentItem = rowItems[0],
+                        viewModel = viewModel,
+                        navController = navController
+                    )
+                }
+
+                // 第二列（如果存在）
+                if (rowItems.size > 1) {
+                    Box(
+                        modifier = Modifier.weight(1f)
+                    ) {
+                        AgentCardSquare(
+                            agentItem = rowItems[1],
+                            viewModel = viewModel,
+                            navController = navController
+                        )
+                    }
+                } else {
+                    // 如果只有一列，添加空白占位
+                    Spacer(modifier = Modifier.weight(1f))
+                }
+            }
+        }
+    }
+}
+
 @SuppressLint("SuspiciousIndentation")
 @Composable
-fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navController: NavHostController) {
+fun AgentCardSquare(
+    agentItem: AgentItem,
+    viewModel: AgentViewModel,
+    navController: NavHostController
+) {
     val AppColors = LocalAppTheme.current
-    val cardHeight = 200.dp
+    val cardHeight = 180.dp
     val avatarSize = cardHeight / 3  // 头像大小为方块高度的三分之一
 
     // 防抖状态
@@ -404,9 +435,8 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = avatarSize / 2)
             .height(cardHeight)
-            .background(AppColors.nonActive, RoundedCornerShape(12.dp))  // 修改背景颜色
+            .background(AppColors.secondaryBackground, RoundedCornerShape(12.dp))
             .clickable {
                 if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
                         viewModel.goToProfile(agentItem.openId, navController)
@@ -416,15 +446,19 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
             },
         contentAlignment = Alignment.TopCenter
     ) {
-        // 头像，位于方块上方居中，部分悬于方块外部
         Box(
             modifier = Modifier
-                .offset(y = -avatarSize / 2)
+                .offset(y = 4.dp)
                 .size(avatarSize)
-                .background(Color.White, RoundedCornerShape(avatarSize / 2))
+                .background(AppColors.background, RoundedCornerShape(avatarSize / 2))
                 .clip(RoundedCornerShape(avatarSize / 2)),
             contentAlignment = Alignment.Center
         ) {
+            Image(
+                painter = painterResource(R.mipmap.group_copy),
+                contentDescription = "默认头像",
+                modifier = Modifier.size(avatarSize),
+            )
             if (agentItem.avatar.isNotEmpty()) {
                 CustomAsyncImage(
                     imageUrl = agentItem.avatar,
@@ -434,13 +468,6 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
                         .clip(RoundedCornerShape(avatarSize / 2)),
                     contentScale = androidx.compose.ui.layout.ContentScale.Crop
                 )
-            } else {
-                Image(
-                    painter = painterResource(R.mipmap.rider_pro_agent),
-                    contentDescription = "默认头像",
-                    modifier = Modifier.size(avatarSize / 2),
-                    colorFilter = ColorFilter.tint(AppColors.secondaryText)
-                )
             }
         }
 
@@ -448,7 +475,7 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = avatarSize / 2 + 8.dp, start = 8.dp, end = 8.dp, bottom = 8.dp),
+                .padding(top = 4.dp + avatarSize + 8.dp, start = 8.dp, end = 8.dp, bottom = 48.dp), // 为底部聊天按钮留出空间
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             androidx.compose.material3.Text(
@@ -462,62 +489,63 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
 
             Spacer(modifier = Modifier.height(8.dp))
 
-            Box(
-                modifier = Modifier
-                    .height(85.dp)
-                    .fillMaxWidth()
-            ) {
-                androidx.compose.material3.Text(
-                    text = agentItem.desc,
-                    fontSize = 12.sp,
-                    color = AppColors.secondaryText,
-                    maxLines = 5,
-                    overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
-                )
-            }
+            androidx.compose.material3.Text(
+                text = agentItem.desc,
+                fontSize = 12.sp,
+                color = AppColors.secondaryText,
+                maxLines = 2,
+                overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+                modifier = Modifier.weight(1f, fill = false)
+            )
+        }
 
-            Spacer(modifier = Modifier.height(8.dp))
-
-            // 聊天按钮，位于底部居中
-            Box(
-                modifier = Modifier
-                    .width(60.dp)
-                    .height(32.dp)
-                    .background(
-                        color = Color(0X147c7480),
-                        shape = RoundedCornerShape(8.dp)
-                    )
-                    .clickable {
-                        if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
-                                // 检查游客模式，如果是游客则跳转登录
-                                if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.CHAT_WITH_AGENT)) {
-                                    navController.navigate(NavigationRoute.Login.route)
-                                } else {
-                                    viewModel.createSingleChat(agentItem.openId)
-                                    viewModel.goToChatAi(
-                                        agentItem.openId,
-                                        navController = navController
-                                    )
-                                }
-                            }) {
-                            lastClickTime = System.currentTimeMillis()
-                        }
-                    },
-                contentAlignment = Alignment.Center
-            ) {
-                androidx.compose.material3.Text(
-                    text = stringResource(R.string.chat),
-                    fontSize = 12.sp,
+        // 聊天按钮，固定在底部居中，距离底部有一定边距
+        Box(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(bottom = 12.dp) // 距离底部的边距
+                .width(60.dp)
+                .height(32.dp)
+                .background(
                     color = AppColors.text,
-                    fontWeight = androidx.compose.ui.text.font.FontWeight.W500
+                    shape = RoundedCornerShape(
+                        topStart = 10.dp,
+                        topEnd = 10.dp,
+                        bottomStart = 0.dp,
+                        bottomEnd = 10.dp
+                    )
                 )
-            }
+                .clickable {
+                    if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
+                            // 检查游客模式，如果是游客则跳转登录
+                            if (GuestLoginCheckOut.needLogin(GuestLoginCheckOutScene.CHAT_WITH_AGENT)) {
+                                navController.navigate(NavigationRoute.Login.route)
+                            } else {
+                                viewModel.createSingleChat(agentItem.openId)
+                                viewModel.goToChatAi(
+                                    agentItem.openId,
+                                    navController = navController
+                                )
+                            }
+                        }) {
+                        lastClickTime = System.currentTimeMillis()
+                    }
+                },
+            contentAlignment = Alignment.Center
+        ) {
+            androidx.compose.material3.Text(
+                text = stringResource(R.string.chat),
+                fontSize = 15.sp,
+                color = AppColors.background,
+                fontWeight = androidx.compose.ui.text.font.FontWeight.W500
+            )
         }
     }
 }
+
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel) {
+fun AgentViewPagerSection(agentItems: List<AgentItem>, viewModel: AgentViewModel) {
     val AppColors = LocalAppTheme.current
 
     // 每页显示5个agent
@@ -590,7 +618,13 @@ fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel)
 }
 
 @Composable
-fun AgentPage(viewModel: AgentViewModel,agentItems: List<AgentItem>, page: Int, modifier: Modifier = Modifier,navController: NavHostController) {
+fun AgentPage(
+    viewModel: AgentViewModel,
+    agentItems: List<AgentItem>,
+    page: Int,
+    modifier: Modifier = Modifier,
+    navController: NavHostController
+) {
     Column(
         modifier = modifier
             .fillMaxSize()
@@ -598,7 +632,11 @@ fun AgentPage(viewModel: AgentViewModel,agentItems: List<AgentItem>, page: Int,
     ) {
         // 显示3个agent
         agentItems.forEachIndexed { index, agentItem ->
-            AgentCard2(agentItem = agentItem, viewModel = viewModel, navController = LocalNavController.current)
+            AgentCard2(
+                agentItem = agentItem,
+                viewModel = viewModel,
+                navController = LocalNavController.current
+            )
             if (index < agentItems.size - 1) {
                 Spacer(modifier = Modifier.height(8.dp))
             }
@@ -608,9 +646,9 @@ fun AgentPage(viewModel: AgentViewModel,agentItems: List<AgentItem>, page: Int,
 
 @SuppressLint("SuspiciousIndentation")
 @Composable
-fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: NavHostController) {
+fun AgentCard2(viewModel: AgentViewModel, agentItem: AgentItem, navController: NavHostController) {
     val AppColors = LocalAppTheme.current
-    
+
     // 防抖状态
     var lastClickTime by remember { mutableStateOf(0L) }
 
@@ -624,7 +662,7 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
         Box(
             modifier = Modifier
                 .size(48.dp)
-                .background(Color(0xFFF5F5F5), RoundedCornerShape(24.dp))
+                .background(AppColors.secondaryBackground, RoundedCornerShape(24.dp))
                 .clickable {
                     if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
                             viewModel.goToProfile(agentItem.openId, navController)
@@ -688,7 +726,7 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
             modifier = Modifier
                 .size(width = 60.dp, height = 32.dp)
                 .background(
-                    color = Color(0X147c7480),
+                    color = AppColors.inputBackground,
                     shape = RoundedCornerShape(8.dp)
                 )
                 .clickable {
@@ -718,3 +756,180 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
         }
     }
 }
+
+@Composable
+fun ChatRoomsSection(
+    chatRooms: List<ChatRoom>,
+    navController: NavHostController
+) {
+    val AppColors = LocalAppTheme.current
+
+    Column(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        // 标题
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Image(
+                painter = painterResource(R.mipmap.rider_pro_hot_room),
+                contentDescription = "chat room",
+                modifier = Modifier.size(28.dp)
+            )
+            Spacer(modifier = Modifier.width(4.dp))
+            androidx.compose.material3.Text(
+                text = stringResource(R.string.hot_rooms),
+                fontSize = 16.sp,
+                fontWeight = androidx.compose.ui.text.font.FontWeight.W900,
+                color = AppColors.text
+            )
+        }
+
+        Column(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            chatRooms.chunked(2).forEach { rowRooms ->
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 12.dp),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    rowRooms.forEach { chatRoom ->
+                        ChatRoomCard(
+                            chatRoom = chatRoom,
+                            navController = navController,
+                            modifier = Modifier.weight(1f)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ChatRoomCard(
+    chatRoom: ChatRoom,
+    navController: NavHostController,
+    modifier: Modifier = Modifier
+) {
+    val AppColors = LocalAppTheme.current
+    val cardSize = 160.dp
+    val viewModel: AgentViewModel = viewModel()
+    val context = LocalContext.current
+
+    // 防抖状态
+    var lastClickTime by remember { mutableStateOf(0L) }
+
+    // Loading 对话框
+    if (viewModel.isJoiningRoom) {
+        Dialog(
+            onDismissRequest = { /* 阻止用户关闭对话框 */ },
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false
+            )
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(120.dp)
+                    .background(
+                        color = AppColors.background,
+                        shape = RoundedCornerShape(12.dp)
+                    ),
+                contentAlignment = Alignment.Center
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(32.dp),
+                        color = AppColors.main
+                    )
+                    Spacer(modifier = Modifier.height(12.dp))
+                    androidx.compose.material3.Text(
+                        text = "加入中...",
+                        fontSize = 14.sp,
+                        color = AppColors.text
+                    )
+                }
+            }
+        }
+    }
+
+    // 正方形卡片，文字重叠在底部
+    Box(
+        modifier = modifier
+            .size(cardSize)
+            .background(AppColors.secondaryBackground, RoundedCornerShape(12.dp))
+            .clickable(enabled = !viewModel.isJoiningRoom) {
+                if (!viewModel.isJoiningRoom && DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
+                        // 加入群聊房间
+                        viewModel.joinRoom(
+                            id = chatRoom.id,
+                            name = chatRoom.name,
+                            avatar = chatRoom.avatar,
+                            context = context,
+                            navController = navController,
+                            onSuccess = {
+                                // 成功加入房间
+                            },
+                            onError = { errorMsg ->
+                                // 处理错误，可以显示Toast或其他提示
+                            }
+                        )
+                    }) {
+                    lastClickTime = System.currentTimeMillis()
+                }
+            }
+    ) {
+        // 优先显示banner，如果没有banner则显示头像
+        val imageUrl = if (chatRoom.banner.isNotEmpty()) chatRoom.banner else chatRoom.avatar
+
+        if (imageUrl.isNotEmpty()) {
+            CustomAsyncImage(
+                imageUrl = imageUrl,
+                contentDescription = if (chatRoom.banner.isNotEmpty()) "房间banner" else "房间头像",
+                modifier = Modifier
+                    .size(cardSize)
+                    .clip(RoundedCornerShape(12.dp)),
+                contentScale = androidx.compose.ui.layout.ContentScale.Crop
+            )
+        } else {
+            // 默认房间图标
+            Image(
+                painter = painterResource(R.mipmap.rider_pro_agent),
+                contentDescription = "默认房间图标",
+                modifier = Modifier.size(cardSize * 0.4f),
+                colorFilter = ColorFilter.tint(AppColors.secondaryText)
+            )
+        }
+
+        // 房间名称，重叠在底部
+        Box(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .fillMaxWidth()
+                .background(
+                    color = Color.Black.copy(alpha = 0.6f),
+                    shape = RoundedCornerShape(bottomStart = 12.dp, bottomEnd = 12.dp)
+                )
+                .padding(horizontal = 8.dp, vertical = 6.dp)
+        ) {
+            androidx.compose.material3.Text(
+                text = chatRoom.name,
+                fontSize = 12.sp,
+                color = Color.White,
+                maxLines = 1,
+                overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
+                modifier = Modifier.fillMaxWidth(),
+                textAlign = androidx.compose.ui.text.style.TextAlign.Center
+            )
+        }
+    }
+}

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

@@ -1,119 +1,220 @@
 package com.aiosman.ravenow.ui.index.tabs.ai
 
+import android.util.Log
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.NavHostController
-import com.aiosman.ravenow.data.Agent
-import com.aiosman.ravenow.data.ListContainer
+import com.aiosman.ravenow.AppState
+import com.aiosman.ravenow.AppStore
+import com.aiosman.ravenow.ConstVars
+import com.aiosman.ravenow.data.Room
 import com.aiosman.ravenow.data.api.ApiClient
 import com.aiosman.ravenow.data.api.CategoryTemplate
+import com.aiosman.ravenow.data.api.CreateGroupChatRequestBody
 import com.aiosman.ravenow.data.api.RaveNowAPI
 import com.aiosman.ravenow.data.api.SingleChatRequestBody
+import com.aiosman.ravenow.data.api.JoinGroupChatRequestBody
 import com.aiosman.ravenow.ui.index.tabs.ai.tabs.mine.MineAgentViewModel.createGroup2ChatAi
 import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.ui.index.tabs.message.MessageListViewModel.userService
+import com.aiosman.ravenow.ui.index.tabs.message.tab.GroupChatListViewModel.createGroupChat
 import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.AgentItem
+import com.aiosman.ravenow.ui.navigateToGroupChat
+import com.aiosman.ravenow.data.api.ApiErrorResponse
+import com.google.gson.Gson
+import android.content.Context
+import android.widget.Toast
 import kotlinx.coroutines.launch
 
-object AgentViewModel: ViewModel() {
+data class ChatRoom(
+    val id: Int,
+    val name: String,
+    val avatar: String = "",
+    val banner: String = "",
+    val memberCount: Int = 0
+)
+
+object AgentViewModel : ViewModel() {
 
     private val apiClient: RaveNowAPI = ApiClient.api
 
-    var agentItems by mutableStateOf<List<AgentItem>>(emptyList())
+    // 顶部Agent列表数据（用于ViewPager）
+    var topAgentItems by mutableStateOf<List<AgentItem>>(emptyList())
         private set
 
-    var categories by mutableStateOf<List<CategoryItem>>(emptyList())
+    // 底部网格布局Agent数据
+    var gridAgentItems by mutableStateOf<List<AgentItem>>(emptyList())
+        private set
+
+    var chatRooms by mutableStateOf<List<ChatRoom>>(emptyList())
+        private set
+
+    var rooms by mutableStateOf<List<Room>>(emptyList())
+        private set
+
+    var categories by mutableStateOf<List<CategoryTemplate>>(emptyList())
+        private set
+
+    var selectedCategoryIndex by mutableStateOf(0)
         private set
 
     var errorMessage by mutableStateOf<String?>(null)
         private set
 
-
     var isRefreshing by mutableStateOf(false)
         private set
 
     var isLoading by mutableStateOf(false)
         private set
 
-    // 分页相关状态
-    var isLoadingMore by mutableStateOf(false)
+    var isJoiningRoom by mutableStateOf(false)
         private set
-    
-    var currentPage by mutableStateOf(1)
-        private set
-    
-    var hasMoreData by mutableStateOf(true)
-        private set
-    
-    private val pageSize = 20
-    private var currentCategoryId: Int? = null
+
+    private var topCurrentPage = 1
+    private var topHasMoreData = true
+
+    private var gridCurrentPage = 1
+    private var gridHasMoreData = true
 
     init {
-        loadAgentData()
+        loadTopAgentData()
+        loadGridAgentData()
+        loadChatRooms()
         loadCategories()
     }
 
-    private fun loadAgentData(categoryId: Int? = null, page: Int = 1, isLoadMore: Boolean = false) {
+    /**
+     * 加载顶部Agent列表数据（用于ViewPager）
+     */
+    private fun loadTopAgentData(categoryIndex: Int = 0) {
         viewModelScope.launch {
-            if (isLoadMore) {
-                isLoadingMore = true
-            } else {
-                isLoading = true
-                // 重置分页状态
-                currentPage = 1
-                hasMoreData = true
-                currentCategoryId = categoryId
-            }
-            
+            isLoading = true
             errorMessage = null
+            topCurrentPage = 1
+            topHasMoreData = true
             try {
-                val response = if (categoryId != null) {
-                    // 根据分类ID获取智能体
+                val selectedCategory =
+                    if (categoryIndex < categories.size) categories[categoryIndex] else null
+
+                val response = if (categoryIndex == 0 || selectedCategory == null) {
+                    // 推荐分类或无效分类，加载所有 Agent
                     apiClient.getAgent(
-                        page = page,
-                        pageSize = pageSize,
-                        withWorkflow = 1,
-                        categoryIds = listOf(categoryId)
+                        page = topCurrentPage,
+                        pageSize = 15,
+                        withWorkflow = "1",
+                        random = "1"
                     )
                 } else {
-                    // 获取所有智能体
-                    apiClient.getAgent(page = page, pageSize = pageSize, withWorkflow = 1)
+                    // 特定分类，使用 categoryName 参数
+                    apiClient.getAgent(
+                        page = topCurrentPage,
+                        pageSize = 15,
+                        withWorkflow = "1",
+                        categoryName = selectedCategory.name,
+                        random = "1"
+                    )
                 }
 
                 if (response.isSuccessful) {
-                    val responseData = response.body()?.data
-                    val agents = responseData?.list ?: emptyList<Agent>()
-                    val newAgentItems = agents.map { agent ->
+                    val agents = response.body()?.data?.list ?: emptyList()
+                    topAgentItems = agents.map { agent ->
                         AgentItem.fromAgent(agent)
                     }
-
-                    if (isLoadMore) {
-                        // 加载更多：追加到现有列表
-                        agentItems = agentItems + newAgentItems
-                        currentPage = page
-                    } else {
-                        // 首次加载或刷新：替换整个列表
-                        agentItems = newAgentItems
-                        currentPage = 1
-                    }
-                    
-                    // 检查是否还有更多数据
-                    hasMoreData = agents.size >= pageSize
-                    
+                    topHasMoreData = agents.size >= 15
                 } else {
-                    errorMessage = "获取Agent数据失败: ${response.code()}"
+                    errorMessage = "获取顶部Agent数据失败: ${response.code()}"
                 }
             } catch (e: Exception) {
                 errorMessage = "网络请求失败: ${e.message}"
             } finally {
-                if (isLoadMore) {
-                    isLoadingMore = false
+                isLoading = false
+            }
+        }
+    }
+
+    /**
+     * 加载底部网格布局Agent数据
+     */
+    private fun loadGridAgentData(categoryIndex: Int = 0) {
+        viewModelScope.launch {
+            isLoading = true
+            errorMessage = null
+            gridCurrentPage = 1
+            gridHasMoreData = true
+            try {
+                val selectedCategory =
+                    if (categoryIndex < categories.size) categories[categoryIndex] else null
+
+                val response = if (categoryIndex == 0 || selectedCategory == null) {
+                    // 推荐分类或无效分类，加载所有 Agent
+                    apiClient.getAgent(
+                        page = gridCurrentPage,
+                        pageSize = 20,
+                        withWorkflow = "1",
+                        random = "true"
+                    )
                 } else {
-                    isLoading = false
+                    // 特定分类，使用 categoryName 参数
+                    apiClient.getAgent(
+                        page = gridCurrentPage,
+                        pageSize = 20,
+                        withWorkflow = "1",
+                        categoryName = selectedCategory.name,
+                        random = "true"
+                    )
                 }
+
+                if (response.isSuccessful) {
+                    val agents = response.body()?.data?.list ?: emptyList()
+                    gridAgentItems = agents.map { agent ->
+                        AgentItem.fromAgent(agent)
+                    }
+                    gridHasMoreData = agents.size >= 20
+                } else {
+                    errorMessage = "获取网格Agent数据失败: ${response.code()}"
+                }
+            } catch (e: Exception) {
+                errorMessage = "网络请求失败: ${e.message}"
+            } finally {
+                isLoading = false
+            }
+        }
+    }
+
+    private fun loadChatRooms() {
+        viewModelScope.launch {
+            try {
+                val response = apiClient.getRooms(
+                    page = 1,
+                    pageSize = 21,
+                    isRecommended = 1,
+                    random = 1
+                ) // 请求21个，确保是3的倍数
+                if (response.isSuccessful) {
+                    val allRooms = response.body()?.list ?: emptyList()
+                    // 确保房间数量是3的倍数，如果不足则截取，如果超出则取前几个
+                    val targetCount = (allRooms.size / 3) * 3 // 向下取整到最近的3的倍数
+                    rooms = allRooms.take(targetCount)
+
+                    // 转换为ChatRoom格式用于兼容现有UI
+                    chatRooms = rooms.map { room ->
+                        ChatRoom(
+                            id = room.id,
+                            name = room.name,
+                            avatar = room.avatar,
+                            banner = ConstVars.BASE_SERVER + "/api/v1/outside/" + room.recommendBanner + "?token=${AppStore.token}",
+                            memberCount = room.userCount
+                        )
+                    }
+                } else {
+
+                }
+            } catch (e: Exception) {
+                // 如果网络请求失败，使用默认数据
+
             }
         }
     }
@@ -121,72 +222,137 @@ object AgentViewModel: ViewModel() {
     private fun loadCategories() {
         viewModelScope.launch {
             try {
-                val response = apiClient.getCategories(
-                    pageSize = 20,
-                    withChildren = false,
-                    withParent = false,
-                    withCount = true,
-                    hideEmpty = true
+                val categoriesResponse = apiClient.getCategories(
+                    page = 1,
+                    pageSize = 100,
                 )
-                println("分类数据请求完成，响应成功: ${response.isSuccessful}")
-                if (response.isSuccessful) {
-                    val categoryList = response.body()?.data?.list ?: emptyList()
-                    println("获取到 ${categoryList.size} 个分类")
-                    categories = categoryList.map { category ->
-                        CategoryItem.fromCategoryTemplate(category)
+                if (categoriesResponse.isSuccessful && categoriesResponse.body() != null) {
+                    // 添加一个默认的"推荐"分类在第一位
+                    val recommendCategory = createRecommendCategory()
+                    val categoriesList = categoriesResponse.body()?.list ?: emptyList()
+                    categories = listOf(recommendCategory) + categoriesList
+
+                    // 分类加载完成后，重新加载当前选中分类的 Agent 数据
+                    if (topAgentItems.isEmpty()) {
+                        loadTopAgentData(selectedCategoryIndex)
+                    }
+                    if (gridAgentItems.isEmpty()) {
+                        loadGridAgentData(selectedCategoryIndex)
                     }
-                    println("成功处理并映射了 ${categories.size} 个分类")
                 } else {
-                    errorMessage = "获取分类数据失败: ${response.code()}"
-                    println("获取分类数据失败: ${response.code()}")
+                    // 如果请求失败，使用默认分类
+                    categories = listOf(createRecommendCategory())
+                    errorMessage = "获取分类失败: ${categoriesResponse.code()}"
                 }
             } catch (e: Exception) {
-                errorMessage = "获取分类数据失败: ${e.message}"
-                println("获取分类数据异常: ${e.message}")
-                e.printStackTrace()
+                // 如果网络请求失败，使用默认分类
+                categories = listOf(createRecommendCategory())
+                errorMessage = "网络请求失败: ${e.message}"
             }
         }
     }
 
-    fun loadAgentsByCategory(categoryId: Int) {
-        loadAgentData(categoryId)
+    /**
+     * 创建推荐分类
+     */
+    private fun createRecommendCategory(): CategoryTemplate {
+        return CategoryTemplate(
+            id = 0,
+            name = "推荐",
+            description = "推荐内容",
+            avatar = "",
+            parentId = null,
+            parent = null,
+            children = null,
+            sort = 0,
+            isActive = true,
+            promptCount = 0,
+            createdAt = "",
+            updatedAt = "",
+            translations = null
+        )
     }
 
-    fun loadAllAgents() {
-        loadAgentData()
+
+    /**
+     * 加载更多网格Agent数据
+     */
+    fun loadMoreGridAgentData() {
+        if (!gridHasMoreData || isLoading) return
+
+        viewModelScope.launch {
+            isLoading = true
+            try {
+                val nextPage = gridCurrentPage + 1
+                val selectedCategory =
+                    if (selectedCategoryIndex < categories.size) categories[selectedCategoryIndex] else null
+
+                val response = if (selectedCategoryIndex == 0 || selectedCategory == null) {
+                    apiClient.getAgent(
+                        page = nextPage,
+                        pageSize = 20,
+                        withWorkflow = "1",
+                        random = "true"
+                    )
+                } else {
+                    apiClient.getAgent(
+                        page = nextPage,
+                        pageSize = 20,
+                        withWorkflow = "1",
+                        categoryName = selectedCategory.name,
+                        random = "true"
+                    )
+                }
+
+                if (response.isSuccessful) {
+                    val agents = response.body()?.data?.list ?: emptyList()
+                    val newAgentItems = agents.map { agent ->
+                        AgentItem.fromAgent(agent)
+                    }
+                    gridAgentItems = gridAgentItems + newAgentItems
+                    gridCurrentPage = nextPage
+                    gridHasMoreData = agents.size >= 20
+                } else {
+                    errorMessage = "加载更多网格Agent数据失败: ${response.code()}"
+                }
+            } catch (e: Exception) {
+                errorMessage = "网络请求失败: ${e.message}"
+            } finally {
+                isLoading = false
+            }
+        }
     }
 
     /**
-     * 加载更多Agent数据
+     * 选择分类并加载对应的 Agent 数据
      */
-    fun loadMoreAgents() {
-        // 检查是否正在加载或没有更多数据
-        if (isLoadingMore || !hasMoreData) {
-            return
+    fun selectCategory(categoryIndex: Int) {
+        if (categoryIndex != selectedCategoryIndex && categoryIndex >= 0 && categoryIndex < categories.size) {
+            selectedCategoryIndex = categoryIndex
+            // 同时加载顶部和网格的数据
+            loadTopAgentData(categoryIndex)
+            loadGridAgentData(categoryIndex)
         }
-        
-        val nextPage = currentPage + 1
-        loadAgentData(
-            categoryId = currentCategoryId,
-            page = nextPage,
-            isLoadMore = true
-        )
     }
+
     fun createSingleChat(
         openId: String,
     ) {
         viewModelScope.launch {
-            val response = ApiClient.api.createSingleChat(SingleChatRequestBody(agentOpenId = openId))
+            val response =
+                ApiClient.api.createSingleChat(SingleChatRequestBody(agentOpenId = openId))
+            Log.d("debug", response.toString())
         }
 
     }
+
     fun goToChatAi(
         openId: String,
         navController: NavHostController
     ) {
         viewModelScope.launch {
             val profile = userService.getUserProfileByOpenId(openId)
-            createGroup2ChatAi(profile.trtcUserId,"ai_group",navController,profile.id)
+            createGroup2ChatAi(profile.trtcUserId, "ai_group", navController, profile.id)
         }
     }
 
@@ -213,15 +379,98 @@ object AgentViewModel: ViewModel() {
      * 刷新推荐Agent数据
      */
     fun refreshAgentData() {
-        loadAgentData()
+        loadTopAgentData()
+        loadGridAgentData()
     }
-    
+
     /**
      * 检查数据是否为空，如果为空则重新加载
      */
     fun ensureDataLoaded() {
-        if (agentItems.isEmpty() && !isLoading) {
-            loadAgentData()
+        if (topAgentItems.isEmpty() && !isLoading) {
+            loadTopAgentData()
+        }
+        if (gridAgentItems.isEmpty() && !isLoading) {
+            loadGridAgentData()
+        }
+        // 同时确保分类数据已加载
+        if (categories.isEmpty() && !isLoading) {
+            loadCategories()
+        }
+    }
+
+    /**
+     * 加入房间
+     */
+    fun joinRoom(
+        id: Int,
+        name: String,
+        avatar: String,
+        context: Context,
+        navController: NavHostController,
+        onSuccess: () -> Unit,
+        onError: (String) -> Unit
+    ) {
+        // 防止重复点击
+        if (isJoiningRoom) return
+
+        viewModelScope.launch {
+            try {
+                isJoiningRoom = true
+                val response = apiClient.joinRoom(JoinGroupChatRequestBody(roomId = id))
+                if (response.isSuccessful) {
+                    // 打开房间
+                    val openRoomResponse = apiClient.createGroupChatAi(
+                        roomId = id
+                    )
+
+                    if (openRoomResponse.isSuccessful){
+                        val respData = openRoomResponse.body()
+                        respData?.let {
+                            viewModelScope.launch {
+                                try {
+                                    // 群聊直接使用群ID进行导航
+                                    navController.navigateToGroupChat(
+                                        id = respData.data.trtcRoomId,
+                                        name = name,
+                                        avatar = avatar
+                                    )
+                                } catch (e: Exception) {
+                                    onError("加入房间失败")
+                                    e.printStackTrace()
+                                }
+                            }
+                        }
+                    }
+                    onSuccess()
+
+                } else {
+                    // 处理错误响应
+                    try {
+                        val errorBody = response.errorBody()?.string()
+                        if (errorBody != null) {
+                            val gson = Gson()
+                            val errorResponse = gson.fromJson(errorBody, ApiErrorResponse::class.java)
+
+                            // 在主线程显示 Toast
+                            Toast.makeText(context, errorResponse.error, Toast.LENGTH_LONG).show()
+                            onError(errorResponse.error)
+                        } else {
+                            Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
+                            onError("加入房间失败")
+                        }
+                    } catch (parseException: Exception) {
+                        // 如果解析错误响应失败，显示默认错误信息
+                        Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
+                        onError("加入房间失败")
+                    }
+                }
+            } catch (e: Exception) {
+                Toast.makeText(context, "网络请求失败：${e.message}", Toast.LENGTH_SHORT).show()
+                onError("网络请求失败：${e.message}")
+            } finally {
+                isJoiningRoom = false
+            }
         }
     }
 
@@ -229,33 +478,18 @@ object AgentViewModel: ViewModel() {
      * 重置ViewModel状态，用于登出或切换账号时清理数据
      */
     fun ResetModel() {
-        agentItems = emptyList()
+        topAgentItems = emptyList()
+        gridAgentItems = emptyList()
+        categories = emptyList()
+        selectedCategoryIndex = 0
         errorMessage = null
         isRefreshing = false
         isLoading = false
-        isLoadingMore = false
-        currentPage = 1
-        hasMoreData = true
-        currentCategoryId = null
+        isJoiningRoom = false
+        topCurrentPage = 1
+        topHasMoreData = true
+        gridCurrentPage = 1
+        gridHasMoreData = true
     }
 
-}
-data class CategoryItem(
-    val id: Int,
-    val name: String,
-    val description: String,
-    val avatar: String,
-    val promptCount: Int?
-) {
-    companion object {
-        fun fromCategoryTemplate(template: CategoryTemplate): CategoryItem {
-            return CategoryItem(
-                id = template.id,
-                name = template.name,
-                description = template.description,
-                avatar = "${ApiClient.BASE_API_URL}${template.avatar}",
-                promptCount = template.promptCount
-            )
-        }
-    }
-}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -369,6 +369,7 @@ fun Explore() {
                             trtcId = roomItem.trtcId.toString(),
                             name = roomItem.title,
                             avatar = roomItem.avatar,
+                            context = context,
                             navController = navController,
                             onSuccess = {
                                 Toast.makeText(context, enterSuccessText, Toast.LENGTH_SHORT).show()
@@ -636,6 +637,7 @@ fun Explore() {
                                                     trtcId = bannerItem.trtcId.toString(),
                                                     name = bannerItem.title,
                                                     avatar = bannerItem.avatar,
+                                                    context = context,
                                                     navController = navController,
                                                     onSuccess = {
                                                         Toast.makeText(context, enterSuccessText, Toast.LENGTH_SHORT).show()

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

@@ -17,32 +17,36 @@ import com.aiosman.ravenow.ui.index.tabs.message.MessageListViewModel.userServic
 import com.aiosman.ravenow.ui.index.tabs.message.tab.GroupChatListViewModel
 import com.aiosman.ravenow.ui.index.tabs.message.tab.GroupChatListViewModel.createGroupChat
 import com.aiosman.ravenow.ui.navigateToGroupChat
+import com.aiosman.ravenow.data.api.ApiErrorResponse
+import com.google.gson.Gson
+import android.content.Context
+import android.widget.Toast
 import kotlinx.coroutines.launch
 
 class ExploreViewModel : ViewModel() {
-    
+
     private val apiClient: RaveNowAPI = ApiClient.api
-    
+
     var bannerItems by mutableStateOf<List<BannerItem>>(emptyList())
         private set
-    
+
     var agentItems by mutableStateOf<List<AgentItem>>(emptyList())
         private set
-    
+
     var isLoading by mutableStateOf(false)
         private set
-    
+
     var isRefreshing by mutableStateOf(false)
         private set
-    
+
     var errorMessage by mutableStateOf<String?>(null)
         private set
-    
+
     init {
         loadBannerData()
         loadAgentData()
     }
-    
+
     fun refreshBannerData() {
         viewModelScope.launch {
             isRefreshing = true
@@ -64,13 +68,13 @@ class ExploreViewModel : ViewModel() {
             }
         }
     }
-    
+
     fun refreshAgentData() {
         viewModelScope.launch {
             isRefreshing = true
             errorMessage = null
             try {
-                val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = 1)
+                val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = "1")
                 if (response.isSuccessful) {
                     val agents = response.body()?.data?.list ?: emptyList()
                     agentItems = agents.map { agent ->
@@ -86,7 +90,7 @@ class ExploreViewModel : ViewModel() {
             }
         }
     }
-    
+
     private fun loadBannerData() {
         viewModelScope.launch {
             isLoading = true
@@ -108,13 +112,13 @@ class ExploreViewModel : ViewModel() {
             }
         }
     }
-    
+
     private fun loadAgentData() {
         viewModelScope.launch {
             isLoading = true
             errorMessage = null
             try {
-                val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = 1)
+                val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = "1")
                 if (response.isSuccessful) {
                     val agents = response.body()?.data?.list ?: emptyList()
                     agentItems = agents.map { agent ->
@@ -130,21 +134,24 @@ class ExploreViewModel : ViewModel() {
             }
         }
     }
+
     fun createSingleChat(
         openId: String,
     ) {
         viewModelScope.launch {
-            val response = ApiClient.api.createSingleChat(SingleChatRequestBody(agentOpenId = openId))
+            val response =
+                ApiClient.api.createSingleChat(SingleChatRequestBody(agentOpenId = openId))
         }
 
     }
+
     fun goToChatAi(
         openId: String,
         navController: NavHostController
     ) {
         viewModelScope.launch {
             val profile = userService.getUserProfileByOpenId(openId)
-            createGroup2ChatAi(profile.trtcUserId,"ai_group",navController,profile.id)
+            createGroup2ChatAi(profile.trtcUserId, "ai_group", navController, profile.id)
         }
     }
 
@@ -152,6 +159,7 @@ class ExploreViewModel : ViewModel() {
         trtcId: String,
         name: String,
         avatar: String,
+        context: Context,
         navController: NavHostController,
         onSuccess: () -> Unit,
         onError: (String) -> Unit
@@ -160,24 +168,45 @@ class ExploreViewModel : ViewModel() {
             try {
                 val response = apiClient.joinRoom(JoinGroupChatRequestBody(trtcId = trtcId))
                 if (response.isSuccessful) {
-                        viewModelScope.launch {
-                            try {
-                                createGroupChat(trtcGroupId = trtcId)
-                                // 群聊直接使用群ID进行导航
-                                navController.navigateToGroupChat( id = trtcId,
-                                    name = name,
-                                    avatar = avatar)
-                            } catch (e: Exception) {
-                                onError("加入房间失败")
-                                e.printStackTrace()
-                            }
-                            }
-                        onSuccess()
+                    viewModelScope.launch {
+                        try {
+                            createGroupChat(trtcGroupId = trtcId)
+                            // 群聊直接使用群ID进行导航
+                            navController.navigateToGroupChat(
+                                id = trtcId,
+                                name = name,
+                                avatar = avatar
+                            )
+                        } catch (e: Exception) {
+                            onError("加入房间失败")
+                            e.printStackTrace()
+                        }
+                    }
+                    onSuccess()
 
                 } else {
-                    onError("加入房间失败")
+                    // 处理错误响应
+                    try {
+                        val errorBody = response.errorBody()?.string()
+                        if (errorBody != null) {
+                            val gson = Gson()
+                            val errorResponse = gson.fromJson(errorBody, ApiErrorResponse::class.java)
+
+                            // 在主线程显示 Toast
+                            Toast.makeText(context, errorResponse.error, Toast.LENGTH_LONG).show()
+                            onError(errorResponse.error)
+                        } else {
+                            Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
+                            onError("加入房间失败")
+                        }
+                    } catch (parseException: Exception) {
+                        // 如果解析错误响应失败，显示默认错误信息
+                        Toast.makeText(context, "加入房间失败", Toast.LENGTH_SHORT).show()
+                        onError("加入房间失败")
+                    }
                 }
             } catch (e: Exception) {
+                Toast.makeText(context, "网络请求失败：${e.message}", Toast.LENGTH_SHORT).show()
                 onError("网络请求失败：${e.message}")
             }
         }

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

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

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

@@ -98,7 +98,7 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.io.File
-
+import androidx.compose.foundation.rememberScrollState
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun ProfileV3(
@@ -119,7 +119,6 @@ fun ProfileV3(
     postCount: Int? = null, // 新增参数用于传递帖子总数
 ) {
     val model = MyProfileViewModel
-    val state = rememberCollapsingToolbarScaffoldState()
     val pagerState = rememberPagerState(pageCount = { if (isAiAccount) 1 else 2 })
     val enabled by remember { mutableStateOf(true) }
     val statusBarPaddingValues = WindowInsets.systemBars.asPaddingValues()
@@ -151,6 +150,15 @@ fun ProfileV3(
     val systemUiController = rememberSystemUiController()
     val listState = rememberLazyListState()
     val gridState = rememberLazyGridState()
+    val scrollState = rememberScrollState()
+
+    val toolbarAlpha by remember {
+        derivedStateOf {
+            val maxScroll = 500f // 最大滚动距离，可调整
+            val progress = (scrollState.value.coerceAtMost(maxScroll.toInt()) / maxScroll).coerceIn(0f, 1f)
+            progress
+        }
+    }
 
     // observe list scrolling
     val reachedListBottom by remember {
@@ -167,9 +175,9 @@ fun ProfileV3(
             val lastVisibleItem = layoutInfo.visibleItemsInfo.lastOrNull()
             val totalItems = layoutInfo.totalItemsCount
             val visibleItemsCount = layoutInfo.visibleItemsInfo.size
-            
+
             Log.d("ProfileV3", "滚动状态检查 - totalItems: $totalItems, visibleItems: $visibleItemsCount, lastVisibleIndex: ${lastVisibleItem?.index}, moments.size: ${moments.size}, hasNext: ${model.momentLoader.hasNext}")
-            
+
             // 如果没有可见item，不触发加载
             if (lastVisibleItem == null || totalItems == 0) {
                 Log.d("ProfileV3", "跳过加载 - 没有可见item或总数为0")
@@ -201,8 +209,6 @@ fun ProfileV3(
         }
     }
 
-
-
     fun switchTheme() {
         // delay
         scope.launch {
@@ -217,7 +223,7 @@ fun ProfileV3(
         }
 
     }
-    
+
     // Agent菜单弹窗
     if (showAgentMenu) {
         Log.d("ProfileV3", "Showing agent menu for: ${contextAgent?.title}")
@@ -250,7 +256,7 @@ fun ProfileV3(
             )
         }
     }
-    
+
     // 删除确认对话框
     if (showDeleteConfirmDialog) {
         DeleteConfirmDialog(
@@ -277,307 +283,155 @@ fun ProfileV3(
             }
         )
     }
-    
+
     Box(
         modifier = Modifier.pullRefresh(refreshState)
     ) {
-        CollapsingToolbarScaffold(
+        Column(
             modifier = Modifier
                 .fillMaxSize()
-                .background(AppColors.profileBackground),
-            state = state,
-            scrollStrategy = ScrollStrategy.ExitUntilCollapsed,
-            toolbarScrollable = true,
-            enabled = enabled,
-            toolbar = { toolbarScrollState ->
-                Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(miniToolbarHeight.dp)
-                        // 保持在最低高度和当前高度之间
-                        .background(AppColors.profileBackground)
-                ) {
-                }
-                // header
+                .verticalScroll(scrollState)
+                .background(AppColors.profileBackground)
+        ) {
+            // Banner
+            val banner = profile?.banner
+            if (banner != null) {
                 Box(
                     modifier = Modifier
-                        .parallax(0.5f)
                         .fillMaxWidth()
-                        .height(if (isAiAccount) 600.dp else 700.dp)
+                        .height(bannerHeight.dp)
                         .background(AppColors.profileBackground)
-                        .verticalScroll(toolbarScrollState)
                 ) {
                     Box(
-                        modifier = Modifier.fillMaxSize()
-                    ) {
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .graphicsLayer {
-                                    alpha = state.toolbarState.progress
-                                }
-                        ) {
-                            // banner
-                            Box(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .height(bannerHeight.dp)
-                                    .background(AppColors.profileBackground)
-                            ) {
-                                Box(
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-                                        .height(bannerHeight.dp - 24.dp)
-                                        .let {
-                                            if (isSelf&&isMain) {
-                                                it.noRippleClickable {
-                                                    Intent(Intent.ACTION_PICK).apply {
-                                                        type = "image/*"
-                                                        pickBannerImageLauncher.launch(
-                                                            this
-                                                        )
-                                                    }
-                                                }
-                                            } else {
-                                                it
-                                            }
-                                        }
-                                        .shadow(
-                                            elevation = 6.dp,
-                                            shape = RoundedCornerShape(
-                                                bottomStart = 32.dp,
-                                                bottomEnd = 32.dp
-                                            ),
-                                        )
-                                ) {
-                                    val banner = profile?.banner
-
-                                    if (banner != null) {
-                                        CustomAsyncImage(
-                                            LocalContext.current,
-                                            banner,
-                                            modifier = Modifier
-                                                .fillMaxSize(),
-                                            contentDescription = "",
-                                            contentScale = ContentScale.Crop
-                                        )
-                                    } else {
-                                        Image(
-                                            painter = painterResource(id = R.drawable.rave_now_profile_backgrount_demo_1),
-                                            modifier = Modifier
-                                                .fillMaxSize(),
-                                            contentDescription = "",
-                                            contentScale = ContentScale.Crop
-                                        )
-                                    }
-                                }
-
-                            }
-                            Box(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .background(AppColors.profileBackground)
-                            ) {
-                                // user info
-                                Column(
-                                    modifier = Modifier
-                                        .fillMaxWidth()
-
-                                ) {
-//                                    Spacer(modifier = Modifier.height(16.dp))
-                                    // 个人信息
-                                    Box(
-                                        modifier = Modifier.padding(horizontal = 16.dp)
-                                    ) {
-                                        profile?.let {
-                                            UserItem(
-                                                accountProfileEntity = it,
-                                                postCount = postCount ?: if (isSelf) MyProfileViewModel.momentLoader.total else moments.size
-                                            )
-                                        }
-                                    }
-                                    Spacer(modifier = Modifier.height(20.dp))
-                                    profile?.let {
-                                        Box(
-                                            modifier = Modifier.padding(horizontal = 16.dp)
-                                        ) {
-                                            if (isSelf) {
-                                                SelfProfileAction(
-                                                    onEditProfile = {
-                                                        navController.navigate(
-                                                            NavigationRoute.AccountEdit.route
-                                                        )
-                                                    },
-                                                    onPremiumClick = {
-                                                        navController.navigate(NavigationRoute.VipSelPage.route)
-                                                    }
-                                                )
-                                            } else {
-                                                if (it.id != AppState.UserId) {
-                                                    OtherProfileAction(
-                                                        it,
-                                                        onFollow = {
-                                                            onFollowClick()
-                                                        },
-                                                        onChat = {
-                                                            onChatClick()
-                                                        }
-                                                    )
-                                                }
-
-                                            }
-
-                                        }
-                                    }
-
-                                    // 添加用户智能体行（智能体用户不显示）
-                                    if (!isAiAccount) {
-                                        UserAgentsRow(
-                                            userId = if (isSelf) null else profile?.id,
-                                            modifier = Modifier.padding(top = 16.dp),
-                                            onMoreClick = {
-                                                // 导航到智能体列表页面
-                                                // TODO: 实现导航逻辑
-                                            },
-                                            onAgentClick = { agent ->
-                                                // 导航到智能体详情页面
-                                                // TODO: 实现导航逻辑
-                                            },
-                                            onAvatarClick = { agent ->
-                                                // 导航到智能体个人主页
-                                                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) {
-                                                        // 处理错误
-                                                    }
-                                                }
-                                            },
-                                            onAgentLongClick = { agent ->
-                                                Log.d("ProfileV3", "onAgentLongClick called for agent: ${agent.title}, isSelf: $isSelf")
-                                                if (isSelf) { // 只有自己的智能体才能长按
-                                                    Log.d("ProfileV3", "Setting contextAgent and showing menu")
-                                                    contextAgent = agent
-                                                    showAgentMenu = true
-                                                }
-                                            }
-                                        )
-                                    }
-                                }
-
-                            }
-
-                        }
-                    }
-
-
-                }
-                Box(modifier = Modifier.fillMaxWidth()) {
-                    Column(
                         modifier = Modifier
                             .fillMaxWidth()
-                            .graphicsLayer {
-                                alpha = 1 - state.toolbarState.progress
-                            }
-                            .background(AppColors.profileBackground)
-                            .onGloballyPositioned {
-                                miniToolbarHeight = with(density) {
-                                    it.size.height.toDp().value.toInt()
+                            .height(bannerHeight.dp - 24.dp)
+                            .let {
+                                if (isSelf && isMain) {
+                                    it.noRippleClickable {
+                                        Intent(Intent.ACTION_PICK).apply {
+                                            type = "image/*"
+                                            pickBannerImageLauncher.launch(this)
+                                        }
+                                    }
+                                } else {
+                                    it
                                 }
                             }
+                            .shadow(
+                                elevation = 6.dp,
+                                shape = RoundedCornerShape(
+                                    bottomStart = 32.dp,
+                                    bottomEnd = 32.dp
+                                ),
+                            )
                     ) {
-                        StatusBarSpacer()
-                        Row(
-                            modifier = Modifier.padding(
-                                horizontal = 16.dp,
-                                vertical = 8.dp,
-                            ).noRippleClickable {
-
-                            },
-
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            if (!isMain) {
-                                Image(
-                                    painter = painterResource(id = R.drawable.rider_pro_back_icon), // Replace with your image resource
-                                    contentDescription = "Back",
-                                    modifier = Modifier
-                                        .noRippleClickable {
-                                            navController.navigateUp()
-                                        }
-                                        .size(24.dp),
-                                    colorFilter = ColorFilter.tint(AppColors.text)
-                                )
-                                Spacer(modifier = Modifier.width(8.dp))
-                                CustomAsyncImage(
-                                    LocalContext.current,
-                                    profile?.avatar,
-                                    modifier = Modifier
-                                        .size(32.dp)
-                                        .clip(CircleShape),
-                                    contentDescription = "",
-                                    contentScale = ContentScale.Crop
-                                )
-                                Spacer(modifier = Modifier.width(16.dp))
-                                Text(
-                                    text = profile?.nickName ?: "",
-                                    fontSize = 16.sp,
-                                    fontWeight = FontWeight.W600,
-                                    color = AppColors.text
-                                )
-
-                            }
-                            Spacer(modifier = Modifier.weight(1f))
-                            if (isSelf&&isMain) {
-                                Box(
-                                    modifier = Modifier
-                                        .size(24.dp)
-                                        .padding(16.dp)
-                                )
-                            }
-                        }
-
-                        Spacer(modifier = Modifier.height(8.dp))
+                        CustomAsyncImage(
+                            LocalContext.current,
+                            banner,
+                            modifier = Modifier.fillMaxSize(),
+                            contentDescription = "",
+                            contentScale = ContentScale.Crop
+                        )
                     }
-                    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)
+                }
+            } else {
+                Spacer(modifier = Modifier.height(100.dp))
+            }
 
-                            ) {
-                                Icon(
-                                    painter = painterResource(id = R.drawable.rider_pro_more_horizon),
-                                    contentDescription = "",
-                                    tint = AppColors.text
-                                )
-                            }
+            // 用户信息
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(AppColors.profileBackground)
+                    .padding(horizontal = 16.dp)
+            ) {
+                profile?.let {
+                    UserItem(
+                        accountProfileEntity = it,
+                        postCount = postCount ?: if (isSelf) MyProfileViewModel.momentLoader.total else moments.size
+                    )
+                }
+            }
 
+            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)
+                            },
+                            onPremiumClick = {
+                                navController.navigate(NavigationRoute.VipSelPage.route)
+                            }
+                        )
+                    } else {
+                        if (it.id != AppState.UserId) {
+                            OtherProfileAction(
+                                it,
+                                onFollow = {
+                                    onFollowClick()
+                                },
+                                onChat = {
+                                    onChatClick()
+                                }
+                            )
                         }
                     }
                 }
             }
-        ) {
+
+            // 用户智能体行
+            if (!isAiAccount) {
+                UserAgentsRow(
+                    userId = if (isSelf) null else profile?.id,
+                    modifier = Modifier.padding(top = 16.dp),
+                    onMoreClick = {
+                        // 导航到智能体列表页面
+                    },
+                    onAgentClick = { agent ->
+                        // 导航到智能体详情页面
+                    },
+                    onAvatarClick = { agent ->
+                        // 导航到智能体个人主页
+                        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) {
+                                // 处理错误
+                            }
+                        }
+                    },
+                    onAgentLongClick = { agent ->
+                        Log.d("ProfileV3", "onAgentLongClick called for agent: ${agent.title}, isSelf: $isSelf")
+                        if (isSelf) { // 只有自己的智能体才能长按
+                            Log.d("ProfileV3", "Setting contextAgent and showing menu")
+                            contextAgent = agent
+                            showAgentMenu = true
+                        }
+                    }
+                )
+            }
+
+            // 内容
             Column(
                 modifier = Modifier
-                    .fillMaxSize()
+                    .fillMaxWidth()
                     .background(AppColors.profileBackground)
+                    .padding(top = 8.dp)
             ) {
                 UserContentPageIndicator(
                     pagerState = pagerState,
@@ -586,6 +440,7 @@ fun ProfileV3(
                 Spacer(modifier = Modifier.height(8.dp))
                 HorizontalPager(
                     state = pagerState,
+                    modifier = Modifier.height(500.dp) // 固定滚动高度
                 ) { idx ->
                     when (idx) {
                         0 ->
@@ -615,15 +470,116 @@ fun ProfileV3(
                     }
                 }
             }
-
         }
+
+        // 顶部导航栏
+        TopNavigationBar(
+            isMain = isMain,
+            isSelf = isSelf,
+            profile = profile,
+            navController = navController,
+            alpha = toolbarAlpha
+        )
+
         PullRefreshIndicator(
             model.refreshing,
             refreshState,
             Modifier.align(Alignment.TopCenter)
         )
     }
+}
 
+//顶部导航栏组件
+@Composable
+fun TopNavigationBar(
+    isMain: Boolean,
+    isSelf: Boolean,
+    profile: AccountProfileEntity?,
+    navController: androidx.navigation.NavController,
+
+    alpha: Float
+) {
+    val appColors = LocalAppTheme.current
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .graphicsLayer { this.alpha = alpha } // 应用透明度
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(appColors.profileBackground)
+        ) {
+            StatusBarSpacer()
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .noRippleClickable {
+                    },
+                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)
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                    CustomAsyncImage(
+                        LocalContext.current,
+                        profile?.avatar,
+                        modifier = Modifier
+                            .size(32.dp)
+                            .clip(CircleShape),
+                        contentDescription = "",
+                        contentScale = ContentScale.Crop
+                    )
+                    Spacer(modifier = Modifier.width(16.dp))
+                    Text(
+                        text = profile?.nickName ?: "",
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600,
+                        color = appColors.text
+                    )
+                }
+                Spacer(modifier = Modifier.weight(1f))
+                if (isSelf && isMain) {
+                    Box(
+                        modifier = Modifier
+                            .size(24.dp)
+                            .padding(16.dp)
+                    )
+                }
+            }
+            Spacer(modifier = Modifier.height(8.dp))
+        }
+        if (isSelf && isMain) {
+            Box(
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .padding(top = 32.dp, end = 16.dp)
+                    .noRippleClickable {
+                        IndexViewModel.openDrawer = true
+                    }
+            ) {
+                Box(
+                    modifier = Modifier.padding(16.dp)
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.rider_pro_more_horizon),
+                        contentDescription = "",
+                        tint = appColors.text
+                    )
+                }
+            }
+        }
+    }
 }
 
 /**

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

@@ -37,9 +37,16 @@ import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.res.stringResource
 import com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.ui.composables.rememberDebouncer
-
+import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel
+import com.aiosman.ravenow.ui.network.ReloadButton
+import com.aiosman.ravenow.utils.NetworkUtils
 @Composable
 fun GalleryItem(
     moment: MomentEntity,
@@ -129,8 +136,50 @@ fun GalleryGrid(
     val AppColors = LocalAppTheme.current
     val gridState = rememberLazyGridState()
     val debouncer = rememberDebouncer()
+    var refreshKey by remember { mutableStateOf(0) }
+    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
-    if (moments.isEmpty()) {
+    if (!isNetworkAvailable) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(vertical = 60.dp),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Image(
+                painter = painterResource(id = R.mipmap.invalid_name_10),
+                contentDescription = "network error",
+                modifier = Modifier.size(181.dp),
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_title),
+                fontSize = 16.sp,
+                color = AppColors.text,
+                fontWeight = FontWeight.W600
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_subtitle),
+                fontSize = 14.sp,
+                color = AppColors.secondaryText,
+                fontWeight = FontWeight.W400
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            ReloadButton(
+                onClick = {
+                    refreshKey++
+                    MyProfileViewModel.ResetModel()
+                    MyProfileViewModel.loadProfile(pullRefresh = true)
+                }
+            )
+        }
+    } else if (moments.isEmpty()) {
         Column(
             modifier = Modifier
                 .fillMaxSize()
@@ -141,7 +190,7 @@ fun GalleryGrid(
             Image(
                 painter = painterResource(
                     id = if(AppState.darkMode) R.mipmap.qs_dt_qs_as_img
-                    else R.mipmap.qs_dt_qs_img),
+                    else R.mipmap.invalid_name_7),
                 contentDescription = "暂无图片",
                 modifier = Modifier.size(181.dp),
             )

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

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

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

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

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

@@ -19,6 +19,7 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -29,6 +30,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -44,7 +46,10 @@ import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.NavigationRoute
 import com.aiosman.ravenow.entity.AgentEntity
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
+import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel
+import com.aiosman.ravenow.ui.network.ReloadButton
 import com.aiosman.ravenow.utils.DebounceUtils
+import com.aiosman.ravenow.utils.NetworkUtils
 
 @Composable
 fun UserAgentsList(
@@ -88,7 +93,7 @@ fun UserAgentCard(
 ) {
     val AppColors = LocalAppTheme.current
     val navController = LocalNavController.current
-    
+
     // 防抖状态
     var lastClickTime by remember { mutableStateOf(0L) }
 
@@ -196,6 +201,7 @@ fun UserAgentCard(
 @Composable
 fun EmptyAgentsView() {
     val AppColors = LocalAppTheme.current
+    val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
     Column(
         modifier = Modifier
@@ -203,30 +209,63 @@ fun EmptyAgentsView() {
             .padding(vertical = 60.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Image(
-            painter = painterResource(
-                id =if(AppState.darkMode) R.mipmap.qs_ai_qs_as_img
-                else R.mipmap.qs_ai_qs_img),
-            contentDescription = "暂无Agent",
-            modifier = Modifier.size(181.dp),
-        )
-        
-        Spacer(modifier = Modifier.height(24.dp))
-        
-        Text(
-            text = "专属AI等你召唤",
-            fontSize = 16.sp,
-            color = AppColors.text,
-            fontWeight = FontWeight.W600
-        )
-        
-        Spacer(modifier = Modifier.height(8.dp))
-        
-        Text(
-            text = "AI将成为你的伙伴，而不是工具",
-            fontSize = 14.sp,
-            color = AppColors.secondaryText,
-            fontWeight = FontWeight.W400
-        )
+        if (isNetworkAvailable) {
+            Image(
+                painter = painterResource(
+                    id =if(AppState.darkMode) R.mipmap.qs_ai_qs_as_img
+                    else R.mipmap.ai),
+                contentDescription = "暂无Agent",
+                modifier = Modifier.size(181.dp),
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Text(
+                text = "专属AI等你召唤",
+                fontSize = 16.sp,
+                color = AppColors.text,
+                fontWeight = FontWeight.W600
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Text(
+                text = "AI将成为你的伙伴，而不是工具",
+                fontSize = 14.sp,
+                color = AppColors.secondaryText,
+                fontWeight = FontWeight.W400
+            )
+        } else {
+            Image(
+                painter = painterResource(id = R.mipmap.invalid_name_10),
+                contentDescription = "network error",
+                modifier = Modifier.size(181.dp),
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_title),
+                fontSize = 16.sp,
+                color = AppColors.text,
+                fontWeight = FontWeight.W600
+            )
+
+            Spacer(modifier = Modifier.height(8.dp))
+
+            Text(
+                text = stringResource(R.string.friend_chat_no_network_subtitle),
+                fontSize = 14.sp,
+                color = AppColors.secondaryText,
+                fontWeight = FontWeight.W400
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            ReloadButton(
+                onClick = {
+                    MyProfileViewModel.ResetModel()
+                    MyProfileViewModel.loadProfile(pullRefresh = true)
+                }
+            )
+        }
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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