2 Commits

Author SHA1 Message Date
a215d79ce8 Feat: Add News tab and related functionality
- Added a "News" tab to the main index screen.
- Implemented API parameters for fetching news-specific posts: `imageTag`, `search`, `advancedSearch`, `newsFilter`, `onlyNews`, `newsSource`, `newsLanguage`, `newsCategory`, `requireImageCache`.
- Updated `Moment` data class and `MomentEntity` to include news-related fields like `isNews`, `newsTitle`, `newsUrl`, etc.
- Created `News.kt` composable and `NewsViewModel.kt` to display and manage news items.
- Updated `MomentLoader` to include a `newsOnly` parameter for fetching only news items.
- Added Japanese translations for new index tab strings: "Worldwide", "Dynamic", "Following", "Hot", and "News".
- Adjusted tab count and layout based on guest/logged-in user status to accommodate the new "News" tab.
2025-09-16 14:08:50 +08:00
0e0d622864 Refactor: Optimize Agent tab UI and add chat room recommendations
- Implemented lazy loading for Agent list with pagination.
- Added a section for recommended chat rooms.
- Restructured Agent tab UI:
    - Fixed the top search bar.
    - Organized content into scrollable sections for "Today's Picks", "Recommended Chat Rooms", and "Find Agents".
    - Improved Agent card design with theme-aware backgrounds.
- Introduced `ChatRoom` data class and integrated chat room loading logic in `AgentViewModel`.
- Updated `RiderProAPI` to include `random` parameter for fetching random rooms.
- Enhanced Agent card and chat room card click handling with debounce.
2025-09-15 23:30:10 +08:00
11 changed files with 839 additions and 214 deletions

View File

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

View File

@@ -0,0 +1,49 @@
package com.aiosman.ravenow.data
import com.google.gson.annotations.SerializedName
/**
* 分类翻译数据模型
*/
data class CategoryTranslation(
@SerializedName("name")
val name: String,
@SerializedName("description")
val description: String
)
/**
* 分类翻译集合
*/
data class CategoryTranslations(
@SerializedName("ja")
val ja: CategoryTranslation? = null
)
/**
* 分类数据模型
*/
data class Category(
@SerializedName("id")
val id: Int,
@SerializedName("name")
val name: String,
@SerializedName("description")
val description: String,
@SerializedName("avatar")
val avatar: String,
@SerializedName("parentId")
val parentId: Int? = null,
@SerializedName("sort")
val sort: Int,
@SerializedName("isActive")
val isActive: Boolean,
@SerializedName("promptCount")
val promptCount: Int,
@SerializedName("createdAt")
val createdAt: String,
@SerializedName("updatedAt")
val updatedAt: String,
@SerializedName("translations")
val translations: CategoryTranslations? = null
)

View File

