diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index f4c2918..da1a05e 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -126,4 +126,10 @@ dependencies {
// Bugly (Tencent crash reporting)
implementation(libs.bugly.crashreport)
implementation(libs.bugly.native)
+
+ // Umeng Analytics (from zhini_im)
+ implementation(libs.umeng.common)
+ implementation(libs.umeng.asms)
+ implementation(libs.umeng.uyumao)
+ implementation(libs.umeng.abtest)
}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bc54b15..27f1e89 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -36,6 +36,17 @@
+
+
+
+
+
>
- @Query("SELECT * FROM conversations ORDER BY lastMessageAt DESC")
+ @Query("SELECT * FROM conversations ORDER BY isPinned DESC, lastMessageAt DESC")
suspend fun getAllConversationsSync(): List
- @Query("SELECT * FROM conversations WHERE agentId = :agentId ORDER BY lastMessageAt DESC")
+ @Query("SELECT * FROM conversations WHERE agentId = :agentId ORDER BY isPinned DESC, lastMessageAt DESC")
suspend fun getByAgentId(agentId: String): List
@Query("SELECT * FROM conversations WHERE sessionId = :sessionId LIMIT 1")
@@ -26,4 +26,7 @@ interface ConversationDao {
@Query("DELETE FROM conversations WHERE sessionId = :sessionId")
suspend fun deleteById(sessionId: String)
+
+ @Query("UPDATE conversations SET isPinned = :isPinned WHERE sessionId = :sessionId")
+ suspend fun updatePinStatus(sessionId: String, isPinned: Boolean)
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/local/ConversationEntity.kt b/android/app/src/main/java/com/tiangong/aiagent/data/local/ConversationEntity.kt
index 7d67f9b..5592b99 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/data/local/ConversationEntity.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/local/ConversationEntity.kt
@@ -11,5 +11,6 @@ data class ConversationEntity(
val title: String?,
val lastMessage: String?,
val lastMessageAt: Long,
- val messageCount: Int
+ val messageCount: Int,
+ val isPinned: Boolean = false
)
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/local/CredentialStore.kt b/android/app/src/main/java/com/tiangong/aiagent/data/local/CredentialStore.kt
index 0594525..5812f86 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/data/local/CredentialStore.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/local/CredentialStore.kt
@@ -41,4 +41,29 @@ class CredentialStore @Inject constructor(
.remove("password")
.apply()
}
+
+ // ─── Encrypted tokens ───
+
+ fun saveToken(token: String) {
+ prefs.edit().putString("access_token", token).apply()
+ }
+
+ fun getToken(): String? {
+ return prefs.getString("access_token", null)
+ }
+
+ fun saveRefreshToken(refreshToken: String) {
+ prefs.edit().putString("refresh_token", refreshToken).apply()
+ }
+
+ fun getRefreshToken(): String? {
+ return prefs.getString("refresh_token", null)
+ }
+
+ fun clearTokens() {
+ prefs.edit()
+ .remove("access_token")
+ .remove("refresh_token")
+ .apply()
+ }
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/local/TokenDataStore.kt b/android/app/src/main/java/com/tiangong/aiagent/data/local/TokenDataStore.kt
index 131a4b2..bb80b03 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/data/local/TokenDataStore.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/local/TokenDataStore.kt
@@ -30,6 +30,7 @@ class TokenDataStore @Inject constructor(
private val KEY_NOTIFICATION_ENABLED = booleanPreferencesKey("notification_enabled")
private val KEY_NOTIFICATION_QUIET_START = stringPreferencesKey("notification_quiet_start")
private val KEY_NOTIFICATION_QUIET_END = stringPreferencesKey("notification_quiet_end")
+ private val KEY_ONBOARDING_COMPLETED = booleanPreferencesKey("onboarding_completed")
}
// ─── Token ───
@@ -137,6 +138,13 @@ class TokenDataStore @Inject constructor(
context.dataStore.edit { it[KEY_THEME_MODE] = mode }
}
+ // ─── Onboarding (v1.1.0) ───
+ val onboardingCompleted: Flow = context.dataStore.data.map { it[KEY_ONBOARDING_COMPLETED] ?: false }
+
+ suspend fun setOnboardingCompleted() {
+ context.dataStore.edit { it[KEY_ONBOARDING_COMPLETED] = true }
+ }
+
// ─── Clear All ───
suspend fun clearAll() {
context.dataStore.edit { prefs ->
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/remote/ApiService.kt b/android/app/src/main/java/com/tiangong/aiagent/data/remote/ApiService.kt
index c082bbf..a614fee 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/data/remote/ApiService.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/remote/ApiService.kt
@@ -125,9 +125,32 @@ interface ApiService {
@GET("api/v1/agent-chat/{agentId}/sessions")
suspend fun getAgentSessions(
@Path("agentId") agentId: String,
- @Query("limit") limit: Int = 50
+ @Query("limit") limit: Int = 50,
+ @Query("search") search: String? = null
): SessionListResponse
+ @PATCH("api/v1/agent-chat/{agentId}/sessions/{sessionId}")
+ suspend fun updateSession(
+ @Path("agentId") agentId: String,
+ @Path("sessionId") sessionId: String,
+ @Body request: UpdateSessionRequest
+ ): UpdateSessionResponse
+
+ @DELETE("api/v1/agent-chat/{agentId}/sessions/{sessionId}")
+ suspend fun deleteSession(
+ @Path("agentId") agentId: String,
+ @Path("sessionId") sessionId: String
+ ): DeleteSessionResponse
+
+ // ─── Message Search ───
+ @GET("api/v1/agent-chat/{agentId}/search-messages")
+ suspend fun searchMessages(
+ @Path("agentId") agentId: String,
+ @Query("q") query: String,
+ @Query("skip") skip: Int = 0,
+ @Query("limit") limit: Int = 50
+ ): SearchMessagesResponse
+
// ─── Agent Memory ───
@GET("api/v1/agents/{agentId}/memory/global-knowledge")
suspend fun getGlobalKnowledge(
@@ -228,4 +251,92 @@ interface ApiService {
@Path("agentId") agentId: String,
@Path("memoryId") memoryId: String
): Response
+
+ // ─── Analytics ───
+ @POST("api/v1/analytics/events")
+ suspend fun sendAnalyticsEvents(@Body request: AnalyticsEventsRequest): Response
+
+ // ─── Phone Login ───
+ @POST("api/v1/auth/phone/send-code")
+ suspend fun sendPhoneCode(@Body request: PhoneSendCodeRequest): PhoneSendCodeResponse
+
+ @POST("api/v1/auth/login/phone")
+ suspend fun phoneLogin(@Body request: PhoneLoginRequest): PhoneLoginResponse
+
+ // ─── Agent Market ───
+ @GET("api/v1/agent-market")
+ suspend fun browseMarket(
+ @Query("skip") skip: Int = 0,
+ @Query("limit") limit: Int = 20,
+ @Query("search") search: String? = null,
+ @Query("category") category: String? = null,
+ @Query("sort_by") sortBy: String = "created_at",
+ @Query("sort_order") sortOrder: String = "desc",
+ @Query("featured_only") featuredOnly: Boolean = false
+ ): List
+
+ @GET("api/v1/agent-market/{agentId}")
+ suspend fun getMarketAgentDetail(@Path("agentId") agentId: String): AgentMarketDetailDto
+
+ @POST("api/v1/agent-market/{agentId}/install")
+ suspend fun installMarketAgent(@Path("agentId") agentId: String): InstallAgentResponse
+
+ @POST("api/v1/agent-market/{agentId}/rate")
+ suspend fun rateMarketAgent(
+ @Path("agentId") agentId: String,
+ @Body request: RateAgentRequest
+ ): Response
+
+ @POST("api/v1/agent-market/{agentId}/favorite")
+ suspend fun favoriteMarketAgent(@Path("agentId") agentId: String): Response
+
+ @DELETE("api/v1/agent-market/{agentId}/favorite")
+ suspend fun unfavoriteMarketAgent(@Path("agentId") agentId: String): Response
+
+ @GET("api/v1/agent-market/my/favorites")
+ suspend fun getMyFavorites(
+ @Query("skip") skip: Int = 0,
+ @Query("limit") limit: Int = 20
+ ): List
+
+ @GET("api/v1/agent-market/categories/list")
+ suspend fun getMarketCategories(): List
+
+ // ─── Template Market ───
+ @GET("api/v1/template-market")
+ suspend fun browseTemplates(
+ @Query("skip") skip: Int = 0,
+ @Query("limit") limit: Int = 20,
+ @Query("search") search: String? = null,
+ @Query("category") category: String? = null
+ ): List
+
+ @POST("api/v1/template-market/{templateId}/use")
+ suspend fun useTemplate(@Path("templateId") templateId: String): AgentResponse
+
+ // ─── Scene Templates ───
+ @GET("api/v1/platform/scene-templates")
+ suspend fun getSceneTemplates(): List
+
+ @POST("api/v1/platform/agents/from-template")
+ suspend fun createFromSceneTemplate(@Body request: CreateFromTemplateRequest): AgentResponse
+
+ // ─── Billing (v1.2) ───
+ @GET("api/v1/billing/plans")
+ suspend fun getBillingPlans(): List
+
+ @GET("api/v1/billing/user/subscription")
+ suspend fun getUserSubscription(): UserSubscriptionDto
+
+ @GET("api/v1/billing/user/usage")
+ suspend fun getUserUsage(): UserUsageDto
+
+ @POST("api/v1/billing/orders")
+ suspend fun createOrder(@Body request: CreateOrderRequest): OrderResponseDto
+
+ @GET("api/v1/billing/orders/{orderId}")
+ suspend fun getOrder(@Path("orderId") orderId: String): OrderResponseDto
+
+ @POST("api/v1/billing/orders/{orderId}/pay")
+ suspend fun payOrder(@Path("orderId") orderId: String): PayOrderResponse
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/remote/dto/Dtos.kt b/android/app/src/main/java/com/tiangong/aiagent/data/remote/dto/Dtos.kt
index d2a5ffe..d275f0c 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/data/remote/dto/Dtos.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/remote/dto/Dtos.kt
@@ -336,6 +336,7 @@ data class SessionItemDto(
val title: String? = null,
@SerializedName("last_message") val lastMessage: String? = null,
@SerializedName("message_count") val messageCount: Int = 0,
+ @SerializedName("is_pinned") val isPinned: Boolean = false,
@SerializedName("created_at") val createdAt: String? = null,
@SerializedName("updated_at") val updatedAt: String? = null
)
@@ -344,6 +345,64 @@ data class SessionListResponse(
val sessions: List
)
+// ─────────── Session Management ───────────
+
+data class UpdateSessionRequest(
+ val title: String? = null,
+ @SerializedName("is_pinned") val isPinned: Boolean? = null
+)
+
+data class UpdateSessionResponse(
+ val id: String,
+ val title: String? = null,
+ @SerializedName("is_pinned") val isPinned: Boolean = false,
+ @SerializedName("created_at") val createdAt: String? = null,
+ @SerializedName("updated_at") val updatedAt: String? = null
+)
+
+data class DeleteSessionResponse(
+ val deleted: Boolean,
+ @SerializedName("messages_deleted") val messagesDeleted: Int = 0
+)
+
+// ─────────── Analytics ───────────
+
+data class AnalyticsEventItem(
+ @SerializedName("event_type") val eventType: String,
+ @SerializedName("screen_name") val screenName: String? = null,
+ val category: String? = null,
+ val action: String? = null,
+ val label: String? = null,
+ @SerializedName("agent_id") val agentId: String? = null,
+ val timestamp: String? = null
+)
+
+data class AnalyticsEventsRequest(
+ val events: List
+)
+
+// ─────────── Phone Login ───────────
+
+data class PhoneSendCodeRequest(
+ val phone: String
+)
+
+data class PhoneSendCodeResponse(
+ val message: String? = null,
+ @SerializedName("dev_code") val devCode: String? = null
+)
+
+data class PhoneLoginRequest(
+ val phone: String,
+ val code: String
+)
+
+data class PhoneLoginResponse(
+ @SerializedName("access_token") val accessToken: String,
+ @SerializedName("token_type") val tokenType: String = "bearer",
+ @SerializedName("refresh_token") val refreshToken: String? = null
+)
+
// ─────────── Feedback ───────────
@@ -477,3 +536,184 @@ data class VectorMemoryListResponse(
val items: List,
val total: Int
)
+
+// ─────────── Agent Market ───────────
+
+data class AgentMarketItemDto(
+ val id: String,
+ val name: String,
+ val description: String? = null,
+ val category: String? = null,
+ val tags: List? = null,
+ val thumbnail: String? = null,
+ @SerializedName("is_featured") val isFeatured: Boolean = false,
+ @SerializedName("rating_avg") val ratingAvg: Double = 0.0,
+ @SerializedName("rating_count") val ratingCount: Int = 0,
+ @SerializedName("use_count") val useCount: Int = 0,
+ @SerializedName("view_count") val viewCount: Int = 0,
+ val version: Int = 1,
+ @SerializedName("user_id") val userId: String? = null,
+ @SerializedName("creator_username") val creatorUsername: String? = null,
+ @SerializedName("is_favorited") val isFavorited: Boolean? = null,
+ @SerializedName("user_rating") val userRating: Int? = null,
+ @SerializedName("created_at") val createdAt: String? = null,
+ @SerializedName("updated_at") val updatedAt: String? = null
+)
+
+data class AgentMarketDetailDto(
+ val id: String,
+ val name: String,
+ val description: String? = null,
+ val category: String? = null,
+ val tags: List? = null,
+ val thumbnail: String? = null,
+ @SerializedName("is_featured") val isFeatured: Boolean = false,
+ @SerializedName("rating_avg") val ratingAvg: Double = 0.0,
+ @SerializedName("rating_count") val ratingCount: Int = 0,
+ @SerializedName("use_count") val useCount: Int = 0,
+ @SerializedName("view_count") val viewCount: Int = 0,
+ val version: Int = 1,
+ @SerializedName("user_id") val userId: String? = null,
+ @SerializedName("creator_username") val creatorUsername: String? = null,
+ @SerializedName("is_favorited") val isFavorited: Boolean? = null,
+ @SerializedName("user_rating") val userRating: Int? = null,
+ @SerializedName("workflow_config") val workflowConfig: Map? = null,
+ @SerializedName("budget_config") val budgetConfig: Map? = null,
+ @SerializedName("created_at") val createdAt: String? = null,
+ @SerializedName("updated_at") val updatedAt: String? = null
+)
+
+data class InstallAgentRequest(
+ @SerializedName("agent_id") val agentId: String? = null
+)
+
+data class InstallAgentResponse(
+ val message: String,
+ @SerializedName("agent_id") val agentId: String,
+ @SerializedName("agent_name") val agentName: String,
+ @SerializedName("forked_from_id") val forkedFromId: String,
+ @SerializedName("upstream_version") val upstreamVersion: Int
+)
+
+data class RateAgentRequest(
+ val rating: Int,
+ val comment: String? = null
+)
+
+data class MarketCategoryDto(
+ val category: String,
+ val count: Int
+)
+
+// ─────────── Template Market ───────────
+
+data class TemplateItemDto(
+ val id: String,
+ val name: String,
+ val description: String? = null,
+ val category: String? = null,
+ val tags: List? = null,
+ val thumbnail: String? = null,
+ @SerializedName("use_count") val useCount: Int = 0,
+ @SerializedName("rating_avg") val ratingAvg: Double = 0.0,
+ @SerializedName("user_id") val userId: String? = null,
+ @SerializedName("creator_username") val creatorUsername: String? = null,
+ @SerializedName("created_at") val createdAt: String? = null
+)
+
+data class SceneTemplateItemDto(
+ val id: String,
+ val name: String,
+ val description: String? = null,
+ val category: String? = null,
+ val icon: String? = null,
+ @SerializedName("workflow_config") val workflowConfig: Map? = null
+)
+
+data class CreateFromTemplateRequest(
+ val name: String,
+ val description: String? = null,
+ @SerializedName("scene_template_id") val sceneTemplateId: String? = null
+)
+
+// ─────────── Search ───────────
+
+data class SearchMessageItemDto(
+ val id: String,
+ @SerializedName("session_id") val sessionId: String,
+ @SerializedName("agent_id") val agentId: String? = null,
+ val role: String,
+ val content: String? = null,
+ @SerializedName("session_title") val sessionTitle: String? = null,
+ @SerializedName("created_at") val createdAt: String? = null
+)
+
+data class SearchMessagesResponse(
+ val messages: List,
+ val total: Int
+)
+
+// ─────────── Billing (v1.2) ───────────
+
+data class BillingPlanDto(
+ val id: String,
+ val name: String,
+ val tier: String,
+ @SerializedName("price_monthly") val priceMonthly: Double,
+ @SerializedName("price_yearly") val priceYearly: Double,
+ @SerializedName("daily_quota") val dailyQuota: Int,
+ @SerializedName("agent_limit") val agentLimit: Int,
+ @SerializedName("knowledge_limit") val knowledgeLimit: Int,
+ @SerializedName("file_upload_mb") val fileUploadMb: Int = 5,
+ val models: List? = null,
+ val features: List? = null,
+ @SerializedName("is_active") val isActive: Boolean = true,
+ @SerializedName("sort_order") val sortOrder: Int = 0
+)
+
+data class UserSubscriptionDto(
+ val tier: String = "free",
+ val status: String = "active",
+ @SerializedName("plan_name") val planName: String? = null,
+ @SerializedName("started_at") val startedAt: String? = null,
+ @SerializedName("expires_at") val expiresAt: String? = null,
+ @SerializedName("auto_renew") val autoRenew: Boolean = false,
+ @SerializedName("daily_quota") val dailyQuota: Int = 50,
+ @SerializedName("agent_limit") val agentLimit: Int = 3,
+ @SerializedName("knowledge_limit") val knowledgeLimit: Int = 10,
+ @SerializedName("file_upload_mb") val fileUploadMb: Int = 5,
+ val models: List? = null,
+ val features: List? = null
+)
+
+data class UserUsageDto(
+ @SerializedName("daily_used") val dailyUsed: Int = 0,
+ @SerializedName("daily_limit") val dailyLimit: Int = 50,
+ @SerializedName("daily_remaining") val dailyRemaining: Int = 50,
+ @SerializedName("is_exhausted") val isExhausted: Boolean = false
+)
+
+data class CreateOrderRequest(
+ @SerializedName("plan_id") val planId: String,
+ val period: String = "monthly",
+ @SerializedName("payment_method") val paymentMethod: String = "mock"
+)
+
+data class OrderResponseDto(
+ val id: String,
+ @SerializedName("plan_id") val planId: String? = null,
+ val amount: Double,
+ val period: String,
+ val status: String,
+ @SerializedName("payment_method") val paymentMethod: String? = null,
+ @SerializedName("payment_ref") val paymentRef: String? = null,
+ @SerializedName("created_at") val createdAt: String? = null,
+ @SerializedName("paid_at") val paidAt: String? = null
+)
+
+data class PayOrderResponse(
+ val success: Boolean = false,
+ val tier: String = "",
+ @SerializedName("expires_at") val expiresAt: String? = null,
+ val message: String = ""
+)
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/repository/AgentMarketRepository.kt b/android/app/src/main/java/com/tiangong/aiagent/data/repository/AgentMarketRepository.kt
new file mode 100644
index 0000000..9710d0d
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/repository/AgentMarketRepository.kt
@@ -0,0 +1,95 @@
+package com.tiangong.aiagent.data.repository
+
+import com.tiangong.aiagent.data.remote.ApiService
+import com.tiangong.aiagent.data.remote.dto.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AgentMarketRepository @Inject constructor(
+ private val apiService: ApiService
+) {
+ // ─── Market Browse ───
+
+ suspend fun browseAgents(
+ skip: Int = 0,
+ limit: Int = 20,
+ search: String? = null,
+ category: String? = null,
+ sortBy: String = "created_at",
+ featuredOnly: Boolean = false
+ ): Result> = runCatching {
+ apiService.browseMarket(skip, limit, search, category, sortBy, "desc", featuredOnly)
+ }
+
+ suspend fun getFeaturedAgents(limit: Int = 10): Result> = runCatching {
+ apiService.browseMarket(0, limit, featuredOnly = true, sortBy = "rating_avg")
+ }
+
+ suspend fun getAgentDetail(agentId: String): Result = runCatching {
+ apiService.getMarketAgentDetail(agentId)
+ }
+
+ // ─── Install ───
+
+ suspend fun installAgent(agentId: String): Result = runCatching {
+ apiService.installMarketAgent(agentId)
+ }
+
+ // ─── Rate ───
+
+ suspend fun rateAgent(agentId: String, rating: Int, comment: String? = null): Result = runCatching {
+ apiService.rateMarketAgent(agentId, RateAgentRequest(rating, comment))
+ }
+
+ // ─── Favorites ───
+
+ suspend fun favoriteAgent(agentId: String): Result = runCatching {
+ apiService.favoriteMarketAgent(agentId)
+ }
+
+ suspend fun unfavoriteAgent(agentId: String): Result = runCatching {
+ apiService.unfavoriteMarketAgent(agentId)
+ }
+
+ suspend fun getMyFavorites(skip: Int = 0, limit: Int = 20): Result> = runCatching {
+ apiService.getMyFavorites(skip, limit)
+ }
+
+ // ─── Categories ───
+
+ suspend fun getCategories(): Result> = runCatching {
+ apiService.getMarketCategories()
+ }
+
+ // ─── Templates ───
+
+ suspend fun browseTemplates(
+ skip: Int = 0,
+ limit: Int = 20,
+ search: String? = null,
+ category: String? = null
+ ): Result> = runCatching {
+ apiService.browseTemplates(skip, limit, search, category)
+ }
+
+ suspend fun useTemplate(templateId: String): Result = runCatching {
+ apiService.useTemplate(templateId)
+ }
+
+ // ─── Scene Templates ───
+
+ suspend fun getSceneTemplates(): Result> = runCatching {
+ apiService.getSceneTemplates()
+ }
+
+ suspend fun createFromSceneTemplate(
+ name: String,
+ description: String? = null,
+ sceneTemplateId: String? = null
+ ): Result = runCatching {
+ apiService.createFromSceneTemplate(
+ CreateFromTemplateRequest(name, description, sceneTemplateId)
+ )
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/repository/AuthRepository.kt b/android/app/src/main/java/com/tiangong/aiagent/data/repository/AuthRepository.kt
index 9e45a91..5866702 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/data/repository/AuthRepository.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/repository/AuthRepository.kt
@@ -1,12 +1,15 @@
package com.tiangong.aiagent.data.repository
+import android.content.Context
import com.tiangong.aiagent.data.local.CredentialStore
import com.tiangong.aiagent.data.local.TokenDataStore
import com.tiangong.aiagent.data.remote.ApiService
import com.tiangong.aiagent.data.remote.dto.LoginResponse
import com.tiangong.aiagent.data.remote.dto.RegisterRequest
import com.tiangong.aiagent.data.remote.dto.RegisterResponse
+import com.tiangong.aiagent.util.UmengHelper
import com.google.gson.JsonParser
+import dagger.hilt.android.qualifiers.ApplicationContext
import retrofit2.HttpException
import java.io.IOException
import javax.inject.Inject
@@ -17,7 +20,8 @@ class AuthRepository @Inject constructor(
private val apiService: ApiService,
private val tokenDataStore: TokenDataStore,
private val credentialStore: CredentialStore,
- private val authInterceptor: com.tiangong.aiagent.data.remote.AuthInterceptor
+ private val authInterceptor: com.tiangong.aiagent.data.remote.AuthInterceptor,
+ @ApplicationContext private val context: Context
) {
suspend fun login(username: String, password: String): Result {
@@ -30,6 +34,8 @@ class AuthRepository @Inject constructor(
credentialStore.saveCredentials(username, password)
// Update AuthInterceptor memory cache so subsequent requests carry the token
authInterceptor.updateToken(response.accessToken)
+ // Umeng: track user sign-in
+ UmengHelper.onProfileSignIn(username)
Result.success(response)
} catch (e: Exception) {
Result.failure(e)
@@ -99,6 +105,8 @@ class AuthRepository @Inject constructor(
tokenDataStore.clearAll()
credentialStore.clearCredentials()
authInterceptor.updateToken(null)
+ // Umeng: track user sign-out
+ UmengHelper.onProfileSignOff()
}
suspend fun getToken(): String? {
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/repository/BillingRepository.kt b/android/app/src/main/java/com/tiangong/aiagent/data/repository/BillingRepository.kt
new file mode 100644
index 0000000..f7fd8b3
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/repository/BillingRepository.kt
@@ -0,0 +1,35 @@
+package com.tiangong.aiagent.data.repository
+
+import com.tiangong.aiagent.data.remote.ApiService
+import com.tiangong.aiagent.data.remote.dto.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BillingRepository @Inject constructor(
+ private val apiService: ApiService
+) {
+ suspend fun getPlans(): Result> = runCatching {
+ apiService.getBillingPlans()
+ }
+
+ suspend fun getUserSubscription(): Result = runCatching {
+ apiService.getUserSubscription()
+ }
+
+ suspend fun getUserUsage(): Result = runCatching {
+ apiService.getUserUsage()
+ }
+
+ suspend fun createOrder(request: CreateOrderRequest): Result = runCatching {
+ apiService.createOrder(request)
+ }
+
+ suspend fun getOrder(orderId: String): Result = runCatching {
+ apiService.getOrder(orderId)
+ }
+
+ suspend fun payOrder(orderId: String): Result = runCatching {
+ apiService.payOrder(orderId)
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/data/repository/ChatRepository.kt b/android/app/src/main/java/com/tiangong/aiagent/data/repository/ChatRepository.kt
index d00df80..8f5be4e 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/data/repository/ChatRepository.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/data/repository/ChatRepository.kt
@@ -12,6 +12,8 @@ import com.tiangong.aiagent.data.remote.dto.MessageHistoryResponse
import com.tiangong.aiagent.data.remote.dto.MessageItemDto
import com.tiangong.aiagent.data.remote.dto.SessionListResponse
import com.tiangong.aiagent.data.remote.dto.SessionItemDto
+import com.tiangong.aiagent.data.remote.dto.SearchMessagesResponse
+import com.tiangong.aiagent.data.remote.dto.UpdateSessionRequest
import com.tiangong.aiagent.data.remote.dto.TtsRequest
import com.tiangong.aiagent.domain.model.Conversation
import com.tiangong.aiagent.domain.model.Message
@@ -101,7 +103,8 @@ class ChatRepository @Inject constructor(
title = title,
lastMessage = content.take(100),
lastMessageAt = now,
- messageCount = count
+ messageCount = count,
+ isPinned = existing?.isPinned ?: false
)
)
}
@@ -121,7 +124,8 @@ class ChatRepository @Inject constructor(
title = entity.title,
lastMessage = entity.lastMessage,
lastMessageAt = entity.lastMessageAt,
- messageCount = entity.messageCount
+ messageCount = entity.messageCount,
+ isPinned = entity.isPinned
)
}
}
@@ -129,18 +133,20 @@ class ChatRepository @Inject constructor(
private suspend fun saveMessagesFromResponse(response: ChatResponse, agentId: String?) {
val conversationId = response.sessionId ?: return
val now = System.currentTimeMillis()
+ val existing = database.conversationDao().getById(conversationId)
- // Save conversation
- val title = response.steps.firstOrNull()?.content?.take(50) ?: "New Chat"
+ // Save conversation (preserve existing pinned state and title if present)
+ val title = existing?.title ?: (response.steps.firstOrNull()?.content?.take(50) ?: "New Chat")
database.conversationDao().insert(
ConversationEntity(
sessionId = conversationId,
- agentId = agentId,
- agentName = null,
+ agentId = agentId ?: existing?.agentId,
+ agentName = existing?.agentName,
title = title,
lastMessage = response.content.take(100),
lastMessageAt = now,
- messageCount = response.steps.size
+ messageCount = response.steps.size,
+ isPinned = existing?.isPinned ?: false
)
)
@@ -176,7 +182,8 @@ class ChatRepository @Inject constructor(
title = entity.title,
lastMessage = entity.lastMessage,
lastMessageAt = entity.lastMessageAt,
- messageCount = entity.messageCount
+ messageCount = entity.messageCount,
+ isPinned = entity.isPinned
)
}
}
@@ -204,15 +211,72 @@ class ChatRepository @Inject constructor(
}
}
- // v1.2.0: Update conversation title
+ // v1.2.0: Update conversation title (with server sync)
suspend fun updateConversationTitle(sessionId: String, newTitle: String) {
val entity = database.conversationDao().getById(sessionId) ?: return
database.conversationDao().update(entity.copy(title = newTitle))
+ // Sync to server
+ val agentId = entity.agentId
+ if (agentId != null) {
+ try {
+ apiService.updateSession(agentId, sessionId, UpdateSessionRequest(title = newTitle))
+ } catch (e: Exception) {
+ // Server sync is best-effort
+ }
+ }
}
suspend fun deleteConversation(sessionId: String) {
+ val entity = database.conversationDao().getById(sessionId)
database.messageDao().deleteByConversation(sessionId)
database.conversationDao().deleteById(sessionId)
+ // Sync to server
+ val agentId = entity?.agentId
+ if (agentId != null) {
+ try {
+ apiService.deleteSession(agentId, sessionId)
+ } catch (e: Exception) {
+ // Server sync is best-effort
+ }
+ }
+ }
+
+ // v1.1.0: Pin/unpin conversation (with server sync)
+ suspend fun pinConversation(sessionId: String, isPinned: Boolean) {
+ database.conversationDao().updatePinStatus(sessionId, isPinned)
+ val entity = database.conversationDao().getById(sessionId) ?: return
+ val agentId = entity.agentId
+ if (agentId != null) {
+ try {
+ apiService.updateSession(agentId, sessionId, UpdateSessionRequest(isPinned = isPinned))
+ } catch (e: Exception) {
+ // Server sync is best-effort
+ }
+ }
+ }
+
+ // Sync pin/rename state from server sessions list to local Room
+ suspend fun syncSessionStateFromServer(agentId: String) {
+ try {
+ val result = apiService.getAgentSessions(agentId, limit = 200)
+ for (dto in result.sessions) {
+ val local = database.conversationDao().getById(dto.sessionId)
+ if (local != null) {
+ val needsUpdate = (dto.isPinned != local.isPinned) ||
+ (dto.title != null && dto.title != local.title)
+ if (needsUpdate) {
+ database.conversationDao().insert(
+ local.copy(
+ title = dto.title ?: local.title,
+ isPinned = dto.isPinned
+ )
+ )
+ }
+ }
+ }
+ } catch (e: Exception) {
+ // Best-effort sync
+ }
}
// ─── Media operations (v1.2.0: moved from ChatViewModel to repository layer) ───
@@ -386,6 +450,15 @@ class ChatRepository @Inject constructor(
)
}
+ suspend fun searchMessages(agentId: String, query: String): Result {
+ return try {
+ val response = apiService.searchMessages(agentId, query)
+ Result.success(response)
+ } catch (e: Exception) {
+ Result.failure(e)
+ }
+ }
+
companion object {
fun parseIso8601ToEpoch(isoString: String): Long {
return try {
diff --git a/android/app/src/main/java/com/tiangong/aiagent/di/AppModule.kt b/android/app/src/main/java/com/tiangong/aiagent/di/AppModule.kt
index f3ef5b7..e4145a3 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/di/AppModule.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/di/AppModule.kt
@@ -133,6 +133,12 @@ object AppModule {
}
}
+ private val MIGRATION_3_4 = object : Migration(3, 4) {
+ override fun migrate(db: SupportSQLiteDatabase) {
+ db.execSQL("ALTER TABLE conversations ADD COLUMN isPinned INTEGER NOT NULL DEFAULT 0")
+ }
+ }
+
@Provides
@Singleton
fun provideRoomDatabase(@ApplicationContext context: Context): AppDatabase {
@@ -141,7 +147,7 @@ object AppModule {
AppDatabase::class.java,
"tiangong_db"
)
- .addMigrations(MIGRATION_1_2, MIGRATION_2_3)
+ .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4)
.build()
}
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/domain/model/Conversation.kt b/android/app/src/main/java/com/tiangong/aiagent/domain/model/Conversation.kt
index a34e978..2795f13 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/domain/model/Conversation.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/domain/model/Conversation.kt
@@ -7,5 +7,6 @@ data class Conversation(
val title: String? = null,
val lastMessage: String? = null,
val lastMessageAt: Long = System.currentTimeMillis(),
- val messageCount: Int = 0
+ val messageCount: Int = 0,
+ val isPinned: Boolean = false
)
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/agents/AgentListScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/agents/AgentListScreen.kt
index f749a3e..541a989 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/ui/agents/AgentListScreen.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/agents/AgentListScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Store
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
@@ -17,6 +18,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.tiangong.aiagent.ui.common.SkeletonAgentList
+import com.tiangong.aiagent.util.AnalyticsViewModel
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -24,10 +26,12 @@ fun AgentListScreen(
onBack: () -> Unit,
onAgentSelected: (com.tiangong.aiagent.domain.model.Agent) -> Unit,
onManageMemory: (agentId: String, agentName: String) -> Unit = { _, _ -> },
+ onNavigateToMarket: () -> Unit = {},
viewModel: AgentListViewModel = hiltViewModel()
) {
val uiState by viewModel.uiState.collectAsState()
var showCreateDialog by remember { mutableStateOf(false) }
+ val analyticsVM: AnalyticsViewModel = hiltViewModel()
Scaffold(
topBar = {
@@ -60,6 +64,18 @@ fun AgentListScreen(
.fillMaxSize()
.padding(paddingValues)
) {
+ // Market entry
+ OutlinedButton(
+ onClick = onNavigateToMarket,
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 4.dp)
+ ) {
+ Icon(Icons.Default.Store, contentDescription = null, modifier = Modifier.size(18.dp))
+ Spacer(modifier = Modifier.width(8.dp))
+ Text("探索 Agent 市场")
+ }
+
// Search bar
OutlinedTextField(
value = uiState.searchQuery,
@@ -114,7 +130,10 @@ fun AgentListScreen(
Box {
AgentListItem(
agent = agent,
- onClick = { onAgentSelected(agent) },
+ onClick = {
+ analyticsVM.tracker.trackEvent("agent", "agent_switch", agentId = agent.id)
+ onAgentSelected(agent)
+ },
onLongClick = { showMenu = true }
)
DropdownMenu(
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatScreen.kt
index 1c5cda1..560e5b1 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatScreen.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatScreen.kt
@@ -3,6 +3,7 @@ package com.tiangong.aiagent.ui.chat
import android.net.Uri
import android.util.Log
import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
@@ -34,6 +35,7 @@ import com.tiangong.aiagent.ui.chat.components.ToolCallCard
import com.tiangong.aiagent.ui.chat.components.VoiceInputButton
import com.tiangong.aiagent.ui.common.SkeletonChat
import kotlinx.coroutines.launch
+import java.io.File
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -52,6 +54,19 @@ fun ChatScreen(
var firstLoaded by remember { mutableStateOf(false) }
var isOffline by remember { mutableStateOf(false) }
+ // Draft save per agent
+ val drafts = remember { mutableStateMapOf() }
+ var previousAgentId by remember { mutableStateOf(null) }
+ val currentAgentId = uiState.currentAgent?.id
+ // On agent switch: save previous draft, restore new
+ if (previousAgentId != currentAgentId) {
+ if (previousAgentId != null) {
+ drafts[previousAgentId!!] = inputText
+ }
+ inputText = drafts[currentAgentId] ?: ""
+ previousAgentId = currentAgentId
+ }
+
// Drawer state
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
@@ -112,29 +127,36 @@ fun ChatScreen(
val context = androidx.compose.ui.platform.LocalContext.current
- // Image picker
+ // Image picker (multi-select, max 9)
val imagePickerLauncher = rememberLauncherForActivityResult(
- contract = ActivityResultContracts.GetContent()
- ) { uri: Uri? ->
- uri?.let { selectedUri ->
+ contract = ActivityResultContracts.PickMultipleVisualMedia(maxItems = 9)
+ ) { uris: List ->
+ if (uris.isNotEmpty()) {
scope.launch {
+ val files = mutableListOf()
try {
- val inputStream = context.contentResolver.openInputStream(selectedUri)
- val ext = context.contentResolver.getType(selectedUri)?.let { mime ->
- when {
- mime.contains("png") -> ".png"
- mime.contains("gif") -> ".gif"
- mime.contains("webp") -> ".webp"
- else -> ".jpg"
+ for ((index, uri) in uris.withIndex()) {
+ val inputStream = context.contentResolver.openInputStream(uri)
+ val ext = context.contentResolver.getType(uri)?.let { mime ->
+ when {
+ mime.contains("png") -> ".png"
+ mime.contains("gif") -> ".gif"
+ mime.contains("webp") -> ".webp"
+ else -> ".jpg"
+ }
+ } ?: ".jpg"
+ val tempFile = File(context.cacheDir, "upload_${System.currentTimeMillis()}_$index$ext")
+ inputStream?.use { input ->
+ tempFile.outputStream().use { output -> input.copyTo(output) }
}
- } ?: ".jpg"
- val tempFile = java.io.File(context.cacheDir, "upload_${System.currentTimeMillis()}$ext")
- inputStream?.use { input ->
- tempFile.outputStream().use { output -> input.copyTo(output) }
+ files.add(tempFile)
+ }
+ if (files.isNotEmpty()) {
+ viewModel.uploadImages(files)
}
- viewModel.uploadImage(tempFile)
} catch (e: Exception) {
Log.e("ChatScreen", "Image selection failed", e)
+ files.forEach { it.delete() }
}
}
}
@@ -257,7 +279,7 @@ fun ChatScreen(
onRecordingStopped = { viewModel.onRecordingStopped() }
)
IconButton(
- onClick = { imagePickerLauncher.launch("image/*") },
+ onClick = { imagePickerLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)) },
modifier = Modifier.size(40.dp)
) {
Icon(Icons.Default.Add, contentDescription = "添加附件",
@@ -266,18 +288,21 @@ fun ChatScreen(
}
OutlinedTextField(
value = inputText,
- onValueChange = { if (it.length <= 200) inputText = it },
+ onValueChange = { if (it.length <= 2000) inputText = it },
placeholder = {
- Text(if (uiState.editingMessageId != null) "编辑消息..." else "输入消息...")
+ Text(
+ if (uiState.editingMessageId != null) "编辑消息..."
+ else "给 ${uiState.currentAgent?.name ?: "AI"} 发送消息..."
+ )
},
modifier = Modifier.weight(1f),
maxLines = 8,
enabled = !uiState.isLoading && !uiState.isStreaming,
supportingText = {
Text(
- "${inputText.length}/200",
+ "${inputText.length}/2000",
style = MaterialTheme.typography.bodySmall,
- color = if (inputText.length >= 200)
+ color = if (inputText.length >= 1800)
MaterialTheme.colorScheme.error
else
MaterialTheme.colorScheme.onSurfaceVariant
@@ -533,7 +558,16 @@ fun ChatScreen(
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.height(16.dp))
- val suggestions = listOf("介绍一下你自己", "你能帮我做什么?", "给我讲个笑话")
+ val agent = uiState.currentAgent
+ val suggestions = if (agent != null) {
+ listOf(
+ "介绍一下你自己",
+ "你能帮我做什么?",
+ "用你的能力帮我完成一个任务"
+ )
+ } else {
+ listOf("介绍一下你自己", "你能帮我做什么?", "给我讲个笑话")
+ }
suggestions.forEach { suggestion ->
OutlinedButton(
onClick = { viewModel.sendMessage(suggestion) },
@@ -602,6 +636,27 @@ fun ChatScreen(
tint = MaterialTheme.colorScheme.onSurfaceVariant
)
}
+ // Share
+ val shareContext = androidx.compose.ui.platform.LocalContext.current
+ IconButton(
+ onClick = {
+ val shareIntent = android.content.Intent(android.content.Intent.ACTION_SEND).apply {
+ type = "text/plain"
+ putExtra(android.content.Intent.EXTRA_TEXT, message.content)
+ }
+ shareContext.startActivity(
+ android.content.Intent.createChooser(shareIntent, "分享消息")
+ )
+ },
+ modifier = Modifier.size(28.dp)
+ ) {
+ Icon(
+ imageVector = Icons.Default.Share,
+ contentDescription = "分享",
+ modifier = Modifier.size(15.dp),
+ tint = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
// Read aloud
IconButton(
onClick = { viewModel.speakText(message.content) },
@@ -673,7 +728,50 @@ fun ChatScreen(
}
}
} else {
- MessageBubbleFromUi(message = message)
+ // User message: show bubble with copy & share actions
+ val clipboardManager = LocalClipboardManager.current
+ Column {
+ MessageBubbleFromUi(message = message)
+ Row(
+ modifier = Modifier.padding(end = 16.dp, bottom = 4.dp),
+ horizontalArrangement = Arrangement.End,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ // Copy
+ IconButton(
+ onClick = { clipboardManager.setText(AnnotatedString(message.content)) },
+ modifier = Modifier.size(28.dp)
+ ) {
+ Icon(
+ imageVector = Icons.Default.ContentCopy,
+ contentDescription = "复制",
+ modifier = Modifier.size(15.dp),
+ tint = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ // Share
+ val shareContext = androidx.compose.ui.platform.LocalContext.current
+ IconButton(
+ onClick = {
+ val shareIntent = android.content.Intent(android.content.Intent.ACTION_SEND).apply {
+ type = "text/plain"
+ putExtra(android.content.Intent.EXTRA_TEXT, message.content)
+ }
+ shareContext.startActivity(
+ android.content.Intent.createChooser(shareIntent, "分享消息")
+ )
+ },
+ modifier = Modifier.size(28.dp)
+ ) {
+ Icon(
+ imageVector = Icons.Default.Share,
+ contentDescription = "分享",
+ modifier = Modifier.size(15.dp),
+ tint = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ }
+ }
}
}
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatViewModel.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatViewModel.kt
index 768abad..eade082 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatViewModel.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/chat/ChatViewModel.kt
@@ -20,6 +20,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
+import com.tiangong.aiagent.util.AnalyticsTracker
import java.io.File
import java.util.UUID
import javax.inject.Inject
@@ -114,6 +115,7 @@ class ChatViewModel @Inject constructor(
private val audioPlayer: AudioPlayer,
private val tokenDataStore: TokenDataStore,
private val savedStateHandle: SavedStateHandle,
+ private val analyticsTracker: AnalyticsTracker,
private val gson: Gson,
private val networkMonitor: com.tiangong.aiagent.util.NetworkMonitor,
private val offlineQueueManager: OfflineQueueManager
@@ -429,6 +431,9 @@ class ChatViewModel @Inject constructor(
val agentId = _uiState.value.currentAgent?.id
val sessionId = _uiState.value.sessionId ?: UUID.randomUUID().toString()
+ // Analytics: track message send
+ analyticsTracker.trackEvent("chat", "message_send", agentId = agentId)
+
// v1.2.0: Queue message when offline
if (_uiState.value.isOffline) {
val userMsg = UiMessage(
@@ -768,6 +773,27 @@ class ChatViewModel @Inject constructor(
}
}
+ fun uploadImages(files: List) {
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(isTranscribing = true)
+ val results = mutableListOf()
+ for (file in files) {
+ chatRepository.uploadImage(file)
+ .onSuccess { markdownUrl -> results.add(markdownUrl) }
+ .onFailure { e ->
+ Log.e("ChatViewModel", "Image upload failed: ${file.name}", e)
+ }
+ file.delete()
+ }
+ if (results.isNotEmpty()) {
+ _uiState.value = _uiState.value.copy(transcribedText = results.joinToString(" "))
+ } else {
+ _uiState.value = _uiState.value.copy(error = "图片上传失败")
+ }
+ _uiState.value = _uiState.value.copy(isTranscribing = false)
+ }
+ }
+
fun clearTranscribedText() {
_uiState.value = _uiState.value.copy(transcribedText = null)
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/common/ZoomableImage.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/common/ZoomableImage.kt
new file mode 100644
index 0000000..66f0b8b
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/common/ZoomableImage.kt
@@ -0,0 +1,126 @@
+package com.tiangong.aiagent.ui.common
+
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.gestures.detectTransformGestures
+import androidx.compose.foundation.layout.Box
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.ContentScale
+import coil.compose.AsyncImage
+import coil.request.ImageRequest
+import androidx.compose.ui.platform.LocalContext
+
+/**
+ * A zoomable, pannable image viewer — Compose equivalent of the PhotoView
+ * pattern used in zhini_im (Chris Banes' PhotoView).
+ *
+ * Supports:
+ * - Pinch-to-zoom (1x ~ 5x)
+ * - Pan when zoomed in
+ * - Double-tap to toggle between 1x and 3x
+ * - Tap to dismiss callback
+ */
+@Composable
+fun ZoomableImage(
+ imageUrl: String,
+ modifier: Modifier = Modifier,
+ contentDescription: String? = null,
+ onTap: (() -> Unit)? = null
+) {
+ var scale by remember { mutableFloatStateOf(1f) }
+ var offsetX by remember { mutableFloatStateOf(0f) }
+ var offsetY by remember { mutableFloatStateOf(0f) }
+
+ fun resetZoom() {
+ scale = 1f
+ offsetX = 0f
+ offsetY = 0f
+ }
+
+ Box(
+ modifier = modifier,
+ contentAlignment = Alignment.Center
+ ) {
+ AsyncImage(
+ model = ImageRequest.Builder(LocalContext.current)
+ .data(imageUrl)
+ .crossfade(true)
+ .build(),
+ contentDescription = contentDescription,
+ contentScale = ContentScale.Fit,
+ modifier = Modifier
+ .matchParentSize()
+ .graphicsLayer(
+ scaleX = scale.coerceIn(0.5f, 5f),
+ scaleY = scale.coerceIn(0.5f, 5f),
+ translationX = offsetX,
+ translationY = offsetY
+ )
+ .pointerInput(Unit) {
+ detectTransformGestures { centroid, pan, zoom, _ ->
+ val newScale = (scale * zoom).coerceIn(0.5f, 5f)
+ scale = newScale
+
+ if (newScale > 1f) {
+ // Pan when zoomed in
+ offsetX += pan.x
+ offsetY += pan.y
+ } else {
+ offsetX = 0f
+ offsetY = 0f
+ }
+ }
+ }
+ .pointerInput(Unit) {
+ detectTapGestures(
+ onDoubleTap = {
+ if (scale > 1.5f) {
+ resetZoom()
+ } else {
+ scale = 3f
+ }
+ },
+ onTap = {
+ if (scale <= 1.1f) {
+ onTap?.invoke()
+ } else {
+ resetZoom()
+ }
+ }
+ )
+ }
+ )
+ }
+}
+
+/**
+ * Full-screen zoomable image viewer with dark background and tap-to-dismiss.
+ * Equivalent to zhini_im's ImagePreviewActivity.
+ */
+@Composable
+fun FullScreenImageViewer(
+ imageUrl: String,
+ onDismiss: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Box(
+ modifier = modifier
+ .graphicsLayer { alpha = 0.95f }
+ .pointerInput(Unit) {
+ // Simple tap on background to dismiss
+ detectTapGestures(
+ onTap = { onDismiss() }
+ )
+ },
+ contentAlignment = Alignment.Center
+ ) {
+ ZoomableImage(
+ imageUrl = imageUrl,
+ onTap = onDismiss
+ )
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/history/ConversationListScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/history/ConversationListScreen.kt
index 6a6c58a..8fad36a 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/ui/history/ConversationListScreen.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/history/ConversationListScreen.kt
@@ -72,6 +72,10 @@ class ConversationListViewModel @Inject constructor(
loadJob?.cancel()
loadJob = viewModelScope.launch {
_uiState.value = _uiState.value.copy(isLoading = true)
+ // Sync session state from server (pin/rename)
+ if (agentId != null) {
+ chatRepository.syncSessionStateFromServer(agentId)
+ }
chatRepository.getConversations().collect { conversations ->
val filtered = if (agentId != null) {
conversations.filter { it.agentId == agentId }
@@ -121,6 +125,13 @@ class ConversationListViewModel @Inject constructor(
chatRepository.updateConversationTitle(sessionId, newTitle)
}
}
+
+ // v1.1.0: Pin/unpin conversation
+ fun pinConversation(sessionId: String, isPinned: Boolean) {
+ viewModelScope.launch {
+ chatRepository.pinConversation(sessionId, isPinned)
+ }
+ }
}
@OptIn(ExperimentalMaterial3Api::class)
@@ -232,6 +243,9 @@ fun ConversationListScreen(
onDelete = { viewModel.deleteConversation(conversation.sessionId) },
onRename = { newTitle ->
viewModel.renameConversation(conversation.sessionId, newTitle)
+ },
+ onPin = {
+ viewModel.pinConversation(conversation.sessionId, !conversation.isPinned)
}
)
}
@@ -247,7 +261,8 @@ fun ConversationListItem(
conversation: Conversation,
onClick: () -> Unit,
onDelete: () -> Unit,
- onRename: (String) -> Unit = {}
+ onRename: (String) -> Unit = {},
+ onPin: () -> Unit = {}
) {
var showDeleteDialog by remember { mutableStateOf(false) }
var showRenameDialog by remember { mutableStateOf(false) }
@@ -286,13 +301,24 @@ fun ConversationListItem(
Spacer(modifier = Modifier.width(12.dp))
Column(modifier = Modifier.weight(1f)) {
- Text(
- text = conversation.title ?: "新对话",
- style = MaterialTheme.typography.titleSmall,
- fontWeight = FontWeight.Medium,
- maxLines = 1,
- overflow = TextOverflow.Ellipsis
- )
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ if (conversation.isPinned) {
+ Icon(
+ imageVector = Icons.Default.PushPin,
+ contentDescription = "已置顶",
+ modifier = Modifier.size(14.dp),
+ tint = MaterialTheme.colorScheme.primary
+ )
+ Spacer(modifier = Modifier.width(4.dp))
+ }
+ Text(
+ text = conversation.title ?: "新对话",
+ style = MaterialTheme.typography.titleSmall,
+ fontWeight = FontWeight.Medium,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
if (conversation.lastMessage != null) {
Spacer(modifier = Modifier.height(2.dp))
Text(
@@ -342,6 +368,20 @@ fun ConversationListItem(
Icon(Icons.Default.Create, contentDescription = null, modifier = Modifier.size(18.dp))
}
)
+ DropdownMenuItem(
+ text = { Text(if (conversation.isPinned) "取消置顶" else "置顶") },
+ onClick = {
+ showMenu = false
+ onPin()
+ },
+ leadingIcon = {
+ Icon(
+ Icons.Default.PushPin,
+ contentDescription = null,
+ modifier = Modifier.size(18.dp)
+ )
+ }
+ )
DropdownMenuItem(
text = { Text("删除", color = MaterialTheme.colorScheme.error) },
onClick = {
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/login/LoginScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/login/LoginScreen.kt
index 1efb9af..44199bc 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/ui/login/LoginScreen.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/login/LoginScreen.kt
@@ -1,8 +1,12 @@
package com.tiangong.aiagent.ui.login
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.Visibility
@@ -11,6 +15,7 @@ import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.font.FontWeight
@@ -20,15 +25,23 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat.startActivity
import android.content.Intent
import android.net.Uri
import androidx.hilt.navigation.compose.hiltViewModel
+import com.tiangong.aiagent.util.AnalyticsViewModel
+
+// ── zhini_im inspired colors ──────────────────────────────────────────────
+private val ZhiNiBg = Color(0xFFF5F7FA)
+private val ZhiNiBlue = Color(0xFF3B62E0)
+private val ZhiNiTextPrimary = Color(0xFF1A193E)
+private val ZhiNiTextHint = Color(0xFFABB1C1)
+private val ZhiNiDivider = Color(0xFFE8E8E8)
@Composable
fun LoginScreen(
onLoginSuccess: () -> Unit,
onNavigateToRegister: () -> Unit = {},
+ onNavigateToPhoneLogin: () -> Unit = {},
viewModel: LoginViewModel = hiltViewModel()
) {
val uiState by viewModel.uiState.collectAsState()
@@ -36,44 +49,39 @@ fun LoginScreen(
var passwordVisible by remember { mutableStateOf(false) }
var isEditingUrl by remember { mutableStateOf(false) }
var editedUrl by remember { mutableStateOf("") }
+ val analyticsVM: AnalyticsViewModel = hiltViewModel()
LaunchedEffect(uiState.isLoggedIn) {
if (uiState.isLoggedIn) {
+ analyticsVM.tracker.trackEvent("auth", "login_success")
onLoginSuccess()
}
}
Surface(
modifier = Modifier.fillMaxSize(),
- color = MaterialTheme.colorScheme.background
+ color = ZhiNiBg
) {
Column(
modifier = Modifier
.fillMaxSize()
- .padding(horizontal = 32.dp),
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.Center
+ .verticalScroll(rememberScrollState())
+ .padding(horizontal = 24.dp),
+ horizontalAlignment = Alignment.Start
) {
+ Spacer(modifier = Modifier.height(100.dp))
+
+ // ── Title ─────────────────────────────────────────────────────
Text(
- text = "天工智能体",
- style = MaterialTheme.typography.headlineLarge.copy(
- fontWeight = FontWeight.Bold,
- fontSize = 28.sp
- ),
- color = MaterialTheme.colorScheme.primary
+ text = "密码登录",
+ fontSize = 26.sp,
+ fontWeight = FontWeight.Bold,
+ color = ZhiNiTextPrimary
)
- Spacer(modifier = Modifier.height(8.dp))
+ Spacer(modifier = Modifier.height(32.dp))
- Text(
- text = "AI Agent Platform",
- style = MaterialTheme.typography.bodyMedium,
- color = MaterialTheme.colorScheme.onSurfaceVariant
- )
-
- Spacer(modifier = Modifier.height(36.dp))
-
- // Server URL
+ // ── Server URL (compact, tap to edit) ─────────────────────────
if (isEditingUrl) {
// Preset quick-select buttons
Row(
@@ -82,42 +90,29 @@ fun LoginScreen(
) {
val isLocalSelected = editedUrl == "http://192.168.31.135:8037"
val isCloudSelected = editedUrl == "http://101.43.95.130:8037"
- OutlinedButton(
+ FilterChip(
+ selected = isLocalSelected,
onClick = { editedUrl = "http://192.168.31.135:8037" },
- colors = if (isLocalSelected) {
- ButtonDefaults.outlinedButtonColors(
- containerColor = MaterialTheme.colorScheme.primaryContainer
- )
- } else {
- ButtonDefaults.outlinedButtonColors()
- }
- ) {
- Text("本地")
- }
- OutlinedButton(
+ label = { Text("本地") },
+ enabled = !uiState.isLoading
+ )
+ FilterChip(
+ selected = isCloudSelected,
onClick = { editedUrl = "http://101.43.95.130:8037" },
- colors = if (isCloudSelected) {
- ButtonDefaults.outlinedButtonColors(
- containerColor = MaterialTheme.colorScheme.primaryContainer
- )
- } else {
- ButtonDefaults.outlinedButtonColors()
- }
- ) {
- Text("云服务")
- }
+ label = { Text("云服务") },
+ enabled = !uiState.isLoading
+ )
}
Spacer(modifier = Modifier.height(8.dp))
OutlinedTextField(
value = editedUrl,
onValueChange = { editedUrl = it },
- label = { Text("服务器地址") },
placeholder = { Text("http://101.43.95.130:8037") },
singleLine = true,
modifier = Modifier.fillMaxWidth(),
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
enabled = !uiState.isLoading,
- supportingText = { Text("点击上方快捷选择，或手动输入后保存") }
+ textStyle = MaterialTheme.typography.bodySmall
)
Row(
modifier = Modifier.fillMaxWidth(),
@@ -126,9 +121,7 @@ fun LoginScreen(
TextButton(
onClick = { isEditingUrl = false },
enabled = !uiState.isLoading
- ) {
- Text("取消")
- }
+ ) { Text("取消") }
Spacer(modifier = Modifier.width(8.dp))
TextButton(
onClick = {
@@ -136,78 +129,112 @@ fun LoginScreen(
isEditingUrl = false
},
enabled = !uiState.isLoading
- ) {
- Text("保存")
- }
+ ) { Text("保存") }
}
} else {
- TextButton(
- onClick = {
- editedUrl = uiState.serverUrl
- isEditingUrl = true
- },
- enabled = !uiState.isLoading,
- modifier = Modifier.fillMaxWidth()
- ) {
- Icon(
- imageVector = Icons.Default.Settings,
- contentDescription = null,
- modifier = Modifier.size(16.dp)
- )
- Spacer(modifier = Modifier.width(4.dp))
- Text(
- text = if (uiState.serverUrl.isNotBlank()) uiState.serverUrl else "点击配置服务器地址",
- style = MaterialTheme.typography.bodySmall,
- maxLines = 1
+ Text(
+ text = if (uiState.serverUrl.isNotBlank()) uiState.serverUrl else "点击配置服务器地址",
+ style = MaterialTheme.typography.bodySmall,
+ color = ZhiNiTextHint,
+ modifier = Modifier
+ .clickable(enabled = !uiState.isLoading) {
+ editedUrl = uiState.serverUrl
+ isEditingUrl = true
+ }
+ .padding(vertical = 4.dp)
+ )
+ }
+
+ Spacer(modifier = Modifier.height(24.dp))
+
+ // ── Username field ────────────────────────────────────────────
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = "用户名",
+ fontSize = 16.sp,
+ color = ZhiNiTextPrimary
+ )
+ Spacer(modifier = Modifier.width(16.dp))
+ Box(modifier = Modifier.weight(1f)) {
+ if (uiState.username.isEmpty()) {
+ Text(
+ text = "请输入用户名",
+ fontSize = 15.sp,
+ color = ZhiNiTextHint,
+ modifier = Modifier.align(Alignment.CenterStart)
+ )
+ }
+ TextField(
+ value = uiState.username,
+ onValueChange = viewModel::onUsernameChange,
+ singleLine = true,
+ modifier = Modifier.fillMaxWidth(),
+ colors = zhiniTextFieldColors(),
+ keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
+ enabled = !uiState.isLoading
)
}
}
+ HorizontalDivider(color = if (uiState.username.isNotEmpty()) ZhiNiBlue else ZhiNiDivider, thickness = 1.dp)
- Spacer(modifier = Modifier.height(8.dp))
+ Spacer(modifier = Modifier.height(24.dp))
- // Username
- OutlinedTextField(
- value = uiState.username,
- onValueChange = viewModel::onUsernameChange,
- label = { Text("用户名") },
- singleLine = true,
+ // ── Password field ────────────────────────────────────────────
+ Row(
modifier = Modifier.fillMaxWidth(),
- keyboardOptions = KeyboardOptions(imeAction = ImeAction.Next),
- enabled = !uiState.isLoading
- )
-
- Spacer(modifier = Modifier.height(16.dp))
-
- // Password
- OutlinedTextField(
- value = uiState.password,
- onValueChange = viewModel::onPasswordChange,
- label = { Text("密码") },
- singleLine = true,
- modifier = Modifier.fillMaxWidth(),
- visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
- trailingIcon = {
- IconButton(onClick = { passwordVisible = !passwordVisible }) {
- Icon(
- imageVector = if (passwordVisible) Icons.Default.VisibilityOff else Icons.Default.Visibility,
- contentDescription = if (passwordVisible) "隐藏密码" else "显示密码"
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(
+ text = "密 码",
+ fontSize = 16.sp,
+ color = ZhiNiTextPrimary
+ )
+ Spacer(modifier = Modifier.width(16.dp))
+ Box(modifier = Modifier.weight(1f)) {
+ if (uiState.password.isEmpty()) {
+ Text(
+ text = "请输入密码",
+ fontSize = 15.sp,
+ color = ZhiNiTextHint,
+ modifier = Modifier.align(Alignment.CenterStart)
)
}
- },
- keyboardOptions = KeyboardOptions(
- keyboardType = KeyboardType.Password,
- imeAction = ImeAction.Done
- ),
- keyboardActions = KeyboardActions(
- onDone = {
- focusManager.clearFocus()
- viewModel.login()
- }
- ),
- enabled = !uiState.isLoading
- )
+ TextField(
+ value = uiState.password,
+ onValueChange = viewModel::onPasswordChange,
+ singleLine = true,
+ modifier = Modifier.fillMaxWidth(),
+ colors = zhiniTextFieldColors(),
+ visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
+ trailingIcon = {
+ IconButton(onClick = { passwordVisible = !passwordVisible }) {
+ Icon(
+ imageVector = if (passwordVisible) Icons.Default.VisibilityOff else Icons.Default.Visibility,
+ contentDescription = if (passwordVisible) "隐藏密码" else "显示密码",
+ tint = ZhiNiTextHint
+ )
+ }
+ },
+ keyboardOptions = KeyboardOptions(
+ keyboardType = KeyboardType.Password,
+ imeAction = ImeAction.Done
+ ),
+ keyboardActions = KeyboardActions(
+ onDone = {
+ focusManager.clearFocus()
+ if (uiState.agreedTerms) viewModel.login()
+ }
+ ),
+ enabled = !uiState.isLoading
+ )
+ }
+ }
+ HorizontalDivider(color = if (uiState.password.isNotEmpty()) ZhiNiBlue else ZhiNiDivider, thickness = 1.dp)
- // Error
+ // ── Error message ─────────────────────────────────────────────
uiState.error?.let { errorText ->
Spacer(modifier = Modifier.height(12.dp))
Text(
@@ -217,9 +244,30 @@ fun LoginScreen(
)
}
- Spacer(modifier = Modifier.height(16.dp))
+ Spacer(modifier = Modifier.height(20.dp))
- // Agreement checkbox
+ // ── Links row: phone login + register ─────────────────────────
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween
+ ) {
+ Text(
+ text = "使用验证码登录",
+ color = ZhiNiBlue,
+ fontSize = 14.sp,
+ modifier = Modifier.clickable(enabled = !uiState.isLoading) { onNavigateToPhoneLogin() }
+ )
+ Text(
+ text = "注册",
+ color = ZhiNiBlue,
+ fontSize = 14.sp,
+ modifier = Modifier.clickable(enabled = !uiState.isLoading) { onNavigateToRegister() }
+ )
+ }
+
+ Spacer(modifier = Modifier.height(40.dp))
+
+ // ── Agreement checkbox ────────────────────────────────────────
val context = LocalContext.current
Row(
modifier = Modifier.fillMaxWidth(),
@@ -228,33 +276,40 @@ fun LoginScreen(
Checkbox(
checked = uiState.agreedTerms,
onCheckedChange = viewModel::onAgreedTermsChanged,
- enabled = !uiState.isLoading
+ enabled = !uiState.isLoading,
+ colors = CheckboxDefaults.colors(checkedColor = ZhiNiBlue)
+ )
+ Text(
+ text = "我已阅读并同意",
+ style = MaterialTheme.typography.bodySmall,
+ color = ZhiNiTextHint
+ )
+ Text(
+ text = "《隐私政策》",
+ style = MaterialTheme.typography.bodySmall,
+ color = ZhiNiBlue,
+ modifier = Modifier.clickable {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/privacy")))
+ }
+ )
+ Text(
+ text = "和",
+ style = MaterialTheme.typography.bodySmall,
+ color = ZhiNiTextHint
+ )
+ Text(
+ text = "《用户协议》",
+ style = MaterialTheme.typography.bodySmall,
+ color = ZhiNiBlue,
+ modifier = Modifier.clickable {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/terms")))
+ }
)
- Text("我已阅读并同意", style = MaterialTheme.typography.bodySmall)
- TextButton(
- onClick = {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/privacy"))
- context.startActivity(intent)
- },
- contentPadding = PaddingValues(horizontal = 2.dp)
- ) {
- Text("《隐私政策》", style = MaterialTheme.typography.bodySmall)
- }
- Text("和", style = MaterialTheme.typography.bodySmall)
- TextButton(
- onClick = {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/terms"))
- context.startActivity(intent)
- },
- contentPadding = PaddingValues(horizontal = 2.dp)
- ) {
- Text("《用户协议》", style = MaterialTheme.typography.bodySmall)
- }
}
Spacer(modifier = Modifier.height(16.dp))
- // Login button
+ // ── Login button ──────────────────────────────────────────────
Button(
onClick = {
focusManager.clearFocus()
@@ -263,63 +318,70 @@ fun LoginScreen(
modifier = Modifier
.fillMaxWidth()
.height(50.dp),
- enabled = !uiState.isLoading && uiState.agreedTerms
+ enabled = !uiState.isLoading && uiState.agreedTerms,
+ colors = ButtonDefaults.buttonColors(
+ containerColor = ZhiNiBlue,
+ disabledContainerColor = ZhiNiBlue.copy(alpha = 0.4f),
+ disabledContentColor = Color.White.copy(alpha = 0.6f)
+ ),
+ shape = MaterialTheme.shapes.medium
) {
if (uiState.isLoading) {
CircularProgressIndicator(
- modifier = Modifier.size(24.dp),
- color = MaterialTheme.colorScheme.onPrimary,
+ modifier = Modifier.size(22.dp),
+ color = Color.White,
strokeWidth = 2.dp
)
} else {
- Text("登录", style = MaterialTheme.typography.titleMedium)
+ Text("登录", fontSize = 16.sp, color = Color.White)
}
}
- Spacer(modifier = Modifier.height(16.dp))
+ Spacer(modifier = Modifier.height(32.dp))
- // Register link
- TextButton(onClick = onNavigateToRegister) {
- Text("没有账户？立即注册")
+ // ── Bottom privacy policy ─────────────────────────────────────
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(bottom = 32.dp),
+ horizontalArrangement = Arrangement.Center
+ ) {
+ Text(
+ text = "隐私政策",
+ style = MaterialTheme.typography.labelSmall,
+ color = ZhiNiTextHint,
+ modifier = Modifier.clickable {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/privacy")))
+ }
+ )
+ Text(
+ text = " | ",
+ style = MaterialTheme.typography.labelSmall,
+ color = ZhiNiTextHint
+ )
+ Text(
+ text = "用户协议",
+ style = MaterialTheme.typography.labelSmall,
+ color = ZhiNiTextHint,
+ modifier = Modifier.clickable {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/terms")))
+ }
+ )
}
-
- Spacer(modifier = Modifier.height(24.dp))
-
- // Privacy policy & user agreement
- PrivacyPolicyRow(
- onPrivacyPolicy = {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/privacy"))
- context.startActivity(intent)
- },
- onUserAgreement = {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://tiangong.ai/terms"))
- context.startActivity(intent)
- }
- )
}
}
}
+/** zhini_im-style TextField: transparent background, no border, compact. */
@Composable
-fun PrivacyPolicyRow(
- onPrivacyPolicy: () -> Unit,
- onUserAgreement: () -> Unit
-) {
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.Center
- ) {
- TextButton(onClick = onPrivacyPolicy, contentPadding = PaddingValues(horizontal = 4.dp)) {
- Text("隐私政策", style = MaterialTheme.typography.labelSmall)
- }
- Text(
- text = "|",
- style = MaterialTheme.typography.labelSmall,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(horizontal = 4.dp)
- )
- TextButton(onClick = onUserAgreement, contentPadding = PaddingValues(horizontal = 4.dp)) {
- Text("用户协议", style = MaterialTheme.typography.labelSmall)
- }
- }
-}
+private fun zhiniTextFieldColors() = TextFieldDefaults.colors(
+ focusedContainerColor = Color.Transparent,
+ unfocusedContainerColor = Color.Transparent,
+ disabledContainerColor = Color.Transparent,
+ focusedIndicatorColor = Color.Transparent,
+ unfocusedIndicatorColor = Color.Transparent,
+ disabledIndicatorColor = Color.Transparent,
+ focusedTextColor = ZhiNiTextPrimary,
+ unfocusedTextColor = ZhiNiTextPrimary,
+ cursorColor = ZhiNiBlue
+)
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/login/PhoneLoginScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/login/PhoneLoginScreen.kt
new file mode 100644
index 0000000..1c3fbcd
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/login/PhoneLoginScreen.kt
@@ -0,0 +1,294 @@
+package com.tiangong.aiagent.ui.login
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Phone
+import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tiangong.aiagent.data.remote.ApiService
+import com.tiangong.aiagent.data.remote.dto.PhoneLoginRequest
+import com.tiangong.aiagent.data.remote.dto.PhoneSendCodeRequest
+import com.tiangong.aiagent.data.remote.dto.PhoneLoginResponse
+import com.tiangong.aiagent.data.local.TokenDataStore
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+data class PhoneLoginState(
+ val phone: String = "",
+ val code: String = "",
+ val countdown: Int = 0, // 0 = ready, >0 = counting
+ val isSending: Boolean = false,
+ val isLoading: Boolean = false,
+ val error: String? = null,
+ val token: String? = null,
+ val refreshToken: String? = null
+)
+
+@HiltViewModel
+class PhoneLoginViewModel @Inject constructor(
+ private val apiService: ApiService,
+ private val tokenDataStore: TokenDataStore
+) : ViewModel() {
+
+ private val _uiState = MutableStateFlow(PhoneLoginState())
+ val uiState: StateFlow = _uiState.asStateFlow()
+
+ fun updatePhone(phone: String) {
+ val digits = phone.filter { it.isDigit() }.take(11)
+ _uiState.value = _uiState.value.copy(phone = digits, error = null)
+ }
+
+ fun updateCode(code: String) {
+ val digits = code.filter { it.isDigit() }.take(6)
+ _uiState.value = _uiState.value.copy(code = digits, error = null)
+ }
+
+ fun sendCode() {
+ val phone = _uiState.value.phone
+ if (phone.length != 11) {
+ _uiState.value = _uiState.value.copy(error = "请输入正确的手机号")
+ return
+ }
+ if (_uiState.value.countdown > 0) return
+
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(isSending = true)
+ try {
+ apiService.sendPhoneCode(PhoneSendCodeRequest(phone = phone))
+ _uiState.value = _uiState.value.copy(isSending = false, countdown = 60)
+ // Start countdown
+ launch {
+ for (i in 60 downTo 1) {
+ delay(1000)
+ _uiState.value = _uiState.value.copy(countdown = i)
+ }
+ }
+ } catch (e: Exception) {
+ val msg = if (e is retrofit2.HttpException) {
+ when (e.code()) {
+ 429 -> "操作过于频繁，请稍后再试"
+ else -> "发送失败，请重试"
+ }
+ } else {
+ "网络错误，请检查连接"
+ }
+ _uiState.value = _uiState.value.copy(isSending = false, error = msg)
+ }
+ }
+ }
+
+ fun login() {
+ val state = _uiState.value
+ if (state.phone.length != 11) {
+ _uiState.value = _uiState.value.copy(error = "请输入正确的手机号")
+ return
+ }
+ if (state.code.length < 4) {
+ _uiState.value = _uiState.value.copy(error = "请输入验证码")
+ return
+ }
+
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(isLoading = true, error = null)
+ try {
+ val response = apiService.phoneLogin(
+ PhoneLoginRequest(phone = state.phone, code = state.code)
+ )
+ // Save tokens
+ tokenDataStore.saveToken(response.accessToken)
+ response.refreshToken?.let { tokenDataStore.saveRefreshToken(it) }
+ _uiState.value = _uiState.value.copy(
+ isLoading = false,
+ token = response.accessToken,
+ refreshToken = response.refreshToken
+ )
+ } catch (e: Exception) {
+ val msg = if (e is retrofit2.HttpException) {
+ when (e.code()) {
+ 400 -> "验证码错误或已过期"
+ 403 -> "该账号已注销"
+ else -> "登录失败，请重试"
+ }
+ } else {
+ "网络错误，请检查连接"
+ }
+ _uiState.value = _uiState.value.copy(isLoading = false, error = msg)
+ }
+ }
+ }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PhoneLoginScreen(
+ onNavigateBack: () -> Unit,
+ onLoginSuccess: () -> Unit,
+ viewModel: PhoneLoginViewModel = hiltViewModel()
+) {
+ val uiState by viewModel.uiState.collectAsState()
+ val focusManager = LocalFocusManager.current
+
+ LaunchedEffect(uiState.token) {
+ if (uiState.token != null) {
+ onLoginSuccess()
+ }
+ }
+
+ Scaffold(
+ topBar = {
+ TopAppBar(
+ title = { Text("手机号登录") },
+ navigationIcon = {
+ IconButton(onClick = onNavigateBack) {
+ Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "返回")
+ }
+ }
+ )
+ }
+ ) { padding ->
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(padding)
+ .padding(horizontal = 24.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ Spacer(modifier = Modifier.height(48.dp))
+
+ // Header
+ Icon(
+ imageVector = Icons.Default.Phone,
+ contentDescription = null,
+ modifier = Modifier.size(48.dp),
+ tint = MaterialTheme.colorScheme.primary
+ )
+ Spacer(modifier = Modifier.height(16.dp))
+ Text(
+ "验证码登录",
+ style = MaterialTheme.typography.headlineSmall,
+ fontWeight = FontWeight.Bold
+ )
+ Text(
+ "未注册的手机号将自动创建账号",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+
+ Spacer(modifier = Modifier.height(32.dp))
+
+ // Phone input
+ OutlinedTextField(
+ value = uiState.phone,
+ onValueChange = viewModel::updatePhone,
+ label = { Text("手机号") },
+ placeholder = { Text("请输入手机号") },
+ leadingIcon = { Icon(Icons.Default.Phone, contentDescription = null) },
+ singleLine = true,
+ keyboardOptions = KeyboardOptions(
+ keyboardType = KeyboardType.Phone,
+ imeAction = ImeAction.Next
+ ),
+ modifier = Modifier.fillMaxWidth()
+ )
+
+ Spacer(modifier = Modifier.height(16.dp))
+
+ // Code input + send button
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(12.dp),
+ verticalAlignment = Alignment.Top
+ ) {
+ OutlinedTextField(
+ value = uiState.code,
+ onValueChange = viewModel::updateCode,
+ label = { Text("验证码") },
+ placeholder = { Text("6位验证码") },
+ singleLine = true,
+ keyboardOptions = KeyboardOptions(
+ keyboardType = KeyboardType.Number,
+ imeAction = ImeAction.Done
+ ),
+ keyboardActions = KeyboardActions(
+ onDone = {
+ focusManager.clearFocus()
+ viewModel.login()
+ }
+ ),
+ modifier = Modifier.weight(1f)
+ )
+
+ OutlinedButton(
+ onClick = { viewModel.sendCode() },
+ enabled = uiState.phone.length == 11 && uiState.countdown == 0 && !uiState.isSending,
+ modifier = Modifier
+ .height(56.dp)
+ .width(120.dp)
+ ) {
+ if (uiState.isSending) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(18.dp),
+ strokeWidth = 2.dp
+ )
+ } else {
+ Text(
+ if (uiState.countdown > 0) "${uiState.countdown}s" else "发送验证码",
+ style = MaterialTheme.typography.bodySmall
+ )
+ }
+ }
+ }
+
+ // Error
+ if (uiState.error != null) {
+ Spacer(modifier = Modifier.height(8.dp))
+ Text(
+ uiState.error!!,
+ color = MaterialTheme.colorScheme.error,
+ style = MaterialTheme.typography.bodySmall
+ )
+ }
+
+ Spacer(modifier = Modifier.height(24.dp))
+
+ // Login button
+ Button(
+ onClick = { viewModel.login() },
+ enabled = !uiState.isLoading && uiState.phone.length == 11 && uiState.code.length >= 4,
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(52.dp),
+ shape = MaterialTheme.shapes.large
+ ) {
+ if (uiState.isLoading) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(24.dp),
+ strokeWidth = 2.dp,
+ color = MaterialTheme.colorScheme.onPrimary
+ )
+ } else {
+ Text("登录", style = MaterialTheme.typography.titleSmall)
+ }
+ }
+ }
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/login/PrivacyPolicyRow.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/login/PrivacyPolicyRow.kt
new file mode 100644
index 0000000..4025aba
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/login/PrivacyPolicyRow.kt
@@ -0,0 +1,38 @@
+package com.tiangong.aiagent.ui.login
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun PrivacyPolicyRow(
+ onPrivacyPolicy: () -> Unit,
+ onUserAgreement: () -> Unit
+) {
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ TextButton(onClick = onPrivacyPolicy) {
+ Text("隐私政策", fontSize = 12.sp)
+ }
+ Text(" | ", fontSize = 12.sp, color = androidx.compose.material3.MaterialTheme.colorScheme.onSurfaceVariant)
+ TextButton(onClick = onUserAgreement) {
+ Text("用户协议", fontSize = 12.sp)
+ }
+ }
+ Text(
+ text = "继续使用即表示您同意以上协议",
+ fontSize = 10.sp,
+ color = androidx.compose.material3.MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f),
+ textAlign = TextAlign.Center,
+ modifier = Modifier.fillMaxWidth()
+ )
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/market/MarketScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/market/MarketScreen.kt
new file mode 100644
index 0000000..72ee542
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/market/MarketScreen.kt
@@ -0,0 +1,555 @@
+package com.tiangong.aiagent.ui.market
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.tiangong.aiagent.data.remote.dto.AgentMarketItemDto
+import com.tiangong.aiagent.data.remote.dto.SceneTemplateItemDto
+import com.tiangong.aiagent.data.remote.dto.TemplateItemDto
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MarketScreen(
+ onNavigateBack: () -> Unit,
+ viewModel: MarketViewModel = hiltViewModel()
+) {
+ val uiState by viewModel.uiState.collectAsState()
+ var searchText by remember { mutableStateOf("") }
+
+ // Snackbar for success/error
+ val snackbarHostState = remember { SnackbarHostState() }
+ LaunchedEffect(uiState.installSuccessMessage) {
+ uiState.installSuccessMessage?.let {
+ snackbarHostState.showSnackbar(it)
+ viewModel.clearError()
+ }
+ }
+ LaunchedEffect(uiState.error) {
+ uiState.error?.let {
+ snackbarHostState.showSnackbar(it)
+ viewModel.clearError()
+ }
+ }
+
+ Scaffold(
+ topBar = {
+ TopAppBar(
+ title = { Text("Agent 市场") },
+ navigationIcon = {
+ IconButton(onClick = onNavigateBack) {
+ Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "返回")
+ }
+ }
+ )
+ },
+ snackbarHost = { SnackbarHost(snackbarHostState) }
+ ) { padding ->
+ Column(modifier = Modifier.padding(padding)) {
+ // Tab Row
+ TabRow(selectedTabIndex = uiState.selectedTab) {
+ Tab(
+ selected = uiState.selectedTab == 0,
+ onClick = { viewModel.selectTab(0) },
+ text = { Text("推荐") }
+ )
+ Tab(
+ selected = uiState.selectedTab == 1,
+ onClick = { viewModel.selectTab(1) },
+ text = { Text("市场") }
+ )
+ Tab(
+ selected = uiState.selectedTab == 2,
+ onClick = { viewModel.selectTab(2) },
+ text = { Text("模板") }
+ )
+ }
+
+ when (uiState.selectedTab) {
+ 0 -> FeaturedTab(uiState, viewModel)
+ 1 -> AllAgentsTab(uiState, viewModel, searchText) { searchText = it }
+ 2 -> TemplatesTab(uiState, viewModel)
+ }
+ }
+ }
+}
+
+// ─── Featured Tab ─────────────────────────────────────────────────────
+
+@Composable
+private fun FeaturedTab(uiState: MarketUiState, viewModel: MarketViewModel) {
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(16.dp),
+ verticalArrangement = Arrangement.spacedBy(16.dp)
+ ) {
+ // Recommended section
+ item {
+ Text(
+ "精选推荐",
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.Bold
+ )
+ }
+ if (uiState.isLoadingFeatured) {
+ item { LoadingIndicator() }
+ } else {
+ items(uiState.featuredAgents.chunked(2)) { row ->
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ row.forEach { agent ->
+ AgentCard(
+ agent = agent,
+ isInstalling = agent.id in uiState.isInstalling,
+ onInstall = { viewModel.installAgent(agent) },
+ modifier = Modifier.weight(1f)
+ )
+ }
+ // Fill empty slot if odd count
+ if (row.size == 1) {
+ Spacer(modifier = Modifier.weight(1f))
+ }
+ }
+ }
+ }
+
+ // Scene templates section
+ if (uiState.sceneTemplates.isNotEmpty()) {
+ item {
+ Spacer(modifier = Modifier.height(8.dp))
+ Text(
+ "场景模板",
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.Bold
+ )
+ }
+ items(uiState.sceneTemplates) { template ->
+ SceneTemplateCard(template, viewModel)
+ }
+ }
+ }
+}
+
+// ─── All Agents Tab ────────────────────────────────────────────────────
+
+@Composable
+private fun AllAgentsTab(
+ uiState: MarketUiState,
+ viewModel: MarketViewModel,
+ searchText: String,
+ onSearchTextChange: (String) -> Unit
+) {
+ Column(modifier = Modifier.fillMaxSize()) {
+ // Search bar
+ OutlinedTextField(
+ value = searchText,
+ onValueChange = onSearchTextChange,
+ placeholder = { Text("搜索智能体...") },
+ leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
+ singleLine = true,
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 16.dp, vertical = 8.dp)
+ )
+
+ // Trigger search
+ LaunchedEffect(searchText) {
+ viewModel.setSearchQuery(searchText)
+ viewModel.search()
+ }
+
+ // Category chips
+ if (uiState.categories.isNotEmpty()) {
+ LazyRow(
+ modifier = Modifier.fillMaxWidth(),
+ contentPadding = PaddingValues(horizontal = 16.dp),
+ horizontalArrangement = Arrangement.spacedBy(8.dp)
+ ) {
+ item {
+ FilterChip(
+ selected = uiState.selectedCategory == null,
+ onClick = { viewModel.selectCategory(null) },
+ label = { Text("全部") }
+ )
+ }
+ items(uiState.categories) { cat ->
+ FilterChip(
+ selected = uiState.selectedCategory == cat.category,
+ onClick = { viewModel.selectCategory(cat.category) },
+ label = { Text("${cat.category} (${cat.count})") }
+ )
+ }
+ }
+ Spacer(modifier = Modifier.height(8.dp))
+ }
+
+ // Agent list
+ if (uiState.isLoadingAll) {
+ LoadingIndicator()
+ } else {
+ LazyColumn(
+ contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ items(uiState.allAgents) { agent ->
+ AgentListItem(agent, agent.id in uiState.isInstalling) {
+ viewModel.installAgent(agent)
+ }
+ }
+ }
+ }
+ }
+}
+
+// ─── Templates Tab ─────────────────────────────────────────────────────
+
+@Composable
+private fun TemplatesTab(uiState: MarketUiState, viewModel: MarketViewModel) {
+ LazyColumn(
+ modifier = Modifier.fillMaxSize(),
+ contentPadding = PaddingValues(16.dp),
+ verticalArrangement = Arrangement.spacedBy(12.dp)
+ ) {
+ if (uiState.isLoadingTemplates) {
+ item { LoadingIndicator() }
+ } else {
+ item {
+ Text(
+ "工作流模板",
+ style = MaterialTheme.typography.titleMedium,
+ fontWeight = FontWeight.Bold
+ )
+ }
+ items(uiState.templates) { template ->
+ TemplateCard(template, template.id in uiState.isInstalling) {
+ viewModel.useTemplate(template)
+ }
+ }
+ }
+ }
+}
+
+// ─── Components ────────────────────────────────────────────────────────
+
+@Composable
+private fun AgentCard(
+ agent: AgentMarketItemDto,
+ isInstalling: Boolean,
+ onInstall: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ Card(
+ modifier = modifier,
+ shape = RoundedCornerShape(12.dp),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant
+ )
+ ) {
+ Column(modifier = Modifier.padding(12.dp)) {
+ Text(
+ agent.name,
+ style = MaterialTheme.typography.titleSmall,
+ fontWeight = FontWeight.Bold,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ Spacer(modifier = Modifier.height(4.dp))
+ Text(
+ agent.description ?: "暂无描述",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis,
+ lineHeight = 16.sp
+ )
+ Spacer(modifier = Modifier.weight(1f))
+ Row(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Icon(
+ Icons.Default.Star,
+ contentDescription = null,
+ modifier = Modifier.size(14.dp),
+ tint = Color(0xFFFFB800)
+ )
+ Spacer(modifier = Modifier.width(2.dp))
+ Text(
+ "${agent.ratingAvg}",
+ style = MaterialTheme.typography.labelSmall
+ )
+ Text(
+ " (${agent.useCount}次)",
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ FilledTonalButton(
+ onClick = onInstall,
+ enabled = !isInstalling,
+ contentPadding = PaddingValues(horizontal = 12.dp, vertical = 4.dp)
+ ) {
+ if (isInstalling) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(14.dp),
+ strokeWidth = 2.dp
+ )
+ } else {
+ Icon(Icons.Default.Download, contentDescription = null, modifier = Modifier.size(14.dp))
+ Spacer(modifier = Modifier.width(4.dp))
+ Text("安装", style = MaterialTheme.typography.labelSmall)
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun AgentListItem(
+ agent: AgentMarketItemDto,
+ isInstalling: Boolean,
+ onInstall: () -> Unit
+) {
+ Card(
+ shape = RoundedCornerShape(12.dp),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant
+ )
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(16.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ agent.name,
+ style = MaterialTheme.typography.titleSmall,
+ fontWeight = FontWeight.Bold,
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis
+ )
+ Spacer(modifier = Modifier.height(2.dp))
+ Text(
+ agent.description ?: "暂无描述",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ Spacer(modifier = Modifier.height(4.dp))
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Icon(Icons.Default.Star, contentDescription = null,
+ modifier = Modifier.size(14.dp), tint = Color(0xFFFFB800))
+ Spacer(modifier = Modifier.width(2.dp))
+ Text("${agent.ratingAvg} (${agent.ratingCount}评)", style = MaterialTheme.typography.labelSmall)
+ Spacer(modifier = Modifier.width(12.dp))
+ Text("${agent.useCount}次使用", style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant)
+ if (agent.creatorUsername != null) {
+ Spacer(modifier = Modifier.width(12.dp))
+ Text("@${agent.creatorUsername}", style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.primary)
+ }
+ }
+ }
+ Spacer(modifier = Modifier.width(12.dp))
+ Button(
+ onClick = onInstall,
+ enabled = !isInstalling,
+ contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
+ ) {
+ if (isInstalling) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(16.dp),
+ strokeWidth = 2.dp,
+ color = MaterialTheme.colorScheme.onPrimary
+ )
+ } else {
+ Text("安装")
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun TemplateCard(
+ template: TemplateItemDto,
+ isInstalling: Boolean,
+ onUse: () -> Unit
+) {
+ Card(
+ shape = RoundedCornerShape(12.dp),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant
+ )
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(16.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ template.name,
+ style = MaterialTheme.typography.titleSmall,
+ fontWeight = FontWeight.Bold
+ )
+ if (!template.description.isNullOrBlank()) {
+ Text(
+ template.description,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
+ Row(verticalAlignment = Alignment.CenterVertically) {
+ Text("${template.useCount}次使用", style = MaterialTheme.typography.labelSmall)
+ if (template.creatorUsername != null) {
+ Spacer(modifier = Modifier.width(8.dp))
+ Text("@${template.creatorUsername}", style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.primary)
+ }
+ }
+ }
+ Spacer(modifier = Modifier.width(12.dp))
+ FilledTonalButton(
+ onClick = onUse,
+ enabled = !isInstalling
+ ) {
+ if (isInstalling) {
+ CircularProgressIndicator(modifier = Modifier.size(16.dp), strokeWidth = 2.dp)
+ } else {
+ Text("使用")
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun SceneTemplateCard(
+ template: SceneTemplateItemDto,
+ viewModel: MarketViewModel
+) {
+ var showNameDialog by remember { mutableStateOf(false) }
+ var agentName by remember { mutableStateOf(template.name) }
+
+ Card(
+ shape = RoundedCornerShape(12.dp),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant
+ )
+ ) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(16.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ template.name,
+ style = MaterialTheme.typography.titleSmall,
+ fontWeight = FontWeight.Bold
+ )
+ if (!template.description.isNullOrBlank()) {
+ Text(
+ template.description,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis
+ )
+ }
+ if (template.category != null) {
+ Text(
+ template.category,
+ style = MaterialTheme.typography.labelSmall,
+ color = MaterialTheme.colorScheme.primary
+ )
+ }
+ }
+ Spacer(modifier = Modifier.width(12.dp))
+ FilledTonalButton(onClick = { showNameDialog = true }) {
+ Text("创建")
+ }
+ }
+ }
+
+ if (showNameDialog) {
+ AlertDialog(
+ onDismissRequest = { showNameDialog = false },
+ title = { Text("从模板创建智能体") },
+ text = {
+ OutlinedTextField(
+ value = agentName,
+ onValueChange = { agentName = it },
+ label = { Text("智能体名称") },
+ singleLine = true
+ )
+ },
+ confirmButton = {
+ TextButton(
+ onClick = {
+ viewModel.createFromSceneTemplate(template, agentName)
+ showNameDialog = false
+ },
+ enabled = agentName.isNotBlank()
+ ) {
+ Text("创建")
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = { showNameDialog = false }) {
+ Text("取消")
+ }
+ }
+ )
+ }
+}
+
+@Composable
+private fun LoadingIndicator() {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(32.dp),
+ contentAlignment = Alignment.Center
+ ) {
+ CircularProgressIndicator()
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/market/MarketViewModel.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/market/MarketViewModel.kt
new file mode 100644
index 0000000..fab30cb
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/market/MarketViewModel.kt
@@ -0,0 +1,233 @@
+package com.tiangong.aiagent.ui.market
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tiangong.aiagent.data.remote.dto.AgentMarketItemDto
+import com.tiangong.aiagent.data.remote.dto.MarketCategoryDto
+import com.tiangong.aiagent.data.remote.dto.SceneTemplateItemDto
+import com.tiangong.aiagent.data.remote.dto.TemplateItemDto
+import com.tiangong.aiagent.data.repository.AgentMarketRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+data class MarketUiState(
+ val selectedTab: Int = 0, // 0=Featured, 1=All, 2=Templates
+ val featuredAgents: List = emptyList(),
+ val allAgents: List = emptyList(),
+ val templates: List = emptyList(),
+ val sceneTemplates: List = emptyList(),
+ val categories: List = emptyList(),
+ val selectedCategory: String? = null,
+ val searchQuery: String = "",
+ val isLoadingFeatured: Boolean = false,
+ val isLoadingAll: Boolean = false,
+ val isLoadingTemplates: Boolean = false,
+ val isInstalling: Set = emptySet(), // agent IDs being installed
+ val installSuccessMessage: String? = null,
+ val error: String? = null
+)
+
+@HiltViewModel
+class MarketViewModel @Inject constructor(
+ private val marketRepository: AgentMarketRepository
+) : ViewModel() {
+
+ private val _uiState = MutableStateFlow(MarketUiState())
+ val uiState: StateFlow = _uiState.asStateFlow()
+
+ init {
+ loadFeatured()
+ loadAllAgents()
+ loadTemplates()
+ loadCategories()
+ loadSceneTemplates()
+ }
+
+ fun selectTab(tab: Int) {
+ _uiState.value = _uiState.value.copy(selectedTab = tab)
+ }
+
+ fun selectCategory(category: String?) {
+ _uiState.value = _uiState.value.copy(selectedCategory = category)
+ loadAllAgents()
+ }
+
+ fun setSearchQuery(query: String) {
+ _uiState.value = _uiState.value.copy(searchQuery = query)
+ }
+
+ fun clearError() {
+ _uiState.value = _uiState.value.copy(error = null, installSuccessMessage = null)
+ }
+
+ // ─── Load ───
+
+ fun loadFeatured() {
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(isLoadingFeatured = true)
+ marketRepository.getFeaturedAgents(10).fold(
+ onSuccess = { agents ->
+ _uiState.value = _uiState.value.copy(
+ featuredAgents = agents,
+ isLoadingFeatured = false
+ )
+ },
+ onFailure = { e ->
+ _uiState.value = _uiState.value.copy(
+ isLoadingFeatured = false,
+ error = "加载推荐失败: ${e.message}"
+ )
+ }
+ )
+ }
+ }
+
+ fun loadAllAgents() {
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(isLoadingAll = true)
+ val state = _uiState.value
+ marketRepository.browseAgents(
+ search = state.searchQuery.ifBlank { null },
+ category = state.selectedCategory,
+ sortBy = "use_count"
+ ).fold(
+ onSuccess = { agents ->
+ _uiState.value = _uiState.value.copy(
+ allAgents = agents,
+ isLoadingAll = false
+ )
+ },
+ onFailure = { e ->
+ _uiState.value = _uiState.value.copy(
+ isLoadingAll = false,
+ error = "加载市场失败: ${e.message}"
+ )
+ }
+ )
+ }
+ }
+
+ fun loadTemplates() {
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(isLoadingTemplates = true)
+ marketRepository.browseTemplates().fold(
+ onSuccess = { tmpl ->
+ _uiState.value = _uiState.value.copy(
+ templates = tmpl,
+ isLoadingTemplates = false
+ )
+ },
+ onFailure = { e ->
+ _uiState.value = _uiState.value.copy(
+ isLoadingTemplates = false,
+ error = "加载模板失败: ${e.message}"
+ )
+ }
+ )
+ }
+ }
+
+ private fun loadCategories() {
+ viewModelScope.launch {
+ marketRepository.getCategories().fold(
+ onSuccess = { cats ->
+ _uiState.value = _uiState.value.copy(categories = cats)
+ },
+ onFailure = { /* silently ignore */ }
+ )
+ }
+ }
+
+ private fun loadSceneTemplates() {
+ viewModelScope.launch {
+ marketRepository.getSceneTemplates().fold(
+ onSuccess = { st ->
+ _uiState.value = _uiState.value.copy(sceneTemplates = st)
+ },
+ onFailure = { /* silently ignore */ }
+ )
+ }
+ }
+
+ // ─── Actions ───
+
+ fun installAgent(agent: AgentMarketItemDto) {
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling + agent.id,
+ error = null
+ )
+ marketRepository.installAgent(agent.id).fold(
+ onSuccess = { resp ->
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling - agent.id,
+ installSuccessMessage = "已安装: ${resp.agentName}"
+ )
+ },
+ onFailure = { e ->
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling - agent.id,
+ error = "安装失败: ${e.message}"
+ )
+ }
+ )
+ }
+ }
+
+ fun useTemplate(template: TemplateItemDto) {
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling + template.id,
+ error = null
+ )
+ marketRepository.useTemplate(template.id).fold(
+ onSuccess = { resp ->
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling - template.id,
+ installSuccessMessage = "已从模板创建: ${resp.name}"
+ )
+ },
+ onFailure = { e ->
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling - template.id,
+ error = "使用模板失败: ${e.message}"
+ )
+ }
+ )
+ }
+ }
+
+ fun createFromSceneTemplate(template: SceneTemplateItemDto, agentName: String) {
+ viewModelScope.launch {
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling + template.id,
+ error = null
+ )
+ marketRepository.createFromSceneTemplate(
+ name = agentName,
+ sceneTemplateId = template.id
+ ).fold(
+ onSuccess = { resp ->
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling - template.id,
+ installSuccessMessage = "已创建: ${resp.name}"
+ )
+ },
+ onFailure = { e ->
+ _uiState.value = _uiState.value.copy(
+ isInstalling = _uiState.value.isInstalling - template.id,
+ error = "创建失败: ${e.message}"
+ )
+ }
+ )
+ }
+ }
+
+ fun search() {
+ loadAllAgents()
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/navigation/NavGraph.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/navigation/NavGraph.kt
index 2c11833..f10de44 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/ui/navigation/NavGraph.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/navigation/NavGraph.kt
@@ -16,18 +16,26 @@ import com.tiangong.aiagent.ui.chat.ChatScreen
import com.tiangong.aiagent.ui.chat.ChatViewModel
import com.tiangong.aiagent.ui.history.ConversationListScreen
import com.tiangong.aiagent.ui.login.LoginScreen
+import com.tiangong.aiagent.ui.login.PhoneLoginScreen
+import com.tiangong.aiagent.ui.market.MarketScreen
+import com.tiangong.aiagent.ui.subscription.SubscriptionScreen
import com.tiangong.aiagent.ui.memory.MemoryManageScreen
import com.tiangong.aiagent.ui.notifications.NotificationDetailScreen
import com.tiangong.aiagent.ui.notifications.NotificationsScreen
+import com.tiangong.aiagent.ui.onboarding.OnboardingScreen
import com.tiangong.aiagent.ui.register.RegisterScreen
import com.tiangong.aiagent.ui.settings.AboutScreen
import com.tiangong.aiagent.ui.settings.AccountSecurityScreen
+import com.tiangong.aiagent.ui.settings.NetworkDiagnoseScreen
import com.tiangong.aiagent.ui.settings.SettingsScreen
+import com.tiangong.aiagent.ui.splash.SplashScreen
+import com.tiangong.aiagent.util.AnalyticsViewModel
private const val CS_AGENT_ID = "3490efa8-330d-458d-a26e-0b6c1d72e6f4"
private const val CS_AGENT_NAME = "天工客服"
object Routes {
+ const val SPLASH = "splash"
const val LOGIN = "login"
const val REGISTER = "register"
const val CHAT = "chat"
@@ -39,16 +47,29 @@ object Routes {
const val NOTIFICATIONS = "notifications"
const val NOTIFICATION_DETAIL = "notifications/{notificationId}"
const val MEMORY_MANAGE = "memory_manage/{agentId}/{agentName}"
+ const val ONBOARDING = "onboarding"
+ const val PHONE_LOGIN = "phone_login"
+ const val MARKET = "market"
+ const val SUBSCRIPTION = "subscription"
+ const val NETWORK_DIAGNOSE = "network_diagnose"
}
@Composable
fun NavGraph(
token: String?,
+ onboardingCompleted: Boolean = false,
+ onOnboardingComplete: () -> Unit = {},
initialNotificationId: String? = null,
navController: NavHostController = rememberNavController()
) {
- val startDest = remember(token) {
- if (token != null) Routes.CHAT else Routes.LOGIN
+ val startDest = Routes.SPLASH
+
+ // Analytics: app open
+ val analyticsVM: AnalyticsViewModel = hiltViewModel()
+ LaunchedEffect(token) {
+ if (token != null) {
+ analyticsVM.tracker.trackEvent("app", "app_open")
+ }
}
LaunchedEffect(initialNotificationId) {
@@ -61,6 +82,28 @@ fun NavGraph(
navController = navController,
startDestination = startDest
) {
+ composable(Routes.SPLASH) {
+ SplashScreen(
+ token = token,
+ onboardingCompleted = onboardingCompleted,
+ onNavigateToLogin = {
+ navController.navigate(Routes.LOGIN) {
+ popUpTo(Routes.SPLASH) { inclusive = true }
+ }
+ },
+ onNavigateToOnboarding = {
+ navController.navigate(Routes.ONBOARDING) {
+ popUpTo(Routes.SPLASH) { inclusive = true }
+ }
+ },
+ onNavigateToChat = {
+ navController.navigate(Routes.CHAT) {
+ popUpTo(Routes.SPLASH) { inclusive = true }
+ }
+ }
+ )
+ }
+
composable(Routes.LOGIN) {
LoginScreen(
onLoginSuccess = {
@@ -70,6 +113,9 @@ fun NavGraph(
},
onNavigateToRegister = {
navController.navigate(Routes.REGISTER)
+ },
+ onNavigateToPhoneLogin = {
+ navController.navigate(Routes.PHONE_LOGIN)
}
)
}
@@ -115,6 +161,9 @@ fun NavGraph(
onManageMemory = { agentId, agentName ->
val encoded = java.net.URLEncoder.encode(agentName, "UTF-8")
navController.navigate("memory_manage/$agentId/$encoded")
+ },
+ onNavigateToMarket = {
+ navController.navigate(Routes.MARKET)
}
)
}
@@ -155,7 +204,9 @@ fun NavGraph(
)
chatViewModel.switchAgent(csAgent)
navController.popBackStack()
- }
+ },
+ onNavigateToSubscription = { navController.navigate(Routes.SUBSCRIPTION) },
+ onNavigateToNetworkDiagnose = { navController.navigate(Routes.NETWORK_DIAGNOSE) }
)
}
@@ -202,5 +253,45 @@ fun NavGraph(
onBack = { navController.popBackStack() }
)
}
+
+ composable(Routes.ONBOARDING) {
+ OnboardingScreen(
+ onComplete = {
+ onOnboardingComplete()
+ navController.navigate(Routes.CHAT) {
+ popUpTo(Routes.ONBOARDING) { inclusive = true }
+ }
+ }
+ )
+ }
+
+ composable(Routes.PHONE_LOGIN) {
+ PhoneLoginScreen(
+ onNavigateBack = { navController.popBackStack() },
+ onLoginSuccess = {
+ navController.navigate(Routes.CHAT) {
+ popUpTo(0) { inclusive = true }
+ }
+ }
+ )
+ }
+
+ composable(Routes.MARKET) {
+ MarketScreen(
+ onNavigateBack = { navController.popBackStack() }
+ )
+ }
+
+ composable(Routes.SUBSCRIPTION) {
+ SubscriptionScreen(
+ onBack = { navController.popBackStack() }
+ )
+ }
+
+ composable(Routes.NETWORK_DIAGNOSE) {
+ NetworkDiagnoseScreen(
+ onBack = { navController.popBackStack() }
+ )
+ }
}
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/onboarding/OnboardingScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/onboarding/OnboardingScreen.kt
new file mode 100644
index 0000000..8d37899
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/onboarding/OnboardingScreen.kt
@@ -0,0 +1,183 @@
+package com.tiangong.aiagent.ui.onboarding
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Chat
+import androidx.compose.material.icons.filled.DoneAll
+import androidx.compose.material.icons.filled.History
+import androidx.compose.material.icons.filled.SmartToy
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+
+private data class OnboardingPage(
+ val icon: ImageVector,
+ val title: String,
+ val description: String
+)
+
+private val pages = listOf(
+ OnboardingPage(
+ icon = Icons.AutoMirrored.Filled.Chat,
+ title = "与智能体对话",
+ description = "选择你感兴趣的智能体，开始自然流畅的AI对话。每个智能体都有独特的能力和知识领域，随时为你提供帮助。"
+ ),
+ OnboardingPage(
+ icon = Icons.Default.SmartToy,
+ title = "切换不同智能体",
+ description = "从智能体市场选择适合你的AI助手。每个智能体擅长不同的任务——编程、写作、客服、数据分析，总有一个适合你。"
+ ),
+ OnboardingPage(
+ icon = Icons.Default.History,
+ title = "管理你的对话",
+ description = "所有对话自动保存，随时查看历史记录。支持重命名、搜索和置顶对话，让你的每一次交流都有迹可循。"
+ )
+)
+
+@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
+@Composable
+fun OnboardingScreen(
+ onComplete: () -> Unit
+) {
+ val pagerState = rememberPagerState(pageCount = { pages.size })
+ val currentPage = pagerState.currentPage
+
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .systemBarsPadding()
+ ) {
+ // Skip button
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(16.dp),
+ horizontalArrangement = Arrangement.End
+ ) {
+ TextButton(onClick = onComplete) {
+ Text("跳过")
+ }
+ }
+
+ // Pager content
+ HorizontalPager(
+ state = pagerState,
+ modifier = Modifier
+ .weight(1f)
+ .fillMaxWidth()
+ ) { page ->
+ OnboardingPageContent(pages[page])
+ }
+
+ // Page indicator + button
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(24.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ // Page indicators
+ Row(
+ horizontalArrangement = Arrangement.spacedBy(8.dp),
+ modifier = Modifier.padding(bottom = 32.dp)
+ ) {
+ repeat(pages.size) { index ->
+ val color by animateColorAsState(
+ targetValue = if (index == currentPage) {
+ MaterialTheme.colorScheme.primary
+ } else {
+ MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f)
+ },
+ label = "indicatorColor"
+ )
+ Box(
+ modifier = Modifier
+ .size(if (index == currentPage) 10.dp else 8.dp)
+ .clip(CircleShape)
+ .background(color)
+ )
+ }
+ }
+
+ // Start button
+ Button(
+ onClick = onComplete,
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(52.dp),
+ shape = MaterialTheme.shapes.large
+ ) {
+ Icon(
+ imageVector = Icons.Default.DoneAll,
+ contentDescription = null,
+ modifier = Modifier.size(20.dp)
+ )
+ Spacer(modifier = Modifier.width(8.dp))
+ Text(
+ text = if (currentPage == pages.size - 1) "开始使用" else "下一步",
+ style = MaterialTheme.typography.titleSmall
+ )
+ }
+ }
+ }
+}
+
+@Composable
+private fun OnboardingPageContent(page: OnboardingPage) {
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(horizontal = 32.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.Center
+ ) {
+ // Icon
+ Surface(
+ modifier = Modifier.size(120.dp),
+ shape = MaterialTheme.shapes.extraLarge,
+ color = MaterialTheme.colorScheme.primaryContainer
+ ) {
+ Box(contentAlignment = Alignment.Center) {
+ Icon(
+ imageVector = page.icon,
+ contentDescription = null,
+ modifier = Modifier.size(64.dp),
+ tint = MaterialTheme.colorScheme.onPrimaryContainer
+ )
+ }
+ }
+
+ Spacer(modifier = Modifier.height(48.dp))
+
+ // Title
+ Text(
+ text = page.title,
+ style = MaterialTheme.typography.headlineMedium,
+ fontWeight = FontWeight.Bold,
+ textAlign = TextAlign.Center,
+ color = MaterialTheme.colorScheme.onSurface
+ )
+
+ Spacer(modifier = Modifier.height(16.dp))
+
+ // Description
+ Text(
+ text = page.description,
+ style = MaterialTheme.typography.bodyLarge,
+ textAlign = TextAlign.Center,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/settings/AppUpdateDialogs.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/settings/AppUpdateDialogs.kt
new file mode 100644
index 0000000..87306e5
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/settings/AppUpdateDialogs.kt
@@ -0,0 +1,176 @@
+package com.tiangong.aiagent.ui.settings
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CloudDownload
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.SystemUpdate
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.tiangong.aiagent.util.AppUpdateManager
+import com.tiangong.aiagent.util.UpdateState
+
+/**
+ * Compose dialogs for app update flow: notification, download progress, error.
+ */
+@Composable
+fun AppUpdateDialogs(
+ updateManager: AppUpdateManager,
+ onDismiss: () -> Unit = {}
+) {
+ val state by updateManager.updateState.collectAsState()
+
+ // ── Update available notification dialog ──
+ if (state.updateAvailable && state.response != null && !state.downloading && !state.downloadComplete) {
+ val response = state.response!!
+ AlertDialog(
+ onDismissRequest = {
+ if (!state.forceUpdate) {
+ updateManager.reset()
+ onDismiss()
+ }
+ },
+ icon = {
+ Icon(Icons.Default.SystemUpdate, contentDescription = null,
+ tint = MaterialTheme.colorScheme.primary)
+ },
+ title = {
+ Text("发现新版本 ${response.latestVersion}")
+ },
+ text = {
+ Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
+ Text("当前版本: ${response.currentVersion}")
+ if (response.releaseNotes.isNotBlank()) {
+ Spacer(modifier = Modifier.height(8.dp))
+ Text(
+ text = "更新内容:",
+ style = MaterialTheme.typography.labelMedium,
+ fontWeight = FontWeight.Bold
+ )
+ Spacer(modifier = Modifier.height(4.dp))
+ Text(
+ text = response.releaseNotes,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ if (response.forceUpdate) {
+ Spacer(modifier = Modifier.height(8.dp))
+ Text(
+ text = "此版本为强制更新，请立即升级。",
+ style = MaterialTheme.typography.labelMedium,
+ color = MaterialTheme.colorScheme.error
+ )
+ }
+ }
+ },
+ confirmButton = {
+ Button(onClick = { updateManager.startDownload() }) {
+ Icon(Icons.Default.CloudDownload, contentDescription = null, modifier = Modifier.size(18.dp))
+ Spacer(modifier = Modifier.width(6.dp))
+ Text("立即更新")
+ }
+ },
+ dismissButton = {
+ if (!state.forceUpdate) {
+ TextButton(onClick = {
+ updateManager.reset()
+ onDismiss()
+ }) {
+ Text("稍后")
+ }
+ }
+ }
+ )
+ }
+
+ // ── Download progress dialog ──
+ if (state.downloading) {
+ AlertDialog(
+ onDismissRequest = { /* block dismiss during download */ },
+ title = { Text("正在下载更新") },
+ text = {
+ Column(
+ modifier = Modifier.fillMaxWidth(),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ LinearProgressIndicator(
+ progress = { state.downloadProgress / 100f },
+ modifier = Modifier.fillMaxWidth(),
+ )
+ Spacer(modifier = Modifier.height(8.dp))
+ Text(
+ text = "${state.downloadProgress}%",
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ }
+ },
+ confirmButton = {
+ // No confirm - show progress only
+ },
+ dismissButton = {
+ TextButton(onClick = {
+ updateManager.reset()
+ }) {
+ Text("取消")
+ }
+ }
+ )
+ }
+
+ // ── Download complete → install dialog ──
+ if (state.downloadComplete && !state.downloading && state.apkFilePath != null) {
+ AlertDialog(
+ onDismissRequest = {},
+ title = { Text("下载完成") },
+ text = { Text("更新包已下载完成，是否立即安装？") },
+ confirmButton = {
+ Button(onClick = { updateManager.installApk() }) {
+ Text("立即安装")
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = {
+ updateManager.reset()
+ onDismiss()
+ }) {
+ Text("稍后安装")
+ }
+ }
+ )
+ }
+
+ // ── Download error dialog ──
+ state.downloadError?.let { error ->
+ AlertDialog(
+ onDismissRequest = { updateManager.reset() },
+ icon = {
+ Icon(Icons.Default.Error, contentDescription = null,
+ tint = MaterialTheme.colorScheme.error)
+ },
+ title = { Text("更新失败") },
+ text = { Text(error) },
+ confirmButton = {
+ Button(onClick = {
+ updateManager.reset()
+ // Fallback: open in browser
+ updateManager.openInBrowser()
+ }) {
+ Text("浏览器下载")
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = { updateManager.reset() }) {
+ Text("取消")
+ }
+ }
+ )
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/settings/NetworkDiagnoseScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/settings/NetworkDiagnoseScreen.kt
new file mode 100644
index 0000000..df05cc6
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/settings/NetworkDiagnoseScreen.kt
@@ -0,0 +1,281 @@
+package com.tiangong.aiagent.ui.settings
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.IOException
+import java.net.HttpURLConnection
+import java.net.InetSocketAddress
+import java.net.Socket
+import java.net.URL
+
+data class DiagnoseItem(
+ val label: String,
+ val description: String,
+ val status: DiagnoseStatus = DiagnoseStatus.IDLE
+)
+
+enum class DiagnoseStatus {
+ IDLE, RUNNING, SUCCESS, FAIL
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun NetworkDiagnoseScreen(
+ onBack: () -> Unit,
+ serverUrl: String = com.tiangong.aiagent.BuildConfig.BASE_URL
+) {
+ val scope = rememberCoroutineScope()
+
+ val items = remember {
+ mutableStateListOf(
+ DiagnoseItem("应用服务器", "HTTP 连接到 $serverUrl"),
+ DiagnoseItem("API 服务", "检查 /api/v1/health 端点"),
+ DiagnoseItem("网络连通性", "TCP 连接测试 baidu.com:80"),
+ )
+ }
+
+ var isRunning by remember { mutableStateOf(false) }
+ var allDone by remember { mutableStateOf(false) }
+
+ fun runDiagnose() {
+ if (isRunning) return
+ isRunning = true
+ allDone = false
+ // Reset statuses
+ items.indices.forEach { i -> items[i] = items[i].copy(status = DiagnoseStatus.IDLE) }
+
+ scope.launch {
+ // Step 1: TCP connectivity
+ updateItem(items, 2, DiagnoseStatus.RUNNING)
+ val tcpOk = withContext(Dispatchers.IO) {
+ try {
+ val socket = Socket()
+ socket.connect(InetSocketAddress("baidu.com", 80), 5000)
+ socket.close()
+ true
+ } catch (_: IOException) { false }
+ }
+ updateItem(items, 2, if (tcpOk) DiagnoseStatus.SUCCESS else DiagnoseStatus.FAIL)
+
+ if (!tcpOk) {
+ // No network — skip HTTP tests
+ updateItem(items, 0, DiagnoseStatus.FAIL)
+ updateItem(items, 1, DiagnoseStatus.FAIL)
+ isRunning = false
+ allDone = true
+ return@launch
+ }
+
+ // Step 2: App server HTTP
+ updateItem(items, 0, DiagnoseStatus.RUNNING)
+ val serverOk = withContext(Dispatchers.IO) {
+ try {
+ val conn = URL(serverUrl).openConnection() as HttpURLConnection
+ conn.connectTimeout = 5000
+ conn.readTimeout = 5000
+ conn.requestMethod = "GET"
+ conn.responseCode in 200..499 // any response (not a timeout) is OK
+ } catch (_: Exception) { false }
+ }
+ updateItem(items, 0, if (serverOk) DiagnoseStatus.SUCCESS else DiagnoseStatus.FAIL)
+
+ // Step 3: API health endpoint
+ updateItem(items, 1, DiagnoseStatus.RUNNING)
+ val apiOk = withContext(Dispatchers.IO) {
+ try {
+ val url = serverUrl.trimEnd('/') + "/api/v1/health"
+ val conn = URL(url).openConnection() as HttpURLConnection
+ conn.connectTimeout = 5000
+ conn.readTimeout = 5000
+ conn.requestMethod = "GET"
+ conn.responseCode == 200
+ } catch (_: Exception) { false }
+ }
+ updateItem(items, 1, if (apiOk) DiagnoseStatus.SUCCESS else DiagnoseStatus.FAIL)
+
+ isRunning = false
+ allDone = true
+ }
+ }
+
+ LaunchedEffect(Unit) { runDiagnose() }
+
+ Scaffold(
+ topBar = {
+ TopAppBar(
+ title = { Text("网络诊断") },
+ navigationIcon = {
+ IconButton(onClick = onBack) {
+ Icon(
+ imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+ contentDescription = "返回"
+ )
+ }
+ }
+ )
+ }
+ ) { paddingValues ->
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(paddingValues)
+ .verticalScroll(rememberScrollState())
+ .padding(16.dp)
+ ) {
+ Text(
+ "正在检查网络连接状态...",
+ style = MaterialTheme.typography.bodyMedium,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ Spacer(Modifier.height(24.dp))
+
+ items.forEachIndexed { index, item ->
+ DiagnoseCard(item)
+ if (index < items.size - 1) {
+ Spacer(Modifier.height(12.dp))
+ }
+ }
+
+ Spacer(Modifier.height(24.dp))
+
+ // Re-test button
+ Button(
+ onClick = { runDiagnose() },
+ enabled = !isRunning,
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ if (isRunning) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(18.dp),
+ strokeWidth = 2.dp,
+ color = MaterialTheme.colorScheme.onPrimary
+ )
+ Spacer(Modifier.width(8.dp))
+ Text("诊断中...")
+ } else {
+ Icon(Icons.Default.Refresh, contentDescription = null)
+ Spacer(Modifier.width(8.dp))
+ Text("重新检测")
+ }
+ }
+
+ if (allDone) {
+ Spacer(Modifier.height(16.dp))
+ val allOk = items.all { it.status == DiagnoseStatus.SUCCESS }
+ Card(
+ colors = CardDefaults.cardColors(
+ containerColor = if (allOk) Color(0xFFE8F5E9) else Color(0xFFFFF3E0)
+ )
+ ) {
+ Row(
+ modifier = Modifier.padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ imageVector = if (allOk) Icons.Default.CheckCircle else Icons.Default.Warning,
+ contentDescription = null,
+ tint = if (allOk) Color(0xFF4CAF50) else Color(0xFFFF9800)
+ )
+ Spacer(Modifier.width(12.dp))
+ Text(
+ if (allOk) "网络连接正常，所有服务均可访问"
+ else "部分服务连接异常，请检查网络或服务器状态",
+ style = MaterialTheme.typography.bodyMedium,
+ fontWeight = FontWeight.Medium
+ )
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun DiagnoseCard(item: DiagnoseItem) {
+ Card(
+ modifier = Modifier.fillMaxWidth(),
+ colors = CardDefaults.cardColors(
+ containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.4f)
+ )
+ ) {
+ Row(
+ modifier = Modifier.padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ // Status icon
+ when (item.status) {
+ DiagnoseStatus.IDLE -> Icon(
+ Icons.Default.FiberManualRecord,
+ contentDescription = null,
+ tint = Color.Gray,
+ modifier = Modifier.size(24.dp)
+ )
+ DiagnoseStatus.RUNNING -> CircularProgressIndicator(
+ modifier = Modifier.size(24.dp),
+ strokeWidth = 2.dp
+ )
+ DiagnoseStatus.SUCCESS -> Icon(
+ Icons.Default.CheckCircle,
+ contentDescription = null,
+ tint = Color(0xFF4CAF50),
+ modifier = Modifier.size(24.dp)
+ )
+ DiagnoseStatus.FAIL -> Icon(
+ Icons.Default.Cancel,
+ contentDescription = null,
+ tint = Color(0xFFE53935),
+ modifier = Modifier.size(24.dp)
+ )
+ }
+
+ Spacer(Modifier.width(16.dp))
+
+ Column(modifier = Modifier.weight(1f)) {
+ Text(
+ text = item.label,
+ style = MaterialTheme.typography.titleSmall,
+ fontWeight = FontWeight.Medium
+ )
+ Text(
+ text = item.description,
+ style = MaterialTheme.typography.bodySmall,
+ color = MaterialTheme.colorScheme.onSurfaceVariant
+ )
+ Spacer(Modifier.height(4.dp))
+ Text(
+ text = when (item.status) {
+ DiagnoseStatus.IDLE -> "等待检测"
+ DiagnoseStatus.RUNNING -> "检测中..."
+ DiagnoseStatus.SUCCESS -> "连接正常"
+ DiagnoseStatus.FAIL -> "连接失败"
+ },
+ fontSize = 12.sp,
+ color = when (item.status) {
+ DiagnoseStatus.SUCCESS -> Color(0xFF4CAF50)
+ DiagnoseStatus.FAIL -> Color(0xFFE53935)
+ else -> Color.Gray
+ }
+ )
+ }
+ }
+ }
+}
+
+private fun updateItem(items: MutableList, index: Int, status: DiagnoseStatus) {
+ items[index] = items[index].copy(status = status)
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/settings/SettingsScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/settings/SettingsScreen.kt
index add4489..cfbd802 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/ui/settings/SettingsScreen.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/settings/SettingsScreen.kt
@@ -39,7 +39,7 @@ class SettingsViewModel @Inject constructor(
private val tokenDataStore: TokenDataStore,
private val dynamicUrlInterceptor: DynamicUrlInterceptor,
private val apiService: ApiService,
- private val appUpdateManager: AppUpdateManager
+ val appUpdateManager: AppUpdateManager
) : ViewModel() {
private val _username = MutableStateFlow("admin")
@@ -87,13 +87,12 @@ class SettingsViewModel @Inject constructor(
fun checkUpdate() {
_updateMessage.value = "正在检查..."
- appUpdateManager.checkForUpdate { response ->
- _updateMessage.value = if (response.hasUpdate) {
- "发现新版本 ${response.latestVersion}"
- } else if (response.releaseNotes.isNotBlank()) {
- response.releaseNotes // error message
- } else {
- "已是最新版本 (${response.currentVersion})"
+ appUpdateManager.checkForUpdate(showNoUpdateToast = false)
+ viewModelScope.launch {
+ appUpdateManager.updateState.collect { state ->
+ if (!state.checking && !state.updateAvailable && state.downloadError == null) {
+ _updateMessage.value = "已是最新版本"
+ }
}
}
}
@@ -172,6 +171,8 @@ fun SettingsScreen(
onNavigateToAbout: (() -> Unit)? = null,
onNavigateToAccountSecurity: (() -> Unit)? = null,
onContactSupport: (() -> Unit)? = null,
+ onNavigateToSubscription: (() -> Unit)? = null,
+ onNavigateToNetworkDiagnose: (() -> Unit)? = null,
viewModel: SettingsViewModel = hiltViewModel()
) {
var showLogoutDialog by remember { mutableStateOf(false) }
@@ -410,6 +411,34 @@ fun SettingsScreen(
HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp))
+ // Network diagnostics
+ if (onNavigateToNetworkDiagnose != null) {
+ ListItem(
+ headlineContent = { Text("网络诊断") },
+ supportingContent = { Text("检测网络连接和服务状态") },
+ leadingContent = {
+ Icon(Icons.Default.NetworkCheck, contentDescription = null)
+ },
+ modifier = Modifier.clickable { onNavigateToNetworkDiagnose() }
+ )
+ HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp))
+ }
+
+ // Subscription (v1.2)
+ SettingsSectionHeader("订阅")
+ ListItem(
+ headlineContent = { Text("会员订阅") },
+ supportingContent = { Text("管理您的订阅方案") },
+ leadingContent = {
+ Icon(Icons.Default.WorkspacePremium, contentDescription = null)
+ },
+ modifier = if (onNavigateToSubscription != null) {
+ Modifier.clickable { onNavigateToSubscription() }
+ } else Modifier
+ )
+
+ HorizontalDivider(modifier = Modifier.padding(horizontal = 16.dp))
+
// About
SettingsSectionHeader("关于")
@@ -525,6 +554,9 @@ fun SettingsScreen(
}
)
}
+
+ // App update dialogs (download progress, etc.)
+ AppUpdateDialogs(updateManager = viewModel.appUpdateManager)
}
@Composable
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/splash/SplashScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/splash/SplashScreen.kt
new file mode 100644
index 0000000..3efac55
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/splash/SplashScreen.kt
@@ -0,0 +1,150 @@
+package com.tiangong.aiagent.ui.splash
+
+import androidx.compose.animation.core.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Android
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+/**
+ * Splash screen with professional branding, token validation, and routing.
+ * Pattern adapted from zhni_im SplashActivity.
+ *
+ * Flow:
+ * 1. Show animated branding (logo + title + subtitle) for min 1.5s
+ * 2. Validate token in background (check presence from data store)
+ * 3. Route: no token → Login, token + not onboarded → Onboarding, token + onboarded → Chat
+ */
+@Composable
+fun SplashScreen(
+ token: String?,
+ onboardingCompleted: Boolean,
+ onNavigateToLogin: () -> Unit,
+ onNavigateToOnboarding: () -> Unit,
+ onNavigateToChat: () -> Unit,
+ modifier: Modifier = Modifier
+) {
+ // Animations
+ val logoAlpha = remember { Animatable(0f) }
+ val titleAlpha = remember { Animatable(0f) }
+ val subtitleAlpha = remember { Animatable(0f) }
+ var isRouting by remember { mutableStateOf(false) }
+
+ // Gradient background colors
+ val gradient = Brush.verticalGradient(
+ colors = listOf(
+ Color(0xFF1A237E), // Deep indigo
+ Color(0xFF283593),
+ Color(0xFF3949AB)
+ )
+ )
+
+ LaunchedEffect(Unit) {
+ // Fade in sequences (parallel launches within coroutine scope)
+ coroutineScope {
+ launch { logoAlpha.animateTo(1f, animationSpec = tween(600, easing = FastOutSlowInEasing)) }
+ launch {
+ delay(300)
+ titleAlpha.animateTo(1f, animationSpec = tween(500, easing = FastOutSlowInEasing))
+ }
+ launch {
+ delay(600)
+ subtitleAlpha.animateTo(1f, animationSpec = tween(500, easing = FastOutSlowInEasing))
+ }
+ }
+ }
+
+ // Token validation + routing after minimum splash duration
+ LaunchedEffect(token, onboardingCompleted) {
+ if (isRouting) return@LaunchedEffect
+
+ // Minimum splash display time for professional feel
+ delay(1800)
+ isRouting = true
+
+ // Determine destination
+ when {
+ token == null -> onNavigateToLogin()
+ !onboardingCompleted -> onNavigateToOnboarding()
+ else -> onNavigateToChat()
+ }
+ }
+
+ Box(
+ modifier = modifier
+ .fillMaxSize()
+ .background(brush = gradient),
+ contentAlignment = Alignment.Center
+ ) {
+ Column(
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.Center
+ ) {
+ // App logo
+ Icon(
+ imageVector = Icons.Default.Android,
+ contentDescription = "天工智能体",
+ modifier = Modifier
+ .size(80.dp)
+ .alpha(logoAlpha.value),
+ tint = Color.White
+ )
+
+ Spacer(modifier = Modifier.height(24.dp))
+
+ // App title
+ Text(
+ text = "天工智能体",
+ modifier = Modifier.alpha(titleAlpha.value),
+ fontSize = 28.sp,
+ fontWeight = FontWeight.Bold,
+ color = Color.White
+ )
+
+ Spacer(modifier = Modifier.height(8.dp))
+
+ // Subtitle
+ Text(
+ text = "AI Agent Platform",
+ modifier = Modifier.alpha(subtitleAlpha.value),
+ fontSize = 14.sp,
+ fontWeight = FontWeight.Normal,
+ color = Color.White.copy(alpha = 0.7f)
+ )
+
+ Spacer(modifier = Modifier.height(48.dp))
+
+ // Loading indicator
+ CircularProgressIndicator(
+ modifier = Modifier
+ .size(24.dp)
+ .alpha(subtitleAlpha.value),
+ color = Color.White.copy(alpha = 0.6f),
+ strokeWidth = 2.dp
+ )
+ }
+
+ // Bottom version text
+ Text(
+ text = "v${com.tiangong.aiagent.BuildConfig.VERSION_NAME}",
+ modifier = Modifier
+ .align(Alignment.BottomCenter)
+ .padding(bottom = 32.dp),
+ fontSize = 12.sp,
+ color = Color.White.copy(alpha = 0.4f)
+ )
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/SubscriptionScreen.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/SubscriptionScreen.kt
new file mode 100644
index 0000000..c82e48c
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/SubscriptionScreen.kt
@@ -0,0 +1,329 @@
+package com.tiangong.aiagent.ui.subscription
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.WorkspacePremium
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+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 androidx.hilt.navigation.compose.hiltViewModel
+import com.tiangong.aiagent.data.remote.dto.BillingPlanDto
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SubscriptionScreen(
+ onBack: () -> Unit,
+ viewModel: SubscriptionViewModel = hiltViewModel()
+) {
+ val uiState by viewModel.uiState.collectAsState()
+
+ // Handle purchase success
+ LaunchedEffect(uiState.purchaseSuccess) {
+ if (uiState.purchaseSuccess != null) {
+ viewModel.clearPurchaseSuccess()
+ }
+ }
+
+ Scaffold(
+ topBar = {
+ TopAppBar(
+ title = { Text("会员订阅") },
+ navigationIcon = {
+ IconButton(onClick = onBack) {
+ Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "返回")
+ }
+ }
+ )
+ },
+ snackbarHost = {
+ if (uiState.error != null) {
+ Snackbar(
+ action = {
+ TextButton(onClick = { viewModel.clearError() }) { Text("关闭") }
+ }
+ ) { Text(uiState.error!!) }
+ }
+ }
+ ) { padding ->
+ if (uiState.isLoading) {
+ Box(Modifier.fillMaxSize().padding(padding), contentAlignment = Alignment.Center) {
+ CircularProgressIndicator()
+ }
+ } else {
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ .padding(padding)
+ .verticalScroll(rememberScrollState()),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ // Current tier banner
+ val currentTier = uiState.subscription?.tier ?: "free"
+ CurrentTierBanner(currentTier)
+
+ Spacer(Modifier.height(16.dp))
+
+ // Period toggle
+ Row(
+ modifier = Modifier.padding(horizontal = 16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text("月付", fontSize = 14.sp)
+ Switch(
+ checked = uiState.selectedPeriod == "yearly",
+ onCheckedChange = {
+ viewModel.selectPeriod(if (it) "yearly" else "monthly")
+ }
+ )
+ Text("年付", fontSize = 14.sp)
+ Spacer(Modifier.weight(1f))
+ if (uiState.selectedPeriod == "yearly") {
+ Text(
+ "省 43%",
+ color = Color(0xFF4CAF50),
+ fontSize = 12.sp,
+ fontWeight = FontWeight.Bold
+ )
+ }
+ }
+
+ Spacer(Modifier.height(16.dp))
+
+ // Plan cards
+ uiState.plans.forEachIndexed { index, plan ->
+ PlanCard(
+ plan = plan,
+ isCurrentPlan = plan.tier == currentTier,
+ isRecommended = plan.tier == "pro",
+ selectedPeriod = uiState.selectedPeriod,
+ isPurchasing = uiState.isPurchasing,
+ onPurchase = { viewModel.purchase(plan.id) }
+ )
+ if (index < uiState.plans.size - 1) {
+ Spacer(Modifier.height(12.dp))
+ }
+ }
+
+ Spacer(Modifier.height(24.dp))
+
+ // Features comparison
+ FeaturesComparison(uiState.plans)
+
+ Spacer(Modifier.height(32.dp))
+ }
+ }
+ }
+}
+
+@Composable
+private fun CurrentTierBanner(currentTier: String) {
+ val (label, color) = when (currentTier) {
+ "pro" -> "专业版" to Color(0xFF2196F3)
+ "enterprise" -> "企业版" to Color(0xFF9C27B0)
+ else -> "免费版" to Color(0xFF757575)
+ }
+ Surface(
+ modifier = Modifier.fillMaxWidth().padding(16.dp),
+ shape = MaterialTheme.shapes.large,
+ color = color.copy(alpha = 0.1f)
+ ) {
+ Row(
+ modifier = Modifier.padding(16.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ Icons.Default.WorkspacePremium,
+ contentDescription = null,
+ tint = color,
+ modifier = Modifier.size(32.dp)
+ )
+ Spacer(Modifier.width(12.dp))
+ Column {
+ Text("当前套餐", fontSize = 12.sp, color = Color.Gray)
+ Text(label, fontSize = 18.sp, fontWeight = FontWeight.Bold, color = color)
+ }
+ }
+ }
+}
+
+@Composable
+private fun PlanCard(
+ plan: BillingPlanDto,
+ isCurrentPlan: Boolean,
+ isRecommended: Boolean,
+ selectedPeriod: String,
+ isPurchasing: Boolean,
+ onPurchase: () -> Unit
+) {
+ val price = if (selectedPeriod == "yearly") plan.priceYearly else plan.priceMonthly
+ val priceLabel = if (selectedPeriod == "yearly") "/年" else "/月"
+ val isFree = plan.tier == "free"
+
+ Card(
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+ shape = MaterialTheme.shapes.large,
+ colors = CardDefaults.cardColors(
+ containerColor = if (isRecommended) MaterialTheme.colorScheme.primaryContainer
+ else MaterialTheme.colorScheme.surfaceVariant
+ ),
+ border = if (isRecommended) androidx.compose.foundation.BorderStroke(2.dp, MaterialTheme.colorScheme.primary)
+ else null
+ ) {
+ Column(
+ modifier = Modifier.padding(20.dp),
+ horizontalAlignment = Alignment.CenterHorizontally
+ ) {
+ if (isRecommended) {
+ Surface(
+ shape = MaterialTheme.shapes.small,
+ color = MaterialTheme.colorScheme.primary
+ ) {
+ Text(
+ "推荐",
+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp),
+ fontSize = 12.sp,
+ color = MaterialTheme.colorScheme.onPrimary
+ )
+ }
+ Spacer(Modifier.height(8.dp))
+ }
+
+ Text(plan.name, fontSize = 20.sp, fontWeight = FontWeight.Bold)
+ Spacer(Modifier.height(8.dp))
+
+ Row(verticalAlignment = Alignment.Bottom) {
+ Text("¥", fontSize = 16.sp, fontWeight = FontWeight.Bold)
+ Text("${price.toInt()}", fontSize = 36.sp, fontWeight = FontWeight.Bold)
+ Text(priceLabel, fontSize = 14.sp, color = Color.Gray)
+ }
+
+ Spacer(Modifier.height(16.dp))
+
+ // Features
+ plan.features?.forEach { feature ->
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ Icons.Default.Check,
+ contentDescription = null,
+ tint = Color(0xFF4CAF50),
+ modifier = Modifier.size(16.dp)
+ )
+ Spacer(Modifier.width(8.dp))
+ Text(feature, fontSize = 13.sp)
+ }
+ }
+
+ Spacer(Modifier.height(16.dp))
+
+ // Action button
+ if (isCurrentPlan) {
+ OutlinedButton(
+ onClick = {},
+ modifier = Modifier.fillMaxWidth(),
+ enabled = false
+ ) {
+ Text("当前方案")
+ }
+ } else if (isFree) {
+ // Free plan with non-free current — should not happen for upgrade
+ OutlinedButton(
+ onClick = onPurchase,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = !isPurchasing
+ ) {
+ Text("升级到 Pro")
+ }
+ } else {
+ Button(
+ onClick = onPurchase,
+ modifier = Modifier.fillMaxWidth(),
+ enabled = !isPurchasing
+ ) {
+ if (isPurchasing) {
+ CircularProgressIndicator(
+ modifier = Modifier.size(20.dp),
+ strokeWidth = 2.dp
+ )
+ } else {
+ Text(if (isCurrentPlan) "当前方案" else "立即订阅")
+ }
+ }
+ }
+ }
+ }
+}
+
+@Composable
+private fun FeaturesComparison(plans: List) {
+ Text(
+ "权益对比",
+ fontSize = 18.sp,
+ fontWeight = FontWeight.Bold,
+ modifier = Modifier.padding(horizontal = 16.dp)
+ )
+ Spacer(Modifier.height(12.dp))
+
+ val compareItems = listOf(
+ "每日对话" to { p: BillingPlanDto -> if (p.dailyQuota == 0) "无限" else "${p.dailyQuota}次" },
+ "智能体数量" to { p: BillingPlanDto -> if (p.agentLimit == 0) "无限" else "${p.agentLimit}个" },
+ "知识条目" to { p: BillingPlanDto -> if (p.knowledgeLimit == 0) "无限" else "${p.knowledgeLimit}条" },
+ "文件上传" to { p: BillingPlanDto -> "${p.fileUploadMb} MB" },
+ "高级模型" to { p: BillingPlanDto ->
+ (p.models?.size?.minus(1)?.let { "+${it}" } ?: "0")
+ }
+ )
+
+ Card(
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+ shape = MaterialTheme.shapes.large
+ ) {
+ Column(Modifier.padding(16.dp)) {
+ // Header
+ Row(Modifier.fillMaxWidth()) {
+ Spacer(Modifier.weight(1.2f))
+ plans.forEach { plan ->
+ Text(
+ plan.name,
+ modifier = Modifier.weight(1f),
+ textAlign = TextAlign.Center,
+ fontSize = 13.sp,
+ fontWeight = FontWeight.Bold
+ )
+ }
+ }
+ HorizontalDivider(Modifier.padding(vertical = 8.dp))
+
+ compareItems.forEach { (label, extractor) ->
+ Row(
+ Modifier.fillMaxWidth().padding(vertical = 6.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Text(label, modifier = Modifier.weight(1.2f), fontSize = 13.sp)
+ plans.forEach { plan ->
+ Text(
+ extractor(plan),
+ modifier = Modifier.weight(1f),
+ textAlign = TextAlign.Center,
+ fontSize = 13.sp,
+ fontWeight = if (plan.tier == "pro") FontWeight.Bold else FontWeight.Normal
+ )
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/SubscriptionViewModel.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/SubscriptionViewModel.kt
new file mode 100644
index 0000000..4d9f548
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/SubscriptionViewModel.kt
@@ -0,0 +1,124 @@
+package com.tiangong.aiagent.ui.subscription
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tiangong.aiagent.data.remote.dto.BillingPlanDto
+import com.tiangong.aiagent.data.remote.dto.CreateOrderRequest
+import com.tiangong.aiagent.data.remote.dto.OrderResponseDto
+import com.tiangong.aiagent.data.remote.dto.UserSubscriptionDto
+import com.tiangong.aiagent.data.remote.dto.UserUsageDto
+import com.tiangong.aiagent.data.repository.BillingRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+data class SubscriptionUiState(
+ val plans: List = emptyList(),
+ val subscription: UserSubscriptionDto? = null,
+ val usage: UserUsageDto? = null,
+ val isLoading: Boolean = false,
+ val isPurchasing: Boolean = false,
+ val selectedPeriod: String = "monthly",
+ val error: String? = null,
+ val purchaseSuccess: String? = null,
+ val showUpgradeDialog: Boolean = false
+)
+
+@HiltViewModel
+class SubscriptionViewModel @Inject constructor(
+ private val billingRepository: BillingRepository
+) : ViewModel() {
+
+ private val _uiState = MutableStateFlow(SubscriptionUiState())
+ val uiState: StateFlow = _uiState.asStateFlow()
+
+ init {
+ loadData()
+ }
+
+ fun loadData() {
+ viewModelScope.launch {
+ _uiState.update { it.copy(isLoading = true, error = null) }
+ // Load plans (public, no auth needed)
+ billingRepository.getPlans().fold(
+ onSuccess = { plans -> _uiState.update { it.copy(plans = plans) } },
+ onFailure = { e -> Log.e("SubscriptionVM", "Failed to load plans", e) }
+ )
+ // Load subscription
+ billingRepository.getUserSubscription().fold(
+ onSuccess = { sub -> _uiState.update { it.copy(subscription = sub) } },
+ onFailure = { e -> Log.e("SubscriptionVM", "Failed to load subscription", e) }
+ )
+ // Load usage
+ billingRepository.getUserUsage().fold(
+ onSuccess = { usage -> _uiState.update { it.copy(usage = usage) } },
+ onFailure = { e -> Log.e("SubscriptionVM", "Failed to load usage", e) }
+ )
+ _uiState.update { it.copy(isLoading = false) }
+ }
+ }
+
+ fun loadUsage() {
+ viewModelScope.launch {
+ billingRepository.getUserUsage().fold(
+ onSuccess = { usage -> _uiState.update { it.copy(usage = usage) } },
+ onFailure = { e -> Log.e("SubscriptionVM", "Failed to load usage", e) }
+ )
+ }
+ }
+
+ fun selectPeriod(period: String) {
+ _uiState.update { it.copy(selectedPeriod = period) }
+ }
+
+ fun purchase(planId: String) {
+ viewModelScope.launch {
+ _uiState.update { it.copy(isPurchasing = true, error = null) }
+ val period = _uiState.value.selectedPeriod
+ billingRepository.createOrder(CreateOrderRequest(planId, period, "mock"))
+ .fold(
+ onSuccess = { order ->
+ // Pay the order
+ billingRepository.payOrder(order.id).fold(
+ onSuccess = { result ->
+ _uiState.update {
+ it.copy(
+ isPurchasing = false,
+ purchaseSuccess = result.message
+ )
+ }
+ loadData()
+ },
+ onFailure = { e ->
+ _uiState.update {
+ it.copy(isPurchasing = false, error = e.message ?: "支付失败")
+ }
+ }
+ )
+ },
+ onFailure = { e ->
+ _uiState.update {
+ it.copy(isPurchasing = false, error = e.message ?: "创建订单失败")
+ }
+ }
+ )
+ }
+ }
+
+ fun clearError() {
+ _uiState.update { it.copy(error = null) }
+ }
+
+ fun clearPurchaseSuccess() {
+ _uiState.update { it.copy(purchaseSuccess = null) }
+ }
+
+ fun dismissUpgradeDialog() {
+ _uiState.update { it.copy(showUpgradeDialog = false) }
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/UpgradeDialog.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/UpgradeDialog.kt
new file mode 100644
index 0000000..9f83a76
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/UpgradeDialog.kt
@@ -0,0 +1,34 @@
+package com.tiangong.aiagent.ui.subscription
+
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun UpgradeDialog(
+ title: String = "升级会员",
+ message: String = "今日免费对话次数已用完，升级专业版享受每日 500 次对话和更多高级功能。",
+ onDismiss: () -> Unit,
+ onUpgrade: () -> Unit
+) {
+ AlertDialog(
+ onDismissRequest = onDismiss,
+ title = {
+ Text(title, fontWeight = FontWeight.Bold)
+ },
+ text = {
+ Text(message, fontSize = 14.sp)
+ },
+ confirmButton = {
+ Button(onClick = onUpgrade) {
+ Text("立即升级")
+ }
+ },
+ dismissButton = {
+ TextButton(onClick = onDismiss) {
+ Text("稍后再说")
+ }
+ }
+ )
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/UsageIndicator.kt b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/UsageIndicator.kt
new file mode 100644
index 0000000..6f1c0ae
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/ui/subscription/UsageIndicator.kt
@@ -0,0 +1,100 @@
+package com.tiangong.aiagent.ui.subscription
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.WorkspacePremium
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+
+@Composable
+fun UsageIndicator(
+ onClick: () -> Unit,
+ viewModel: SubscriptionViewModel = hiltViewModel()
+) {
+ val uiState = viewModel.uiState.collectAsState()
+ val usage = uiState.value.usage
+ val dailyUsed = usage?.dailyUsed ?: 0
+ val dailyLimit = usage?.dailyLimit ?: 50
+ val dailyRemaining = usage?.dailyRemaining ?: 50
+ val isExhausted = usage?.isExhausted ?: false
+
+ // Refresh usage periodically
+ LaunchedEffect(Unit) {
+ viewModel.loadUsage()
+ }
+
+ val fraction = if (dailyLimit > 0) (dailyUsed.toFloat() / dailyLimit).coerceIn(0f, 1f) else 0f
+ val progressColor = when {
+ isExhausted -> Color(0xFFE53935)
+ fraction > 0.8f -> Color(0xFFFFA726)
+ else -> MaterialTheme.colorScheme.primary
+ }
+
+ Surface(
+ modifier = Modifier
+ .fillMaxWidth()
+ .clickable(onClick = onClick),
+ color = if (isExhausted) Color(0xFFFFEBEE) else MaterialTheme.colorScheme.surface,
+ tonalElevation = 1.dp
+ ) {
+ Row(
+ modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Icon(
+ Icons.Default.WorkspacePremium,
+ contentDescription = null,
+ tint = if (isExhausted) Color(0xFFE53935) else MaterialTheme.colorScheme.primary,
+ modifier = Modifier.size(18.dp)
+ )
+ Spacer(Modifier.width(8.dp))
+
+ Column(Modifier.weight(1f)) {
+ Text(
+ if (isExhausted) "今日次数已用完" else "今日剩余 $dailyRemaining 次",
+ fontSize = 12.sp,
+ color = if (isExhausted) Color(0xFFE53935) else MaterialTheme.colorScheme.onSurface
+ )
+ Spacer(Modifier.height(2.dp))
+ Box(
+ modifier = Modifier
+ .fillMaxWidth()
+ .height(4.dp)
+ .clip(RoundedCornerShape(2.dp))
+ .background(progressColor.copy(alpha = 0.2f))
+ ) {
+ Box(
+ modifier = Modifier
+ .fillMaxWidth(fraction)
+ .height(4.dp)
+ .clip(RoundedCornerShape(2.dp))
+ .background(progressColor)
+ )
+ }
+ }
+
+ if (isExhausted) {
+ Text(
+ "升级",
+ fontSize = 12.sp,
+ color = MaterialTheme.colorScheme.primary,
+ fontWeight = FontWeight.Bold
+ )
+ }
+ }
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/util/AnalyticsTracker.kt b/android/app/src/main/java/com/tiangong/aiagent/util/AnalyticsTracker.kt
new file mode 100644
index 0000000..67754d2
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/util/AnalyticsTracker.kt
@@ -0,0 +1,99 @@
+package com.tiangong.aiagent.util
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import com.tiangong.aiagent.data.remote.ApiService
+import com.tiangong.aiagent.data.remote.dto.AnalyticsEventItem
+import com.tiangong.aiagent.data.remote.dto.AnalyticsEventsRequest
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.*
+import java.time.Instant
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@HiltViewModel
+class AnalyticsViewModel @Inject constructor(
+ val tracker: AnalyticsTracker
+) : ViewModel()
+
+@Singleton
+class AnalyticsTracker @Inject constructor(
+ private val apiService: ApiService
+) {
+ companion object {
+ private const val TAG = "AnalyticsTracker"
+ private const val BATCH_SIZE = 10
+ private const val FLUSH_INTERVAL_MS = 30_000L
+ }
+
+ private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+ private val eventQueue = mutableListOf()
+ private var flushJob: Job? = null
+
+ fun trackScreen(screenName: String) {
+ enqueue(AnalyticsEventItem(
+ eventType = "screen_view",
+ screenName = screenName,
+ timestamp = Instant.now().toString()
+ ))
+ }
+
+ fun trackEvent(category: String, action: String, label: String? = null, agentId: String? = null) {
+ enqueue(AnalyticsEventItem(
+ eventType = "user_action",
+ category = category,
+ action = action,
+ label = label,
+ agentId = agentId,
+ timestamp = Instant.now().toString()
+ ))
+ }
+
+ private fun enqueue(event: AnalyticsEventItem) {
+ synchronized(eventQueue) {
+ eventQueue.add(event)
+ if (eventQueue.size >= BATCH_SIZE) {
+ flushInternal()
+ } else {
+ scheduleFlush()
+ }
+ }
+ }
+
+ private fun scheduleFlush() {
+ flushJob?.cancel()
+ flushJob = scope.launch {
+ delay(FLUSH_INTERVAL_MS)
+ synchronized(eventQueue) {
+ if (eventQueue.isNotEmpty()) {
+ flushInternal()
+ }
+ }
+ }
+ }
+
+ private fun flushInternal() {
+ if (eventQueue.isEmpty()) return
+ val batch = eventQueue.toList()
+ eventQueue.clear()
+ scope.launch {
+ try {
+ apiService.sendAnalyticsEvents(AnalyticsEventsRequest(events = batch))
+ } catch (e: Exception) {
+ Log.w(TAG, "Failed to flush analytics events: ${e.message}")
+ // Re-queue on failure (up to max)
+ synchronized(eventQueue) {
+ if (eventQueue.size < 50) {
+ eventQueue.addAll(0, batch.take(10))
+ }
+ }
+ }
+ }
+ }
+
+ fun flush() {
+ synchronized(eventQueue) {
+ flushInternal()
+ }
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/util/AppUpdateManager.kt b/android/app/src/main/java/com/tiangong/aiagent/util/AppUpdateManager.kt
index 825c16d..579c36a 100644
--- a/android/app/src/main/java/com/tiangong/aiagent/util/AppUpdateManager.kt
+++ b/android/app/src/main/java/com/tiangong/aiagent/util/AppUpdateManager.kt
@@ -1,107 +1,247 @@
package com.tiangong.aiagent.util
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import android.content.IntentFilter
import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.util.Log
+import androidx.core.content.FileProvider
import com.tiangong.aiagent.BuildConfig
import com.tiangong.aiagent.data.remote.ApiService
import com.tiangong.aiagent.data.remote.dto.AppVersionResponse
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
import javax.inject.Inject
import javax.inject.Singleton
+/**
+ * App update state for Compose UI observation.
+ */
+data class UpdateState(
+ val checking: Boolean = false,
+ val updateAvailable: Boolean = false,
+ val downloading: Boolean = false,
+ val downloadProgress: Int = 0, // 0-100
+ val downloadError: String? = null,
+ val downloadComplete: Boolean = false,
+ val response: AppVersionResponse? = null,
+ val forceUpdate: Boolean = false,
+ val apkFilePath: String? = null
+)
+
@Singleton
class AppUpdateManager @Inject constructor(
@ApplicationContext private val context: Context,
private val apiService: ApiService
) {
- /**
- * Check for app update asynchronously. If update is found, shows a dialog.
- * Called from MainActivity.onCreate().
- */
- fun checkForUpdate(onResult: ((AppVersionResponse) -> Unit)? = null) {
- CoroutineScope(Dispatchers.IO).launch {
+ companion object {
+ private const val TAG = "AppUpdateManager"
+ private const val APK_FILE_NAME = "tiangong_update.apk"
+ }
+
+ private val scope = CoroutineScope(Dispatchers.IO)
+ private val _updateState = MutableStateFlow(UpdateState())
+ val updateState: StateFlow = _updateState.asStateFlow()
+
+ /** Check for update from server. */
+ fun checkForUpdate(showNoUpdateToast: Boolean = false) {
+ scope.launch {
+ _updateState.value = _updateState.value.copy(checking = true)
try {
val response = apiService.checkUpdate(
platform = "android",
version = BuildConfig.VERSION_NAME
)
- withContext(Dispatchers.Main) {
- if (response.hasUpdate) {
- showUpdateDialog(response)
- }
- onResult?.invoke(response)
- }
+ val hasUpdate = response.hasUpdate &&
+ VersionUtils.compareVersion(BuildConfig.VERSION_NAME, response.latestVersion) < 0
+
+ _updateState.value = _updateState.value.copy(
+ checking = false,
+ updateAvailable = hasUpdate,
+ forceUpdate = response.forceUpdate,
+ response = response
+ )
} catch (e: Exception) {
- withContext(Dispatchers.Main) {
- onResult?.invoke(
- AppVersionResponse(
- latestVersion = "", currentVersion = BuildConfig.VERSION_NAME,
- hasUpdate = false, forceUpdate = false,
- releaseNotes = "检查失败: ${e.message}"
- )
+ Log.w(TAG, "Version check failed: ${e.message}")
+ _updateState.value = _updateState.value.copy(
+ checking = false,
+ updateAvailable = false,
+ downloadError = if (showNoUpdateToast) "版本检查失败" else null
+ )
+ }
+ }
+ }
+
+ /** Start downloading the APK in-app with progress tracking. */
+ fun startDownload() {
+ val response = _updateState.value.response ?: return
+ val url = response.updateUrl
+ if (url.isBlank()) {
+ _updateState.value = _updateState.value.copy(
+ downloadError = "下载地址无效"
+ )
+ return
+ }
+
+ _updateState.value = _updateState.value.copy(
+ downloading = true,
+ downloadProgress = 0,
+ downloadError = null,
+ downloadComplete = false
+ )
+
+ scope.launch {
+ downloadApk(url)
+ }
+ }
+
+ private suspend fun downloadApk(urlStr: String) {
+ withContext(Dispatchers.IO) {
+ var conn: HttpURLConnection? = null
+ var fos: FileOutputStream? = null
+ try {
+ val apkFile = getApkFile()
+ // Ensure parent directory exists
+ apkFile.parentFile?.mkdirs()
+
+ val url = URL(urlStr)
+ conn = (url.openConnection() as HttpURLConnection).apply {
+ connectTimeout = 15_000
+ readTimeout = 60_000
+ setRequestProperty("Accept-Encoding", "identity")
+ connect()
+ }
+
+ if (conn.responseCode != HttpURLConnection.HTTP_OK) {
+ _updateState.value = _updateState.value.copy(
+ downloading = false,
+ downloadError = "服务器错误: ${conn.responseCode}"
)
+ return@withContext
+ }
+
+ val totalSize = conn.contentLength.toLong()
+ val input = conn.inputStream
+ fos = FileOutputStream(apkFile)
+
+ val buffer = ByteArray(8192)
+ var downloaded = 0L
+ var lastProgress = -1
+
+ while (true) {
+ val read = input.read(buffer)
+ if (read == -1) break
+ fos.write(buffer, 0, read)
+ downloaded += read
+
+ if (totalSize > 0) {
+ val progress = ((downloaded * 100) / totalSize).toInt()
+ if (progress != lastProgress) {
+ lastProgress = progress
+ _updateState.value = _updateState.value.copy(downloadProgress = progress)
+ }
+ }
+ }
+
+ _updateState.value = _updateState.value.copy(
+ downloading = false,
+ downloadProgress = 100,
+ downloadComplete = true,
+ apkFilePath = apkFile.absolutePath
+ )
+
+ Log.d(TAG, "APK download complete: ${apkFile.absolutePath} (${apkFile.length()} bytes)")
+ } catch (e: Exception) {
+ Log.e(TAG, "APK download failed", e)
+ _updateState.value = _updateState.value.copy(
+ downloading = false,
+ downloadError = when {
+ e.message?.contains("timeout", ignoreCase = true) == true -> "下载超时，请检查网络"
+ e.message?.contains("Network", ignoreCase = true) == true -> "网络连接失败"
+ else -> "下载失败: ${e.message}"
+ }
+ )
+ } finally {
+ try { fos?.close() } catch (_: Exception) {}
+ try { conn?.disconnect() } catch (_: Exception) {}
+ }
+ }
+ }
+
+ /** Install the downloaded APK via FileProvider. */
+ fun installApk() {
+ val path = _updateState.value.apkFilePath
+ if (path == null) {
+ _updateState.value = _updateState.value.copy(downloadError = "安装包不存在")
+ return
+ }
+ val apkFile = File(path)
+ if (!apkFile.exists()) {
+ _updateState.value = _updateState.value.copy(downloadError = "安装包文件不存在")
+ return
+ }
+
+ try {
+ val intent = Intent(Intent.ACTION_VIEW).apply {
+ addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ val authority = "${context.packageName}.fileprovider"
+ val apkUri = FileProvider.getUriForFile(context, authority, apkFile)
+ addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+ setDataAndType(apkUri, "application/vnd.android.package-archive")
+ } else {
+ @Suppress("DEPRECATION")
+ setDataAndType(Uri.fromFile(apkFile), "application/vnd.android.package-archive")
}
}
- }
- }
-
- private fun showUpdateDialog(response: AppVersionResponse) {
- try {
- val builder = if (response.forceUpdate) {
- android.app.AlertDialog.Builder(context)
- .setTitle("发现新版本 ${response.latestVersion}")
- .setMessage(buildDialogMessage(response))
- .setCancelable(false)
- .setPositiveButton("立即更新") { _, _ ->
- openDownloadUrl(response.updateUrl)
- }
- } else {
- android.app.AlertDialog.Builder(context)
- .setTitle("发现新版本 ${response.latestVersion}")
- .setMessage(buildDialogMessage(response))
- .setCancelable(true)
- .setPositiveButton("立即更新") { _, _ ->
- openDownloadUrl(response.updateUrl)
- }
- .setNegativeButton("稍后", null)
- }
-
- // Show dialog from a new activity context is safer but we use application context
- // wrapped in a theme dialog
- val dialog = builder.create()
- // Ensure dialog is shown in an activity context if possible
- dialog.show()
- } catch (_: Exception) {
- // Fallback: open browser
- try {
- openDownloadUrl(response.updateUrl)
- } catch (_: Exception) { }
- }
- }
-
- private fun buildDialogMessage(response: AppVersionResponse): String {
- val sb = StringBuilder()
- sb.append("当前版本: ${BuildConfig.VERSION_NAME}\n")
- sb.append("最新版本: ${response.latestVersion}\n")
- if (response.releaseNotes.isNotBlank()) {
- sb.append("\n更新内容:\n${response.releaseNotes}")
- }
- if (response.forceUpdate) {
- sb.append("\n\n此版本为强制更新，请立即升级。")
- }
- return sb.toString()
- }
-
- private fun openDownloadUrl(url: String) {
- try {
- val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
- } catch (_: Exception) { }
+ } catch (e: Exception) {
+ Log.e(TAG, "Install failed", e)
+ _updateState.value = _updateState.value.copy(
+ downloadError = "安装失败: ${e.message}"
+ )
+ }
+ }
+
+ /** Open download URL in browser (fallback). */
+ fun openInBrowser() {
+ val url = _updateState.value.response?.updateUrl ?: return
+ try {
+ val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
+ addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ }
+ context.startActivity(intent)
+ } catch (_: Exception) {}
+ }
+
+ /** Reset update state. */
+ fun reset() {
+ _updateState.value = UpdateState()
+ }
+
+ /** Get the target APK file path. */
+ fun getApkFile(): File {
+ val dir = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+ ?: context.filesDir
+ } else {
+ @Suppress("DEPRECATION")
+ Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+ }
+ return File(dir, APK_FILE_NAME)
}
}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/util/CrashHandler.kt b/android/app/src/main/java/com/tiangong/aiagent/util/CrashHandler.kt
new file mode 100644
index 0000000..88a7dfd
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/util/CrashHandler.kt
@@ -0,0 +1,90 @@
+package com.tiangong.aiagent.util
+
+import android.os.Environment
+import android.util.Log
+import java.io.File
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/**
+ * Crash log handler that writes uncaught exceptions to file before delegating
+ * to the previous handler (e.g. Bugly).
+ *
+ * Usage: CrashHandler.init() after Bugly.initCrashReport() in TiangongApp.onCreate()
+ */
+object CrashHandler : Thread.UncaughtExceptionHandler {
+
+ private const val TAG = "CrashHandler"
+ private const val MAX_LOG_FILES = 5
+
+ private var previousHandler: Thread.UncaughtExceptionHandler? = null
+ private var crashDir: File? = null
+
+ fun init() {
+ if (previousHandler != null) return // already initialized
+
+ previousHandler = Thread.getDefaultUncaughtExceptionHandler()
+
+ // Don't chain ourselves if we're already set (unlikely but defensive)
+ if (previousHandler is CrashHandler) return
+
+ Thread.setDefaultUncaughtExceptionHandler(this)
+ }
+
+ fun setCrashDir(dir: File) {
+ crashDir = dir
+ }
+
+ override fun uncaughtException(thread: Thread, throwable: Throwable) {
+ try {
+ writeCrashLog(throwable)
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to write crash log", e)
+ }
+
+ // Delegate to previous handler (Bugly or system default)
+ previousHandler?.uncaughtException(thread, throwable)
+ }
+
+ private fun writeCrashLog(throwable: Throwable) {
+ val dir = crashDir ?: run {
+ val extDir = Environment.getExternalStorageDirectory()
+ ?: return
+ File(extDir, "Tiangong/crashes").also {
+ it.mkdirs()
+ }
+ }
+
+ if (!dir.exists()) dir.mkdirs()
+
+ // Rotate log files (keep MAX_LOG_FILES)
+ val logFiles = dir.listFiles { f -> f.extension == "log" }
+ ?.sortedByDescending { it.lastModified() } ?: emptyList()
+ logFiles.drop(MAX_LOG_FILES - 1).forEach { it.delete() }
+
+ val dateStr = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
+ val crashFile = File(dir, "crash_$dateStr.log")
+
+ val sw = StringWriter()
+ val pw = PrintWriter(sw)
+ pw.println("Crash Time: ${SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.US).format(Date())}")
+ pw.println()
+ throwable.printStackTrace(pw)
+
+ // Also include cause chain
+ var cause = throwable.cause
+ while (cause != null) {
+ pw.println()
+ pw.println("Caused by:")
+ cause.printStackTrace(pw)
+ cause = cause.cause
+ }
+
+ pw.flush()
+ crashFile.writeText(sw.toString())
+ Log.i(TAG, "Crash log written to ${crashFile.absolutePath}")
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/util/UmengHelper.kt b/android/app/src/main/java/com/tiangong/aiagent/util/UmengHelper.kt
new file mode 100644
index 0000000..09c87f7
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/util/UmengHelper.kt
@@ -0,0 +1,179 @@
+package com.tiangong.aiagent.util
+
+import android.content.Context
+import android.util.Log
+import com.umeng.analytics.MobclickAgent
+import com.umeng.commonsdk.UMConfigure
+import com.tiangong.aiagent.BuildConfig
+
+/**
+ * Umeng (友盟) statistics helper.
+ * Ported from zhini_im project's UmengAnalytics.java + UmengDebugHelper.java.
+ *
+ * Provides page tracking, custom event tracking, user profile tracking,
+ * and debug utilities for verifying SDK integration.
+ */
+object UmengHelper {
+
+ private const val TAG = "UmengHelper"
+ private const val UMENG_APP_KEY = "69009244644c9e2c2067d39b"
+ private const val UMENG_CHANNEL = "default"
+
+ @Volatile
+ private var initialized = false
+
+ /** Initialize Umeng SDK. Call from Application.onCreate() BEFORE UI loads. */
+ fun init(context: Context) {
+ if (initialized) return
+
+ try {
+ // Pre-init: set log level, session timeout, etc.
+ UMConfigure.setLogEnabled(BuildConfig.DEBUG)
+ UMConfigure.preInit(context, UMENG_APP_KEY, UMENG_CHANNEL)
+
+ // Main init: encrypt enabled, analytics + push configs
+ UMConfigure.init(
+ context,
+ UMENG_APP_KEY,
+ UMENG_CHANNEL,
+ UMConfigure.DEVICE_TYPE_PHONE,
+ null // push secret (not used for analytics-only integration)
+ )
+
+ // Enable auto page tracking (Activity lifecycle callbacks)
+ MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO)
+
+ // Session timeout: 30 seconds (default)
+ MobclickAgent.setSessionContinueMillis(30_000)
+
+ initialized = true
+ Log.d(TAG, "Umeng SDK initialized successfully")
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to initialize Umeng SDK", e)
+ }
+ }
+
+ fun isInitialized(): Boolean = initialized
+
+ // ─── Page Tracking ──────────────────────────────────────────────
+
+ fun onPageStart(pageName: String) {
+ try {
+ if (initialized) {
+ MobclickAgent.onPageStart(pageName)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "onPageStart failed: $pageName", e)
+ }
+ }
+
+ fun onPageEnd(pageName: String) {
+ try {
+ if (initialized) {
+ MobclickAgent.onPageEnd(pageName)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "onPageEnd failed: $pageName", e)
+ }
+ }
+
+ // ─── Event Tracking ─────────────────────────────────────────────
+
+ /** Simple event without parameters. */
+ fun onEvent(context: Context, eventId: String) {
+ try {
+ if (initialized) {
+ MobclickAgent.onEvent(context, eventId)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "onEvent failed: $eventId", e)
+ }
+ }
+
+ /** Event with a label. */
+ fun onEvent(context: Context, eventId: String, label: String) {
+ try {
+ if (initialized) {
+ MobclickAgent.onEvent(context, eventId, label)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "onEvent failed: $eventId", e)
+ }
+ }
+
+ /** Event with custom key-value parameters. */
+ fun onEvent(context: Context, eventId: String, params: Map) {
+ try {
+ if (initialized) {
+ MobclickAgent.onEvent(context, eventId, params)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "onEvent failed: $eventId", e)
+ }
+ }
+
+ // ─── User Profile ───────────────────────────────────────────────
+
+ /** Sign in user for analytics (call after login). */
+ fun onProfileSignIn(userId: String) {
+ try {
+ if (initialized) {
+ MobclickAgent.onProfileSignIn(userId)
+ Log.d(TAG, "User signed in: $userId")
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "onProfileSignIn failed", e)
+ }
+ }
+
+ /** Sign out user (call on logout). */
+ fun onProfileSignOff() {
+ try {
+ if (initialized) {
+ MobclickAgent.onProfileSignOff()
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "onProfileSignOff failed", e)
+ }
+ }
+
+ // ─── Debug Utilities ────────────────────────────────────────────
+
+ /** Send test events to verify Umeng integration. */
+ fun sendTestEvents(context: Context) {
+ if (!initialized) {
+ Log.w(TAG, "SDK not initialized, skipping test events")
+ return
+ }
+ Log.d(TAG, "Sending Umeng test events...")
+ onEvent(context, "umeng_debug_test", "environment_check")
+ onEvent(context, "umeng_custom_debug", mapOf(
+ "test_type" to "debug",
+ "timestamp" to System.currentTimeMillis().toString(),
+ "device_model" to android.os.Build.MODEL,
+ "android_version" to android.os.Build.VERSION.RELEASE
+ ))
+ Log.d(TAG, "Test events sent")
+ }
+
+ /** Force flush cached analytics data to server. */
+ fun forceFlush(context: Context) {
+ try {
+ if (initialized) {
+ MobclickAgent.onKillProcess(context)
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "forceFlush failed", e)
+ }
+ }
+
+ fun getDebugInfo(): String {
+ return buildString {
+ appendLine("=== Umeng Analytics Debug ===")
+ appendLine("SDK initialized: $initialized")
+ appendLine("Device: ${android.os.Build.MODEL}")
+ appendLine("Android: ${android.os.Build.VERSION.RELEASE}")
+ appendLine("SDK version: 9.8.8")
+ }
+ }
+}
diff --git a/android/app/src/main/java/com/tiangong/aiagent/util/VersionUtils.kt b/android/app/src/main/java/com/tiangong/aiagent/util/VersionUtils.kt
new file mode 100644
index 0000000..91c29af
--- /dev/null
+++ b/android/app/src/main/java/com/tiangong/aiagent/util/VersionUtils.kt
@@ -0,0 +1,67 @@
+package com.tiangong.aiagent.util
+
+import android.content.Context
+import android.content.pm.PackageManager
+
+/**
+ * Version comparison and info utilities.
+ * Ported from zhini_im project's VersionUtils.java.
+ */
+object VersionUtils {
+
+ /**
+ * Compare two semantic version strings.
+ * @return -1 if v1 < v2, 0 if equal, 1 if v1 > v2
+ */
+ fun compareVersion(v1: String, v2: String): Int {
+ if (v1 == v2) return 0
+ val parts1 = v1.split(".").map { it.toIntOrNull() ?: 0 }
+ val parts2 = v2.split(".").map { it.toIntOrNull() ?: 0 }
+ val minLen = minOf(parts1.size, parts2.size)
+ for (i in 0 until minLen) {
+ val diff = parts1[i] - parts2[i]
+ if (diff != 0) return if (diff > 0) 1 else -1
+ }
+ // If common prefix matches, longer version with non-zero parts is newer
+ for (i in minLen until parts1.size) {
+ if (parts1[i] > 0) return 1
+ }
+ for (i in minLen until parts2.size) {
+ if (parts2[i] > 0) return -1
+ }
+ return 0
+ }
+
+ fun getVersionName(context: Context): String {
+ return try {
+ val info = context.packageManager.getPackageInfo(context.packageName, 0)
+ info.versionName ?: "1.0.0"
+ } catch (_: PackageManager.NameNotFoundException) {
+ "1.0.0"
+ }
+ }
+
+ fun getVersionCode(context: Context): Long {
+ return try {
+ val info = context.packageManager.getPackageInfo(context.packageName, 0)
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
+ info.longVersionCode
+ } else {
+ @Suppress("DEPRECATION")
+ info.versionCode.toLong()
+ }
+ } catch (_: PackageManager.NameNotFoundException) {
+ 1L
+ }
+ }
+
+ fun getAppName(context: Context): String {
+ return try {
+ val pm = context.packageManager
+ val info = pm.getApplicationInfo(context.packageName, 0)
+ pm.getApplicationLabel(info).toString()
+ } catch (_: PackageManager.NameNotFoundException) {
+ "天工智能体"
+ }
+ }
+}
diff --git a/android/app/src/main/res/xml/file_paths.xml b/android/app/src/main/res/xml/file_paths.xml
new file mode 100644
index 0000000..32e28fc
--- /dev/null
+++ b/android/app/src/main/res/xml/file_paths.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index a527516..04416d4 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -87,6 +87,12 @@ markwon-core = { group = "io.noties.markwon", name = "core", version.ref = "mark
markwon-image = { group = "io.noties.markwon", name = "image-coil", version.ref = "markwon" }
markwon-linkify = { group = "io.noties.markwon", name = "linkify", version.ref = "markwon" }
+# Umeng Analytics (from zhini_im)
+umeng-common = { group = "com.umeng.umsdk", name = "common", version = "9.8.8" }
+umeng-asms = { group = "com.umeng.umsdk", name = "asms", version = "1.8.7" }
+umeng-uyumao = { group = "com.umeng.umsdk", name = "uyumao", version = "1.1.4" }
+umeng-abtest = { group = "com.umeng.umsdk", name = "abtest", version = "1.0.1" }
+
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/backend/alembic/versions/025_billing.py b/backend/alembic/versions/025_billing.py
new file mode 100644
index 0000000..990e808
--- /dev/null
+++ b/backend/alembic/versions/025_billing.py
@@ -0,0 +1,98 @@
+"""Add billing tables and user subscription fields
+
+Revision ID: 025_billing
+Revises: 104e05fc9cf2
+Create Date: 2026-07-03
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.mysql import CHAR
+
+revision = '025_billing'
+down_revision = '104e05fc9cf2'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+ # billing_plans
+ op.create_table(
+ 'billing_plans',
+ sa.Column('id', CHAR(36), primary_key=True, comment='套餐ID'),
+ sa.Column('name', sa.String(100), nullable=False, comment='套餐名称'),
+ sa.Column('tier', sa.String(20), nullable=False, comment='套餐等级: free/pro/enterprise'),
+ sa.Column('price_monthly', sa.Float, nullable=False, server_default='0', comment='月付价格(CNY)'),
+ sa.Column('price_yearly', sa.Float, nullable=False, server_default='0', comment='年付价格(CNY)'),
+ sa.Column('daily_quota', sa.Integer, nullable=False, server_default='0', comment='每日对话次数限制'),
+ sa.Column('agent_limit', sa.Integer, nullable=False, server_default='0', comment='智能体数量限制'),
+ sa.Column('knowledge_limit', sa.Integer, nullable=False, server_default='0', comment='知识条目限制'),
+ sa.Column('file_upload_mb', sa.Integer, nullable=False, server_default='5', comment='文件上传大小限制(MB)'),
+ sa.Column('models', sa.JSON, nullable=True, comment='可用模型列表'),
+ sa.Column('features', sa.JSON, nullable=True, comment='权益特性列表'),
+ sa.Column('is_active', sa.Boolean, server_default='1', comment='是否启用'),
+ sa.Column('sort_order', sa.Integer, server_default='0', comment='排序'),
+ sa.Column('created_at', sa.DateTime, server_default=sa.func.now(), comment='创建时间'),
+ sa.Column('updated_at', sa.DateTime, server_default=sa.func.now(), comment='更新时间'),
+ )
+
+ # billing_orders
+ op.create_table(
+ 'billing_orders',
+ sa.Column('id', CHAR(36), primary_key=True, comment='订单ID'),
+ sa.Column('user_id', CHAR(36), sa.ForeignKey('users.id', ondelete='CASCADE'), nullable=False, comment='用户ID'),
+ sa.Column('plan_id', CHAR(36), sa.ForeignKey('billing_plans.id', ondelete='SET NULL'), nullable=True, comment='套餐ID'),
+ sa.Column('amount', sa.Float, nullable=False, comment='支付金额(CNY)'),
+ sa.Column('period', sa.String(10), nullable=False, server_default="'monthly'", comment='周期: monthly/yearly'),
+ sa.Column('status', sa.String(20), nullable=False, server_default="'pending'", comment='状态: pending/paid/cancelled/expired'),
+ sa.Column('payment_method', sa.String(20), nullable=True, comment='支付方式: mock/wechat/alipay'),
+ sa.Column('payment_ref', sa.String(255), nullable=True, comment='第三方支付流水号'),
+ sa.Column('paid_at', sa.DateTime, nullable=True, comment='支付时间'),
+ sa.Column('created_at', sa.DateTime, server_default=sa.func.now(), comment='创建时间'),
+ sa.Column('updated_at', sa.DateTime, server_default=sa.func.now(), comment='更新时间'),
+ )
+ op.create_index('ix_billing_orders_user_id', 'billing_orders', ['user_id'])
+
+ # user_subscriptions
+ op.create_table(
+ 'user_subscriptions',
+ sa.Column('id', CHAR(36), primary_key=True, comment='订阅ID'),
+ sa.Column('user_id', CHAR(36), sa.ForeignKey('users.id', ondelete='CASCADE'), nullable=False, comment='用户ID'),
+ sa.Column('plan_id', CHAR(36), sa.ForeignKey('billing_plans.id', ondelete='SET NULL'), nullable=True, comment='当前套餐ID'),
+ sa.Column('tier', sa.String(20), nullable=False, server_default="'free'", comment='当前等级'),
+ sa.Column('status', sa.String(20), nullable=False, server_default="'active'", comment='状态: active/cancelled/expired'),
+ sa.Column('started_at', sa.DateTime, nullable=True, comment='订阅开始时间'),
+ sa.Column('expires_at', sa.DateTime, nullable=True, comment='订阅到期时间'),
+ sa.Column('auto_renew', sa.Boolean, server_default='0', comment='是否自动续费'),
+ sa.Column('created_at', sa.DateTime, server_default=sa.func.now(), comment='创建时间'),
+ sa.Column('updated_at', sa.DateTime, server_default=sa.func.now(), comment='更新时间'),
+ )
+ op.create_index('ix_user_subscriptions_user_id', 'user_subscriptions', ['user_id'], unique=True)
+
+ # usage_records
+ op.create_table(
+ 'usage_records',
+ sa.Column('id', CHAR(36), primary_key=True, comment='记录ID'),
+ sa.Column('user_id', CHAR(36), sa.ForeignKey('users.id', ondelete='CASCADE'), nullable=False, comment='用户ID'),
+ sa.Column('date', sa.Date, nullable=False, comment='日期'),
+ sa.Column('count', sa.Integer, nullable=False, server_default='0', comment='当日对话次数'),
+ sa.Column('created_at', sa.DateTime, server_default=sa.func.now(), comment='创建时间'),
+ )
+ op.create_index('ix_usage_user_date', 'usage_records', ['user_id', 'date'], unique=True)
+
+ # Add columns to users
+ op.add_column('users', sa.Column('subscription_tier', sa.String(20), server_default="'free'", comment='订阅等级'))
+ op.add_column('users', sa.Column('subscription_expires_at', sa.DateTime, nullable=True, comment='订阅到期时间'))
+ op.add_column('users', sa.Column('daily_usage_count', sa.Integer, server_default='0', comment='今日对话次数'))
+ op.add_column('users', sa.Column('daily_usage_date', sa.Date, nullable=True, comment='用量统计日期'))
+
+
+def downgrade() -> None:
+ op.drop_column('users', 'daily_usage_date')
+ op.drop_column('users', 'daily_usage_count')
+ op.drop_column('users', 'subscription_expires_at')
+ op.drop_column('users', 'subscription_tier')
+ op.drop_table('usage_records')
+ op.drop_table('user_subscriptions')
+ op.drop_index('ix_billing_orders_user_id', table_name='billing_orders')
+ op.drop_table('billing_orders')
+ op.drop_table('billing_plans')
diff --git a/backend/app/api/agent_chat.py b/backend/app/api/agent_chat.py
index 3c576e0..747fc12 100644
--- a/backend/app/api/agent_chat.py
+++ b/backend/app/api/agent_chat.py
@@ -10,13 +10,14 @@ from __future__ import annotations
import logging
import json
from typing import Any, AsyncGenerator, Dict, List, Optional
-from fastapi import APIRouter, Depends, HTTPException, Request
+from fastapi import APIRouter, Depends, HTTPException, Request, Query
from fastapi.responses import StreamingResponse
from pydantic import BaseModel, Field
from app.core.database import get_db
from sqlalchemy.orm import Session
from app.api.auth import get_current_user
+from app.api.deps import get_current_workspace_id, get_workspace_membership, WorkspaceContext
from app.models.user import User
from app.models.agent import Agent
from app.models.agent_llm_log import AgentLLMLog
@@ -43,6 +44,7 @@ def _make_llm_logger(
db: Session,
agent_id: Optional[str] = None,
user_id: Optional[str] = None,
+ workspace_id: Optional[str] = None,
):
"""创建 LLM 调用日志回调，写入 AgentLLMLog 表。"""
def _log(metrics: dict):
@@ -51,6 +53,7 @@ def _make_llm_logger(
agent_id=agent_id,
session_id=metrics.get("session_id"),
user_id=user_id,
+ workspace_id=workspace_id,
model=metrics.get("model", ""),
provider=metrics.get("provider"),
prompt_tokens=metrics.get("prompt_tokens", 0),
@@ -74,6 +77,7 @@ def _make_message_saver(
db: Session,
agent_id: Optional[str] = None,
user_id: Optional[str] = None,
+ workspace_id: Optional[str] = None,
):
"""创建消息持久化回调，将每条消息写入 chat_messages 表。"""
def _save(msg: dict):
@@ -82,6 +86,7 @@ def _make_message_saver(
session_id=msg.get("session_id"),
agent_id=agent_id,
user_id=user_id,
+ workspace_id=workspace_id,
role=msg.get("role", "user"),
content=msg.get("content"),
tool_name=msg.get("tool_name"),
@@ -90,6 +95,29 @@ def _make_message_saver(
iteration=msg.get("iteration", 0),
)
db.add(record)
+
+ # 自动创建 / 更新 AgentSession 记录
+ session_id = msg.get("session_id")
+ if session_id and agent_id:
+ from app.models.agent_session import AgentSession
+ existing = db.query(AgentSession).filter(
+ AgentSession.id == session_id
+ ).first()
+ if not existing:
+ title = None
+ if msg.get("role") == "user" and msg.get("content"):
+ title = msg["content"][:100]
+ session = AgentSession(
+ id=session_id,
+ user_id=user_id,
+ agent_id=agent_id,
+ workspace_id=workspace_id,
+ title=title,
+ )
+ db.add(session)
+ elif existing.title is None and msg.get("role") == "user" and msg.get("content"):
+ existing.title = msg["content"][:100]
+
db.commit()
except Exception as e:
logger.warning("写入 ChatMessage 失败: %s", e)
@@ -155,6 +183,7 @@ class SessionItem(BaseModel):
title: Optional[str] = None
last_message: Optional[str] = None
message_count: int = 0
+ is_pinned: bool = False
created_at: Optional[str] = None
updated_at: Optional[str] = None
@@ -164,6 +193,23 @@ class SessionListResponse(BaseModel):
sessions: List[SessionItem]
+class SearchMessageItem(BaseModel):
+ """跨会话搜索消息条目"""
+ id: str
+ session_id: str
+ agent_id: Optional[str] = None
+ role: str
+ content: Optional[str] = None
+ session_title: Optional[str] = None
+ created_at: Optional[str] = None
+
+
+class SearchMessagesResponse(BaseModel):
+ """消息搜索响应"""
+ messages: List[SearchMessageItem]
+ total: int
+
+
class OrchestrateAgentItem(BaseModel):
"""编排中单个 Agent 的定义"""
id: str
@@ -208,6 +254,7 @@ class OrchestrateResponse(BaseModel):
async def orchestrate_agents(
req: OrchestrateRequest,
current_user: User = Depends(get_current_user),
+ workspace_id: str = Depends(get_current_workspace_id),
db: Session = Depends(get_db),
):
"""多 Agent 编排：支持 route / sequential / debate 三种模式。"""
@@ -225,7 +272,7 @@ async def orchestrate_agents(
for a in req.agents
]
- on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id)
+ on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id, workspace_id=workspace_id)
orchestrator = AgentOrchestrator(
default_llm_config=AgentLLMConfig(
model=req.model or "deepseek-v4-flash",
@@ -265,10 +312,11 @@ class GraphOrchestrateRequest(BaseModel):
async def orchestrate_graph(
req: GraphOrchestrateRequest,
current_user: User = Depends(get_current_user),
+ workspace_id: str = Depends(get_current_workspace_id),
db: Session = Depends(get_db),
):
"""图编排模式：按 DAG 拓扑顺序执行 Agent 和条件节点。"""
- on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id)
+ on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id, workspace_id=workspace_id)
orchestrator = AgentOrchestrator(
default_llm_config=AgentLLMConfig(
model=req.model or "deepseek-v4-flash",
@@ -301,6 +349,7 @@ async def orchestrate_graph(
async def chat_bare(
req: ChatRequest,
current_user: User = Depends(get_current_user),
+ workspace_id: str = Depends(get_current_workspace_id),
db: Session = Depends(get_db),
):
"""无需 Agent 配置，使用默认设置直接对话。"""
@@ -334,8 +383,8 @@ async def chat_bare(
config.prompt_sections.enabled = False
if req.system_prompt_override:
config.system_prompt = req.system_prompt_override
- on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id)
- on_message = _make_message_saver(db, agent_id=None, user_id=current_user.id)
+ on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id, workspace_id=workspace_id)
+ on_message = _make_message_saver(db, agent_id=None, user_id=current_user.id, workspace_id=workspace_id)
context = AgentContext(session_id=req.session_id)
runtime = AgentRuntime(config=config, context=context, on_llm_call=on_llm_call, on_message=on_message, streamlined=req.streamlined)
result = await runtime.run(req.message)
@@ -366,6 +415,7 @@ async def chat_bare(
async def chat_bare_stream(
req: ChatRequest,
current_user: User = Depends(get_current_user),
+ workspace_id: str = Depends(get_current_workspace_id),
db: Session = Depends(get_db),
):
"""无需 Agent 配置，使用默认设置直接对话（流式 SSE）。"""
@@ -399,8 +449,8 @@ async def chat_bare_stream(
config.prompt_sections.enabled = False
if req.system_prompt_override:
config.system_prompt = req.system_prompt_override
- on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id)
- on_message = _make_message_saver(db, agent_id=None, user_id=current_user.id)
+ on_llm_call = _make_llm_logger(db, agent_id=None, user_id=current_user.id, workspace_id=workspace_id)
+ on_message = _make_message_saver(db, agent_id=None, user_id=current_user.id, workspace_id=workspace_id)
context = AgentContext(session_id=req.session_id)
runtime = AgentRuntime(config=config, context=context, on_llm_call=on_llm_call, on_message=on_message, streamlined=req.streamlined)
return StreamingResponse(
@@ -419,6 +469,7 @@ async def chat_with_agent(
agent_id: str,
req: ChatRequest,
current_user: User = Depends(get_current_user),
+ workspace_id: str = Depends(get_current_workspace_id),
db: Session = Depends(get_db),
):
"""与指定的 Agent 对话。Agent 的工作流配置会用于构建 Runtime。"""
@@ -485,8 +536,8 @@ async def chat_with_agent(
if req.system_prompt_override:
config.system_prompt = req.system_prompt_override
- on_llm_call = _make_llm_logger(db, agent_id=agent_id, user_id=current_user.id)
- on_message = _make_message_saver(db, agent_id=agent_id, user_id=current_user.id)
+ on_llm_call = _make_llm_logger(db, agent_id=agent_id, user_id=current_user.id, workspace_id=workspace_id)
+ on_message = _make_message_saver(db, agent_id=agent_id, user_id=current_user.id, workspace_id=workspace_id)
context = AgentContext(session_id=req.session_id)
runtime = AgentRuntime(config=config, context=context, on_llm_call=on_llm_call, on_message=on_message, streamlined=req.streamlined)
result = await runtime.run(req.message)
@@ -519,6 +570,7 @@ async def chat_with_agent_stream(
agent_id: str,
req: ChatRequest,
current_user: User = Depends(get_current_user),
+ workspace_id: str = Depends(get_current_workspace_id),
db: Session = Depends(get_db),
):
"""与指定的 Agent 对话（流式 SSE）。"""
@@ -581,8 +633,8 @@ async def chat_with_agent_stream(
if req.system_prompt_override:
config.system_prompt = req.system_prompt_override
- on_llm_call = _make_llm_logger(db, agent_id=agent_id, user_id=current_user.id)
- on_message = _make_message_saver(db, agent_id=agent_id, user_id=current_user.id)
+ on_llm_call = _make_llm_logger(db, agent_id=agent_id, user_id=current_user.id, workspace_id=workspace_id)
+ on_message = _make_message_saver(db, agent_id=agent_id, user_id=current_user.id, workspace_id=workspace_id)
context = AgentContext(session_id=req.session_id)
runtime = AgentRuntime(config=config, context=context, on_llm_call=on_llm_call, on_message=on_message, streamlined=req.streamlined)
return StreamingResponse(
@@ -600,18 +652,20 @@ async def chat_with_agent_stream(
async def list_agent_sessions(
agent_id: str,
limit: int = 50,
+ search: Optional[str] = None,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
- """获取 Agent 的会话列表，按最近活跃时间排序。"""
+ """获取 Agent 的会话列表，置顶优先，再按最近活跃时间排序。支持 search 参数按标题/内容搜索。"""
from sqlalchemy import func as sa_func, desc, or_
+ from app.models.agent_session import AgentSession
# 验证 agent 存在或有权限
agent = db.query(Agent).filter(Agent.id == agent_id).first()
if not agent:
raise HTTPException(status_code=404, detail="Agent 不存在")
- rows = (
+ rows_query = (
db.query(
ChatMessage.session_id,
sa_func.min(ChatMessage.created_at).label("created_at"),
@@ -620,23 +674,65 @@ async def list_agent_sessions(
)
.filter(ChatMessage.agent_id == agent_id)
.group_by(ChatMessage.session_id)
- .order_by(desc("updated_at"))
- .limit(limit)
- .all()
)
+ # 搜索过滤：按会话标题（AgentSession.title）或消息内容
+ if search and search.strip():
+ pattern = f"%{search.strip()}%"
+ # 子查询：在标题或消息内容中匹配的 session_id
+ matching_session_ids = set()
+
+ # 匹配 AgentSession.title
+ title_matches = db.query(AgentSession.id).filter(
+ AgentSession.title.like(pattern)
+ ).all()
+ matching_session_ids.update(r[0] for r in title_matches)
+
+ # 匹配消息内容
+ content_matches = db.query(ChatMessage.session_id).filter(
+ ChatMessage.agent_id == agent_id,
+ ChatMessage.content.like(pattern),
+ ).distinct().all()
+ matching_session_ids.update(r[0] for r in content_matches)
+
+ if matching_session_ids:
+ rows_query = rows_query.filter(
+ ChatMessage.session_id.in_(list(matching_session_ids))
+ )
+ else:
+ # 无匹配，返回空
+ return SessionListResponse(sessions=[])
+
+ rows = rows_query.order_by(desc("updated_at")).limit(limit).all()
+
+ # 批量查询 AgentSession 记录
+ session_ids = [row.session_id for row in rows]
+ agent_sessions_map = {}
+ if session_ids:
+ records = db.query(AgentSession).filter(
+ AgentSession.id.in_(session_ids)
+ ).all()
+ agent_sessions_map = {s.id: s for s in records}
+
sessions = []
for row in rows:
- # 取第一条 user 消息作为标题
- first_user_msg = (
- db.query(ChatMessage)
- .filter(
- ChatMessage.session_id == row.session_id,
- ChatMessage.role == "user",
+ asession = agent_sessions_map.get(row.session_id)
+
+ # 标题优先级: AgentSession.title > 第一条 user 消息
+ title = asession.title if asession and asession.title else None
+ if not title:
+ first_user_msg = (
+ db.query(ChatMessage)
+ .filter(
+ ChatMessage.session_id == row.session_id,
+ ChatMessage.role == "user",
+ )
+ .order_by(ChatMessage.created_at.asc())
+ .first()
)
- .order_by(ChatMessage.created_at.asc())
- .first()
- )
+ if first_user_msg and first_user_msg.content:
+ title = first_user_msg.content[:100]
+
# 取最后一条消息作为预览
last_msg = (
db.query(ChatMessage)
@@ -646,13 +742,21 @@ async def list_agent_sessions(
)
sessions.append(SessionItem(
session_id=row.session_id,
- title=first_user_msg.content[:100] if first_user_msg and first_user_msg.content else None,
+ title=title,
last_message=last_msg.content[:200] if last_msg and last_msg.content else None,
message_count=row.message_count,
+ is_pinned=asession.is_pinned if asession else False,
created_at=row.created_at.isoformat() if row.created_at else None,
updated_at=row.updated_at.isoformat() if row.updated_at else None,
))
+ # 排序：置顶优先，再按更新时间降序
+ pinned = [s for s in sessions if s.is_pinned]
+ unpinned = [s for s in sessions if not s.is_pinned]
+ pinned.sort(key=lambda s: s.updated_at or "", reverse=True)
+ unpinned.sort(key=lambda s: s.updated_at or "", reverse=True)
+ sessions = pinned + unpinned
+
return SessionListResponse(sessions=sessions)
@@ -662,10 +766,11 @@ async def get_session_messages(
session_id: str,
before_id: Optional[str] = None,
limit: int = 50,
+ search: Optional[str] = None,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
- """获取会话的消息历史（分页），从旧到新排序。"""
+ """获取会话的消息历史（分页），从旧到新排序。支持 search 参数按内容搜索。"""
from sqlalchemy import or_
# limit 限制
@@ -676,6 +781,11 @@ async def get_session_messages(
ChatMessage.session_id == session_id,
)
+ # 消息内容搜索
+ if search and search.strip():
+ pattern = f"%{search.strip()}%"
+ base_q = base_q.filter(ChatMessage.content.like(pattern))
+
# 游标分页：before_id 之前的老消息（使用复合键避免 created_at 相同导致遗漏）
if before_id:
cursor_msg = db.query(ChatMessage).filter(ChatMessage.id == before_id).first()
@@ -725,6 +835,72 @@ async def get_session_messages(
return MessageHistoryResponse(messages=messages, has_more=has_more, total=total)
+@router.get("/{agent_id}/search-messages", response_model=SearchMessagesResponse)
+async def search_messages(
+ agent_id: str,
+ q: str = Query(..., min_length=1, description="搜索关键词"),
+ limit: int = Query(50, ge=1, le=100),
+ skip: int = Query(0, ge=0),
+ current_user: User = Depends(get_current_user),
+ db: Session = Depends(get_db),
+):
+ """跨会话搜索消息内容，返回匹配的消息及所属会话信息。"""
+ from app.models.agent_session import AgentSession
+
+ # 验证 agent 存在
+ agent = db.query(Agent).filter(Agent.id == agent_id).first()
+ if not agent:
+ raise HTTPException(status_code=404, detail="Agent 不存在")
+
+ pattern = f"%{q.strip()}%"
+
+ # 搜索匹配的消息
+ total = (
+ db.query(ChatMessage)
+ .filter(
+ ChatMessage.agent_id == agent_id,
+ ChatMessage.content.like(pattern),
+ )
+ .count()
+ )
+
+ messages = (
+ db.query(ChatMessage)
+ .filter(
+ ChatMessage.agent_id == agent_id,
+ ChatMessage.content.like(pattern),
+ )
+ .order_by(ChatMessage.created_at.desc())
+ .offset(skip)
+ .limit(limit)
+ .all()
+ )
+
+ # 批量获取会话标题
+ session_ids = list(set(m.session_id for m in messages))
+ session_titles = {}
+ if session_ids:
+ records = db.query(AgentSession).filter(
+ AgentSession.id.in_(session_ids)
+ ).all()
+ session_titles = {s.id: s.title for s in records if s.title}
+
+ result = [
+ SearchMessageItem(
+ id=m.id,
+ session_id=m.session_id,
+ agent_id=m.agent_id,
+ role=m.role,
+ content=m.content,
+ session_title=session_titles.get(m.session_id),
+ created_at=m.created_at.isoformat() if m.created_at else None,
+ )
+ for m in messages
+ ]
+
+ return SearchMessagesResponse(messages=result, total=total)
+
+
def _find_agent_node_config(nodes: list) -> Dict[str, Any]:
"""从工作流节点列表中查找第一个 agent 类型或 llm 类型的节点配置。"""
if not nodes:
diff --git a/backend/app/api/agent_schedules.py b/backend/app/api/agent_schedules.py
index 228931f..74e055e 100644
--- a/backend/app/api/agent_schedules.py
+++ b/backend/app/api/agent_schedules.py
@@ -10,6 +10,7 @@ from pydantic import BaseModel, Field
from sqlalchemy.orm import Session
from app.api.auth import get_current_user
+from app.api.deps import require_workspace_admin, WorkspaceContext
from app.core.database import get_db
from app.models.agent import Agent
from app.models.agent_schedule import AgentSchedule
@@ -162,8 +163,9 @@ async def delete_schedule(
schedule_id: str,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
+ _ws_admin: WorkspaceContext = Depends(require_workspace_admin),
):
- """删除定时任务。"""
+ """删除定时任务（仅工作区管理员和平台管理员可操作）。"""
schedule = db.query(AgentSchedule).filter(AgentSchedule.id == schedule_id).first()
if not schedule:
raise HTTPException(status_code=404, detail="定时任务不存在")
@@ -180,8 +182,9 @@ async def trigger_schedule(
schedule_id: str,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
+ _ws_admin: WorkspaceContext = Depends(require_workspace_admin),
):
- """手动触发一次定时任务。"""
+ """手动触发一次定时任务（仅工作区管理员和平台管理员可操作）。"""
schedule = db.query(AgentSchedule).filter(AgentSchedule.id == schedule_id).first()
if not schedule:
raise HTTPException(status_code=404, detail="定时任务不存在")
diff --git a/backend/app/api/agent_sessions.py b/backend/app/api/agent_sessions.py
new file mode 100644
index 0000000..e6aa89d
--- /dev/null
+++ b/backend/app/api/agent_sessions.py
@@ -0,0 +1,180 @@
+"""
+Agent 会话管理 API
+提供会话重命名、置顶、删除、导出功能
+"""
+from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi.responses import PlainTextResponse
+from pydantic import BaseModel, Field
+from typing import Optional
+from sqlalchemy.orm import Session
+import json
+
+from app.core.database import get_db
+from app.api.auth import get_current_user
+from app.api.deps import get_current_workspace_id
+from app.models.user import User
+from app.models.agent import Agent
+from app.models.agent_session import AgentSession
+from app.models.chat_message import ChatMessage
+
+router = APIRouter(prefix="/api/v1/agent-chat", tags=["agent-sessions"])
+
+
+class UpdateSessionRequest(BaseModel):
+ title: Optional[str] = Field(default=None, description="会话标题")
+ is_pinned: Optional[bool] = Field(default=None, description="是否置顶")
+
+
+class SessionResponse(BaseModel):
+ id: str
+ title: Optional[str] = None
+ is_pinned: bool = False
+ created_at: Optional[str] = None
+ updated_at: Optional[str] = None
+
+
+@router.patch("/{agent_id}/sessions/{session_id}", response_model=SessionResponse)
+async def update_session(
+ agent_id: str,
+ session_id: str,
+ req: UpdateSessionRequest,
+ current_user: User = Depends(get_current_user),
+ db: Session = Depends(get_db),
+ workspace_id: str = Depends(get_current_workspace_id),
+):
+ """更新会话信息（重命名 / 置顶）"""
+ agent = db.query(Agent).filter(Agent.id == agent_id).first()
+ if not agent:
+ raise HTTPException(status_code=404, detail="Agent 不存在")
+
+ session = db.query(AgentSession).filter(
+ AgentSession.id == session_id,
+ AgentSession.agent_id == agent_id,
+ ).first()
+
+ if not session:
+ session = AgentSession(
+ id=session_id,
+ user_id=current_user.id,
+ agent_id=agent_id,
+ workspace_id=workspace_id or None,
+ )
+ db.add(session)
+
+ if req.title is not None:
+ session.title = req.title
+ if req.is_pinned is not None:
+ session.is_pinned = req.is_pinned
+
+ db.commit()
+ db.refresh(session)
+
+ return SessionResponse(
+ id=session.id,
+ title=session.title,
+ is_pinned=session.is_pinned,
+ created_at=session.created_at.isoformat() if session.created_at else None,
+ updated_at=session.updated_at.isoformat() if session.updated_at else None,
+ )
+
+
+@router.delete("/{agent_id}/sessions/{session_id}")
+async def delete_session(
+ agent_id: str,
+ session_id: str,
+ current_user: User = Depends(get_current_user),
+ db: Session = Depends(get_db),
+ workspace_id: str = Depends(get_current_workspace_id),
+):
+ """删除会话及所有关联消息"""
+ agent = db.query(Agent).filter(Agent.id == agent_id).first()
+ if not agent:
+ raise HTTPException(status_code=404, detail="Agent 不存在")
+
+ session_filter = [
+ AgentSession.id == session_id,
+ AgentSession.agent_id == agent_id,
+ ]
+ if workspace_id:
+ session_filter.append(AgentSession.workspace_id == workspace_id)
+
+ db.query(AgentSession).filter(*session_filter).delete()
+
+ msg_filter = [
+ ChatMessage.agent_id == agent_id,
+ ChatMessage.session_id == session_id,
+ ]
+ if workspace_id:
+ msg_filter.append(ChatMessage.workspace_id == workspace_id)
+
+ deleted_count = db.query(ChatMessage).filter(*msg_filter).delete()
+
+ db.commit()
+
+ return {"deleted": True, "messages_deleted": deleted_count}
+
+
+@router.get("/{agent_id}/sessions/{session_id}/export")
+async def export_session(
+ agent_id: str,
+ session_id: str,
+ format: str = Query("json", pattern="^(json|markdown)$"),
+ current_user: User = Depends(get_current_user),
+ db: Session = Depends(get_db),
+ workspace_id: str = Depends(get_current_workspace_id),
+):
+ """导出会话为 JSON 或 Markdown 格式"""
+ agent = db.query(Agent).filter(Agent.id == agent_id).first()
+ if not agent:
+ raise HTTPException(status_code=404, detail="Agent 不存在")
+
+ msg_query = db.query(ChatMessage).filter(
+ ChatMessage.agent_id == agent_id,
+ ChatMessage.session_id == session_id,
+ )
+ if workspace_id:
+ msg_query = msg_query.filter(ChatMessage.workspace_id == workspace_id)
+
+ messages = msg_query.order_by(ChatMessage.created_at.asc()).all()
+
+ if not messages:
+ raise HTTPException(status_code=404, detail="会话无消息")
+
+ # 获取会话标题
+ session = db.query(AgentSession).filter(AgentSession.id == session_id).first()
+ title = session.title if session and session.title else "对话"
+
+ if format == "markdown":
+ lines = [f"# {title}", "", f"**Agent**: {agent.name}", f"**时间**: {messages[0].created_at.isoformat() if messages[0].created_at else 'N/A'}", "", "---", ""]
+ for m in messages:
+ role_label = "用户" if m.role == "user" else "AI 助手" if m.role == "assistant" else m.role
+ lines.append(f"### {role_label}")
+ if m.content:
+ lines.append(m.content)
+ if m.tool_name:
+ lines.append(f"\n> 工具调用: `{m.tool_name}`")
+ if m.tool_output:
+ lines.append(f"\n工具输出
\n\n```\n{m.tool_output[:500]}\n```\n
-
-
-
-
-
-
-
+
+
+
所有工作区（平台管理员视图）
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.status === 'active' ? '启用' : row.status === 'deleted' ? '已删除' : '停用' }}
+
+
+
+
+
+ 是
+ -
+
+
+
+
+ {{ row.created_at ? new Date(row.created_at).toLocaleDateString() : '-' }}
+
+
+
+
+ 进入
+ 管理
+
+
+
+
+
我的工作区
@@ -55,21 +108,45 @@
确定
+
+
+
+
+
+
+
+ {{ adminEditWs.owner_name }}
+ {{ adminEditWs.member_count }} / {{ adminEditWs.max_members }}
+
+
+
+
+
+
+
+
+ 取消
+ 删除工作区
+ 保存
+
+
@@ -146,6 +296,19 @@ onMounted(() => {
margin: 0;
}
+.admin-section {
+ margin-bottom: 8px;
+}
+
+.admin-section h3 {
+ margin: 0 0 8px 0;
+}
+
+.admin-toolbar {
+ display: flex;
+ align-items: center;
+}
+
.workspace-card {
margin-bottom: 20px;
cursor: pointer;