@@ -6,6 +6,7 @@ import com.aiosman.ravenow.data.AccountLike
import com.aiosman.ravenow.data.AccountNotice import com.aiosman.ravenow.data.AccountNotice
import com.aiosman.ravenow.data.AccountProfile import com.aiosman.ravenow.data.AccountProfile
import com.aiosman.ravenow.data.Agent import com.aiosman.ravenow.data.Agent
import com.aiosman.ravenow.data.Category
import com.aiosman.ravenow.data.Comment import com.aiosman.ravenow.data.Comment
import com.aiosman.ravenow.data.DataContainer import com.aiosman.ravenow.data.DataContainer
import com.aiosman.ravenow.data.ListContainer import com.aiosman.ravenow.data.ListContainer
@@ -570,19 +571,39 @@ interface RaveNowAPI {
@Body body: RemoveAccountRequestBody @Body body: RemoveAccountRequestBody
): Response<Unit> ): Response<Unit>
@GET("outside/prompts") @GET("outside/prompts")
suspend fun getAgent( suspend fun getAgent(
@Query("page") page: Int = 1, @Query("page") page: Int = 1,
@Query("pageSize") pageSize: Int = 20, @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("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>>> ): Response<DataContainer<ListContainer<Agent>>>
@GET("outside/my/prompts") @GET("outside/my/prompts")
suspend fun getMyAgent( suspend fun getMyAgent(
@Query("page") page: Int = 1, @Query("page") page: Int = 1,
@Query("pageSize") pageSize: Int = 20, @Query("pageSize") pageSize: Int = 20,
@Query("withWorkflow") withWorkflow: Int = 1, @Query("withWorkflow") withWorkflow: String = "1",
): Response<ListContainer<Agent>> ): Response<ListContainer<Agent>>
@Multipart @Multipart
@@ -619,6 +640,7 @@ interface RaveNowAPI {
suspend fun getRooms(@Query("page") page: Int = 1, suspend fun getRooms(@Query("page") page: Int = 1,
@Query("pageSize") pageSize: Int = 20, @Query("pageSize") pageSize: Int = 20,
@Query("isRecommended") isRecommended: Int = 1, @Query("isRecommended") isRecommended: Int = 1,
@Query("random") random: Int? = null
): Response<ListContainer<Room>> ): Response<ListContainer<Room>>
@GET("outside/rooms/detail") @GET("outside/rooms/detail")
@@ -632,5 +654,12 @@ interface RaveNowAPI {
@POST("outside/generate/agent-info") @POST("outside/generate/agent-info")
suspend fun generateAgentInfo(@Body body: GenerateAgentInfoRequestBody): Response<DataContainer<GenerateAgentInfoResponseBody>> suspend fun generateAgentInfo(@Body body: GenerateAgentInfoRequestBody): Response<DataContainer<GenerateAgentInfoResponseBody>>
@GET("outside/categories")
suspend fun getCategories(
@Query("page") page: Int = 1,
@Query("pageSize") pageSize: Int = 20,
@Query("lang") lang: String? = null
): Response<ListContainer<Category>>
} }

View File

@@ -0,0 +1,160 @@
package com.aiosman.ravenow.entity
import androidx.paging.PagingSource
import androidx.paging.PagingState
import com.aiosman.ravenow.AppStore
import com.aiosman.ravenow.data.Category
import com.aiosman.ravenow.data.CategoryTranslation
import com.aiosman.ravenow.data.CategoryTranslations
import com.aiosman.ravenow.data.ListContainer
import com.aiosman.ravenow.data.ServiceException
import com.aiosman.ravenow.data.api.ApiClient
import com.aiosman.ravenow.utils.Utils
import java.io.IOException
/**
* 分类实体类
*/
data class CategoryEntity(
val id: Int,
val name: String,
val description: String,
val avatar: String,
val parentId: Int? = null,
val sort: Int,
val isActive: Boolean,
val promptCount: Int,
val createdAt: String,
val updatedAt: String,
val translations: CategoryTranslations? = null
) {
/**
* 获取本地化名称
*/
fun getLocalizedName(): String {
return when (Utils.getCurrentLanguage()) {
"ja" -> translations?.ja?.name ?: name
else -> name
}
}
/**
* 获取本地化描述
*/
fun getLocalizedDescription(): String {
return when (Utils.getCurrentLanguage()) {
"ja" -> translations?.ja?.description ?: description
else -> description
}
}
}
/**
* Category 数据模型扩展函数
*/
fun Category.toCategoryEntity(): CategoryEntity {
return CategoryEntity(
id = id,
name = name,
description = description,
avatar = if (avatar.isNotEmpty()) "${ApiClient.BASE_API_URL}/outside$avatar?token=${AppStore.token}" else "",
parentId = parentId,
sort = sort,
isActive = isActive,
promptCount = promptCount,
createdAt = createdAt,
updatedAt = updatedAt,
translations = translations
)
}
/**
* 分类数据后端服务
*/
class CategoryBackend {
private val DataBatchSize = 20
suspend fun getCategories(pageNumber: Int): ListContainer<CategoryEntity>? {
try {
val resp = ApiClient.api.getCategories(
page = pageNumber,
pageSize = DataBatchSize,
lang = Utils.getCurrentLanguageTag()
)
if (!resp.isSuccessful) {
throw ServiceException("获取分类失败: ${resp.code()}")
}
val body = resp.body() ?: return null
return ListContainer(
total = body.total,
page = pageNumber,
pageSize = DataBatchSize,
list = body.list.map { it.toCategoryEntity() }
)
} catch (e: Exception) {
throw ServiceException("网络请求失败: ${e.message}")
}
}
}
/**
* 分类数据加载器参数
*/
class CategoryLoaderExtraArgs
/**
* 分类数据加载器
*/
class CategoryLoader : DataLoader<CategoryEntity, CategoryLoaderExtraArgs>() {
override suspend fun fetchData(
page: Int,
pageSize: Int,
extra: CategoryLoaderExtraArgs
): ListContainer<CategoryEntity> {
val backend = CategoryBackend()
return backend.getCategories(page) ?: ListContainer(
total = 0,
page = page,
pageSize = pageSize,
list = emptyList()
)
}
}
/**
* 分类分页数据源
*/
class CategoryPagingSource(
private val backend: CategoryBackend
) : PagingSource<Int, CategoryEntity>() {
override fun getRefreshKey(state: PagingState<Int, CategoryEntity>): Int? {
return state.anchorPosition?.let { anchorPosition ->
state.closestPageToPosition(anchorPosition)?.prevKey?.plus(1)
?: state.closestPageToPosition(anchorPosition)?.nextKey?.minus(1)
}
}
override suspend fun load(params: LoadParams<Int>): LoadResult<Int, CategoryEntity> {
return try {
val page = params.key ?: 1
val response = backend.getCategories(page)
if (response == null) {
LoadResult.Error(IOException("获取分类数据失败"))
} else {
val hasMore = response.list.size == response.pageSize
LoadResult.Page(
data = response.list,
prevKey = if (page == 1) null else page - 1,
nextKey = if (hasMore) page + 1 else null
)
}
} catch (e: Exception) {
LoadResult.Error(e)
}
}
}

View File

@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
@@ -36,6 +37,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
@@ -69,11 +71,9 @@ import com.aiosman.ravenow.utils.DebounceUtils
import com.aiosman.ravenow.utils.ResourceCleanupManager import com.aiosman.ravenow.utils.ResourceCleanupManager
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.lazy.grid.items import androidx.compose.ui.zIndex
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
@@ -96,6 +96,18 @@ fun Agent() {
viewModel.ensureDataLoaded() viewModel.ensureDataLoaded()
} }
// 监听滚动状态,实现自动加载更多
LaunchedEffect(scrollState) {
snapshotFlow { scrollState.value }
.collect { scrollValue ->
val maxScroll = scrollState.maxValue
if (scrollValue >= maxScroll - 100 && !viewModel.isLoading) {
// 滚动到接近底部时加载更多
viewModel.loadMoreAgentData()
}
}
}
// 防抖状态 // 防抖状态
var lastClickTime by remember { mutableStateOf(0L) } var lastClickTime by remember { mutableStateOf(0L) }
@@ -107,23 +119,21 @@ fun Agent() {
} }
} }
Column( Box(
modifier = Modifier.fillMaxSize()
) {
// 固定顶部搜索条
Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxWidth()
.verticalScroll(scrollState) .background(AppColors.background)
.padding( .zIndex(999.0f)
top = statusBarPaddingValues.calculateTopPadding(), .height(44.dp + statusBarPaddingValues.calculateTopPadding())
bottom = navigationBarPaddings,
start = 16.dp,
end = 16.dp
),
horizontalAlignment = Alignment.CenterHorizontally,
) { ) {
Row( Row(
modifier = Modifier modifier = Modifier
.wrapContentHeight() .fillMaxWidth()
.height(44.dp) .fillMaxHeight().padding(top = 32.dp, start = 16.dp, end = 16.dp),
.fillMaxWidth(),
horizontalArrangement = Arrangement.Start, horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
@@ -149,7 +159,21 @@ fun Agent() {
colorFilter = ColorFilter.tint(AppColors.text) colorFilter = ColorFilter.tint(AppColors.text)
) )
} }
Spacer(modifier = Modifier.height(15.dp)) }
// 可滚动的内容区域
Column(
modifier = Modifier
.fillMaxSize()
.verticalScroll(scrollState)
.padding(
top = 44.dp + statusBarPaddingValues.calculateTopPadding() + 15.dp,
bottom = navigationBarPaddings,
start = 16.dp,
end = 16.dp
),
horizontalAlignment = Alignment.CenterHorizontally,
) {
// // 搜索框 // // 搜索框
// Row( // Row(
// modifier = Modifier // modifier = Modifier
@@ -229,9 +253,10 @@ fun Agent() {
// ) // )
// } // }
var selectedTabIndex by remember { mutableStateOf(0) } // 使用 ViewModel 中的选中状态
val selectedTabIndex = viewModel.selectedCategoryIndex
// 标签页 // 动态标签页
LazyRow( LazyRow(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@@ -240,83 +265,35 @@ fun Agent() {
horizontalArrangement = Arrangement.Start, horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
viewModel.categories.forEachIndexed { index, category ->
item { item {
CustomTabItem( CustomTabItem(
text = stringResource(R.string.agent_recommend), text = category.getLocalizedName(),
isSelected = selectedTabIndex == 0, isSelected = selectedTabIndex == index,
onClick = { onClick = {
selectedTabIndex = 0 viewModel.selectCategory(index)
} }
) )
} }
if (index < viewModel.categories.size - 1) {
item { item {
TabSpacer() TabSpacer()
} }
item {
CustomTabItem(
text = "scenes",
isSelected = selectedTabIndex == 1,
onClick = {
selectedTabIndex = 1
} }
)
}
item {
TabSpacer()
}
item {
CustomTabItem(
text = "voices",
isSelected = selectedTabIndex == 2,
onClick = {
selectedTabIndex = 2
}
)
}
item {
TabSpacer()
}
item {
CustomTabItem(
text = "anime",
isSelected = selectedTabIndex == 3,
onClick = {
selectedTabIndex = 3
}
)
}
item {
TabSpacer()
}
item {
CustomTabItem(
text = "assist",
isSelected = selectedTabIndex == 4,
onClick = {
selectedTabIndex = 4
}
)
} }
} }
when (selectedTabIndex) { // 显示当前选中分类的 Agent 数据
0 -> {
AgentViewPagerSection(agentItems = viewModel.agentItems.take(15), viewModel) AgentViewPagerSection(agentItems = viewModel.agentItems.take(15), viewModel)
} }
else -> {
val shuffledAgents = viewModel.agentItems.shuffled().take(15) // 推荐聊天房间
AgentViewPagerSection(agentItems = shuffledAgents, viewModel) ChatRoomsSection(
} chatRooms = viewModel.chatRooms,
} navController = LocalNavController.current
} )
Spacer(modifier = Modifier.height(20.dp))
Row( Row(
modifier = Modifier modifier = Modifier
@@ -341,33 +318,76 @@ fun Agent() {
) )
} }
Spacer(modifier = Modifier.height(50.dp)) Spacer(modifier = Modifier.height(20.dp))
Column(
modifier = Modifier // Agent两列网格布局
.fillMaxWidth() AgentGridLayout(
.weight(1f) agentItems = viewModel.agentItems,
) {
val agentItems = viewModel.agentItems.take(15)
LazyVerticalGrid(
columns = GridCells.Fixed(2),
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(16.dp),
verticalArrangement = Arrangement.spacedBy(50.dp)
) {
items(agentItems) { agentItem ->
AgentCardSquare(
agentItem = agentItem,
viewModel = viewModel, viewModel = viewModel,
navController = LocalNavController.current navController = LocalNavController.current
) )
} }
} }
} }
@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") @SuppressLint("SuspiciousIndentation")
@Composable @Composable
fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navController: NavHostController) { fun AgentCardSquare(
agentItem: AgentItem,
viewModel: AgentViewModel,
navController: NavHostController
) {
val AppColors = LocalAppTheme.current val AppColors = LocalAppTheme.current
val cardHeight = 180.dp val cardHeight = 180.dp
val avatarSize = cardHeight / 3 // 头像大小为方块高度的三分之一 val avatarSize = cardHeight / 3 // 头像大小为方块高度的三分之一
@@ -379,7 +399,7 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(cardHeight) .height(cardHeight)
.background(Color(0xFFE0E0E0), RoundedCornerShape(12.dp)) // 灰色背景 .background(AppColors.secondaryBackground, RoundedCornerShape(12.dp)) // 主题背景
.clickable { .clickable {
if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) { if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
viewModel.goToProfile(agentItem.openId, navController) viewModel.goToProfile(agentItem.openId, navController)
@@ -394,7 +414,7 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
modifier = Modifier modifier = Modifier
.offset(y = -avatarSize / 2) .offset(y = -avatarSize / 2)
.size(avatarSize) .size(avatarSize)
.background(Color.White, RoundedCornerShape(avatarSize / 2)) .background(AppColors.background, RoundedCornerShape(avatarSize / 2))
.clip(RoundedCornerShape(avatarSize / 2)), .clip(RoundedCornerShape(avatarSize / 2)),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
@@ -421,7 +441,7 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(top = avatarSize / 2 + 8.dp, start = 8.dp, end = 8.dp, bottom = 8.dp), .padding(top = avatarSize / 2 + 8.dp, start = 8.dp, end = 8.dp, bottom = 48.dp), // 为底部聊天按钮留出空间
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
androidx.compose.material3.Text( androidx.compose.material3.Text(
@@ -443,16 +463,17 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis, overflow = androidx.compose.ui.text.style.TextOverflow.Ellipsis,
modifier = Modifier.weight(1f, fill = false) modifier = Modifier.weight(1f, fill = false)
) )
}
Spacer(modifier = Modifier.height(8.dp)) // 聊天按钮,固定在底部居中,距离底部有一定边距
// 聊天按钮,位于底部居中
Box( Box(
modifier = Modifier modifier = Modifier
.align(Alignment.BottomCenter)
.padding(bottom = 12.dp) // 距离底部的边距
.width(80.dp) .width(80.dp)
.height(32.dp) .height(32.dp)
.background( .background(
color = Color(0X147c7480), color = AppColors.inputBackground,
shape = RoundedCornerShape(8.dp) shape = RoundedCornerShape(8.dp)
) )
.clickable { .clickable {
@@ -482,7 +503,7 @@ fun AgentCardSquare(agentItem: AgentItem, viewModel: AgentViewModel, navControll
} }
} }
} }
}
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
fun AgentViewPagerSection(agentItems: List<AgentItem>, viewModel: AgentViewModel) { fun AgentViewPagerSection(agentItems: List<AgentItem>, viewModel: AgentViewModel) {
@@ -558,7 +579,13 @@ fun AgentViewPagerSection(agentItems: List<AgentItem>,viewModel: AgentViewModel)
} }
@Composable @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( Column(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
@@ -566,7 +593,11 @@ fun AgentPage(viewModel: AgentViewModel,agentItems: List<AgentItem>, page: Int,
) { ) {
// 显示3个agent // 显示3个agent
agentItems.forEachIndexed { index, agentItem -> 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) { if (index < agentItems.size - 1) {
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
} }
@@ -592,7 +623,7 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
Box( Box(
modifier = Modifier modifier = Modifier
.size(48.dp) .size(48.dp)
.background(Color(0xFFF5F5F5), RoundedCornerShape(24.dp)) .background(AppColors.secondaryBackground, RoundedCornerShape(24.dp))
.clickable { .clickable {
if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) { if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
viewModel.goToProfile(agentItem.openId, navController) viewModel.goToProfile(agentItem.openId, navController)
@@ -656,7 +687,7 @@ fun AgentCard2(viewModel: AgentViewModel,agentItem: AgentItem,navController: Nav
modifier = Modifier modifier = Modifier
.size(width = 60.dp, height = 32.dp) .size(width = 60.dp, height = 32.dp)
.background( .background(
color = Color(0X147c7480), color = AppColors.inputBackground,
shape = RoundedCornerShape(8.dp) shape = RoundedCornerShape(8.dp)
) )
.clickable { .clickable {
@@ -686,3 +717,135 @@ 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_agent2),
contentDescription = "chat room",
modifier = Modifier.size(28.dp)
)
Spacer(modifier = Modifier.width(4.dp))
androidx.compose.material3.Text(
text = stringResource(R.string.agent_chat_room),
fontSize = 16.sp,
fontWeight = androidx.compose.ui.text.font.FontWeight.W600,
color = AppColors.text
)
}
// 3行宫格布局
Column(
modifier = Modifier.fillMaxWidth()
) {
// 将聊天房间按3个一组分组
chatRooms.chunked(3).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)
)
}
// 如果这一行不足3个添加空白占位
repeat(3 - rowRooms.size) {
Spacer(modifier = Modifier.weight(1f))
}
}
}
}
}
}
@Composable
fun ChatRoomCard(
chatRoom: ChatRoom,
navController: NavHostController,
modifier: Modifier = Modifier
) {
val AppColors = LocalAppTheme.current
val cardSize = 100.dp
// 防抖状态
var lastClickTime by remember { mutableStateOf(0L) }
// 正方形卡片,文字重叠在底部
Box(
modifier = modifier
.size(cardSize)
.background(AppColors.secondaryBackground, RoundedCornerShape(12.dp))
.clickable {
if (DebounceUtils.simpleDebounceClick(lastClickTime, 500L) {
// 这里可以添加进入聊天房间的逻辑
// navController.navigate(NavigationRoute.ChatRoom.route.replace("{id}", chatRoom.id))
}) {
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
)
}
}
}

View File

@@ -6,6 +6,10 @@ import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
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.ApiClient
import com.aiosman.ravenow.data.api.RaveNowAPI import com.aiosman.ravenow.data.api.RaveNowAPI
import com.aiosman.ravenow.data.api.SingleChatRequestBody import com.aiosman.ravenow.data.api.SingleChatRequestBody
@@ -13,8 +17,18 @@ import com.aiosman.ravenow.ui.index.tabs.ai.tabs.mine.MineAgentViewModel.createG
import com.aiosman.ravenow.ui.NavigationRoute import com.aiosman.ravenow.ui.NavigationRoute
import com.aiosman.ravenow.ui.index.tabs.message.MessageListViewModel.userService import com.aiosman.ravenow.ui.index.tabs.message.MessageListViewModel.userService
import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.AgentItem import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.AgentItem
import com.aiosman.ravenow.entity.CategoryEntity
import com.aiosman.ravenow.entity.CategoryBackend
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
data class ChatRoom(
val id: String,
val name: String,
val avatar: String = "",
val banner: String = "",
val memberCount: Int = 0
)
object AgentViewModel: ViewModel() { object AgentViewModel: ViewModel() {
private val apiClient: RaveNowAPI = ApiClient.api private val apiClient: RaveNowAPI = ApiClient.api
@@ -22,32 +36,65 @@ object AgentViewModel: ViewModel() {
var agentItems by mutableStateOf<List<AgentItem>>(emptyList()) var agentItems by mutableStateOf<List<AgentItem>>(emptyList())
private set 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<CategoryEntity>>(emptyList())
private set
var selectedCategoryIndex by mutableStateOf(0)
private set
var errorMessage by mutableStateOf<String?>(null) var errorMessage by mutableStateOf<String?>(null)
private set private set
var isRefreshing by mutableStateOf(false) var isRefreshing by mutableStateOf(false)
private set private set
var isLoading by mutableStateOf(false) var isLoading by mutableStateOf(false)
private set private set
private var currentPage = 1
private var hasMoreData = true
init { init {
loadAgentData() loadAgentData()
loadChatRooms()
loadCategories()
} }
private fun loadAgentData() { private fun loadAgentData(categoryIndex: Int = 0) {
viewModelScope.launch { viewModelScope.launch {
isLoading = true isLoading = true
errorMessage = null errorMessage = null
currentPage = 1
hasMoreData = true
try { try {
val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = 1) val selectedCategory = if (categoryIndex < categories.size) categories[categoryIndex] else null
val response = if (categoryIndex == 0 || selectedCategory == null) {
// 推荐分类或无效分类,加载所有 Agent
apiClient.getAgent(page = currentPage, pageSize = 20, withWorkflow = "1", random = "true")
} else {
// 特定分类,使用 categoryName 参数
apiClient.getAgent(
page = currentPage,
pageSize = 20,
withWorkflow = "1",
categoryName = selectedCategory.name,
random = "true"
)
}
if (response.isSuccessful) { if (response.isSuccessful) {
val agents = response.body()?.data?.list ?: emptyList() val agents = response.body()?.data?.list ?: emptyList()
agentItems = agents.map { agent -> agentItems = agents.map { agent ->
AgentItem.fromAgent(agent) AgentItem.fromAgent(agent)
} }
hasMoreData = agents.size >= 20
} else { } else {
errorMessage = "获取Agent数据失败: ${response.code()}" errorMessage = "获取Agent数据失败: ${response.code()}"
} }
@@ -58,6 +105,129 @@ object AgentViewModel: ViewModel() {
} }
} }
} }
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.trtcRoomId,
name = room.name,
avatar = room.avatar,
banner = ConstVars.BASE_SERVER + "/api/v1/outside/" + room.recommendBanner + "?token=${AppStore.token}",
memberCount = room.userCount
)
}
} else {
}
} catch (e: Exception) {
// 如果网络请求失败,使用默认数据
}
}
}
private fun loadCategories() {
viewModelScope.launch {
try {
val categoryBackend = CategoryBackend()
val response = categoryBackend.getCategories(1)
if (response != null) {
// 添加一个默认的"推荐"分类在第一位
val recommendCategory = CategoryEntity(
id = 0,
name = "推荐",
description = "推荐内容",
avatar = "",
parentId = null,
sort = 0,
isActive = true,
promptCount = 0,
createdAt = "",
updatedAt = "",
translations = null
)
categories = listOf(recommendCategory) + response.list
// 分类加载完成后,重新加载当前选中分类的 Agent 数据
if (agentItems.isEmpty()) {
loadAgentData(selectedCategoryIndex)
}
} else {
// 如果请求失败,使用默认分类
categories = listOf()
}
} catch (e: Exception) {
// 如果网络请求失败,使用默认分类
categories = listOf()
}
}
}
/**
* 加载更多Agent数据
*/
fun loadMoreAgentData() {
if (!hasMoreData || isLoading) return
viewModelScope.launch {
isLoading = true
try {
val nextPage = currentPage + 1
val selectedCategory = if (selectedCategoryIndex < categories.size) categories[selectedCategoryIndex] else null
val response = if (selectedCategoryIndex == 0 || selectedCategory == null) {
// 推荐分类或无效分类,加载所有 Agent
apiClient.getAgent(page = nextPage, pageSize = 20, withWorkflow = "1")
} else {
// 特定分类,使用 categoryName 参数
apiClient.getAgent(
page = nextPage,
pageSize = 20,
withWorkflow = "1",
categoryName = selectedCategory.name
)
}
if (response.isSuccessful) {
val agents = response.body()?.data?.list ?: emptyList()
val newAgentItems = agents.map { agent ->
AgentItem.fromAgent(agent)
}
agentItems = agentItems + newAgentItems
currentPage = nextPage
hasMoreData = agents.size >= 20
} else {
errorMessage = "加载更多Agent数据失败: ${response.code()}"
}
} catch (e: Exception) {
errorMessage = "网络请求失败: ${e.message}"
} finally {
isLoading = false
}
}
}
/**
* 选择分类并加载对应的 Agent 数据
*/
fun selectCategory(categoryIndex: Int) {
if (categoryIndex != selectedCategoryIndex) {
selectedCategoryIndex = categoryIndex
loadAgentData(categoryIndex)
}
}
fun createSingleChat( fun createSingleChat(
openId: String, openId: String,
) { ) {
@@ -116,9 +286,13 @@ object AgentViewModel: ViewModel() {
*/ */
fun ResetModel() { fun ResetModel() {
agentItems = emptyList() agentItems = emptyList()
categories = emptyList()
selectedCategoryIndex = 0
errorMessage = null errorMessage = null
isRefreshing = false isRefreshing = false
isLoading = false isLoading = false
currentPage = 1
hasMoreData = true
} }
} }

View File

@@ -70,7 +70,7 @@ class ExploreViewModel : ViewModel() {
isRefreshing = true isRefreshing = true
errorMessage = null errorMessage = null
try { try {
val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = 1) val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = "1")
if (response.isSuccessful) { if (response.isSuccessful) {
val agents = response.body()?.data?.list ?: emptyList() val agents = response.body()?.data?.list ?: emptyList()
agentItems = agents.map { agent -> agentItems = agents.map { agent ->
@@ -114,7 +114,7 @@ class ExploreViewModel : ViewModel() {
isLoading = true isLoading = true
errorMessage = null errorMessage = null
try { try {
val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = 1) val response = apiClient.getAgent(page = 1, pageSize = 20, withWorkflow = "1")
if (response.isSuccessful) { if (response.isSuccessful) {
val agents = response.body()?.data?.list ?: emptyList() val agents = response.body()?.data?.list ?: emptyList()
agentItems = agents.map { agent -> agentItems = agents.map { agent ->

View File

@@ -63,6 +63,23 @@ object Utils {
return Locale.getDefault().language return Locale.getDefault().language
} }
/**
* 获取当前系统语言的完整标签,包含国家/地区代码
* 返回格式en, ja, zh-CN, zh-TW 等
*/
fun getCurrentLanguageTag(): String {
val locale = Locale.getDefault()
val language = locale.language
val country = locale.country
return when {
// 中文需要区分简体和繁体
language == "zh" && country.isNotEmpty() -> "$language-$country"
// 其他语言通常只需要语言代码
else -> language
}
}
fun compressImage(context: Context, uri: Uri, maxSize: Int = 512, quality: Int = 85): File { fun compressImage(context: Context, uri: Uri, maxSize: Int = 512, quality: Int = 85): File {
val inputStream = context.contentResolver.openInputStream(uri) val inputStream = context.contentResolver.openInputStream(uri)
val originalBitmap = BitmapFactory.decodeStream(inputStream) val originalBitmap = BitmapFactory.decodeStream(inputStream)

View File

@@ -33,4 +33,28 @@
<string name="index_following">フォロー中</string> <string name="index_following">フォロー中</string>
<string name="index_hot">ホット</string> <string name="index_hot">ホット</string>
<string name="index_news">ニュース</string> <string name="index_news">ニュース</string>
<!-- Main navigation -->
<string name="main_home">ホーム</string>
<string name="main_ai">エージェント</string>
<string name="main_message">メッセージ</string>
<string name="main_profile">プロフィール</string>
<!-- Agent related strings -->
<string name="agent_mine">マイ</string>
<string name="agent_hot">ホット</string>
<string name="agent_recommend">おすすめ</string>
<string name="agent_other">その他</string>
<string name="agent_find">AI発見</string>
<string name="chat">チャット</string>
<string name="agent_chat_room">チャット</string>
<string name="agent_recommended_chat_rooms">おすすめチャットルーム</string>
<string name="search">検索</string>
<string name="agent_recommend_agent">おすすめエージェント</string>
<!-- Chat related -->
<string name="chat_ai">AI</string>
<string name="chat_group">グループ</string>
<string name="chat_friend">友達</string>
<string name="hot_rooms">人気チャットルーム</string>
</resources> </resources>

View File

@@ -188,7 +188,7 @@
<string name="group_room_enter_success">成功加入房间</string> <string name="group_room_enter_success">成功加入房间</string>
<string name="group_room_enter_fail">加入房间失败</string> <string name="group_room_enter_fail">加入房间失败</string>
<string name="agent_createing">创建中...</string> <string name="agent_createing">创建中...</string>
<string name="agent_find">发现</string> <string name="agent_find">发现AI</string>
<string name="text_error_password_too_long">密码不能超过 %1$d 个字符</string> <string name="text_error_password_too_long">密码不能超过 %1$d 个字符</string>
<!-- Create Bottom Sheet --> <!-- Create Bottom Sheet -->
@@ -218,4 +218,8 @@
<string name="create_agent_v2_edit_icon_desc">编辑图标</string> <string name="create_agent_v2_edit_icon_desc">编辑图标</string>
<string name="create_agent_v2_select_avatar_desc">选择头像</string> <string name="create_agent_v2_select_avatar_desc">选择头像</string>
<!-- Agent related strings -->
<string name="agent_chat_room">聊天</string>
<string name="agent_recommended_chat_rooms">推荐聊天房间</string>
</resources> </resources>

View File

@@ -185,7 +185,7 @@
<string name="group_room_enter_success">成功加入房间</string> <string name="group_room_enter_success">成功加入房间</string>
<string name="group_room_enter_fail">加入房间失败</string> <string name="group_room_enter_fail">加入房间失败</string>
<string name="agent_createing">创建中...</string> <string name="agent_createing">创建中...</string>
<string name="agent_find">发现</string> <string name="agent_find">发现AI</string>
<string name="text_error_password_too_long">Password cannot exceed %1$d characters</string> <string name="text_error_password_too_long">Password cannot exceed %1$d characters</string>
<!-- Create Bottom Sheet --> <!-- Create Bottom Sheet -->
@@ -215,4 +215,8 @@
<string name="create_agent_v2_edit_icon_desc">Edit Icon</string> <string name="create_agent_v2_edit_icon_desc">Edit Icon</string>
<string name="create_agent_v2_select_avatar_desc">Select Avatar</string> <string name="create_agent_v2_select_avatar_desc">Select Avatar</string>
<!-- Agent related strings -->
<string name="agent_chat_room">Chat</string>
<string name="agent_recommended_chat_rooms">Recommended Chat Rooms</string>
</resources> </resources>