Merge branch 'main' of https://github.com/yhnapoleon/ADProject

Author: yhnapoleon

mobile/AD/.idea/deploymentTargetSelector.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="iss.nus.edu.sg.sharedprefs.admobile">
     <uses-permission android:name="android.permission.INTERNET" />
-    <!-- Required when targeting Android 13+ if any code (e.g. Glide NotificationTarget) posts notifications -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
@@ -17,7 +16,8 @@
     android:label="@string/app_name"
     android:roundIcon="@mipmap/ic_launcher_round"
     android:supportsRtl="true"
-    android:theme="@style/Theme.ADMobile">
+    android:theme="@style/Theme.ADMobile"
+    android:usesCleartextTraffic="true">
 
     <meta-data
         android:name="com.google.android.geo.API_KEY"

mobile/AD/app/src/main/AndroidManifest.xml

@@ -8,8 +8,8 @@ data class RegisterRequestDto(
     val email: String,
     val password: String,
     val birthDate: String,
-    @SerializedName("Region") // 🌟 告诉 Retrofit：发请求时 JSON 字段叫 "Region"
-    val region: String        // 🌟 告诉 Kotlin：代码里这个变量叫 region
+    @SerializedName("Region")
+    val region: String
 )
 
 // 2. 登录请求
@@ -18,7 +18,7 @@ data class LoginRequestDto(
     val password: String
 )
 
-// 3. 用户详细信息 (从 Swagger 响应提取)
+// 3. 用户详细信息
 data class UserSummaryDto(
     val id: String,
     val username: String,

mobile/AD/app/src/main/java/iss/nus/edu/sg/sharedprefs/admobile/data/model/AuthDto.kt

@@ -59,7 +59,6 @@ data class BarcodeResponse(
 )
 
 // 批量删除请求体
-// 新的批量删除请求单条目 DTO
 data class TypedDeleteEntry(
     val type: Int, // 1=Food, 2=Travel, 3=Utility
     val id: Int

mobile/AD/app/src/main/java/iss/nus/edu/sg/sharedprefs/admobile/data/model/FoodDto.kt

@@ -1,10 +1,13 @@
 package iss.nus.edu.sg.sharedprefs.admobile.data.model
 
+enum class RankingType { DAILY, MONTHLY, TOTAL }
 data class LeaderboardItem(
     val rank: Int,
     val username: String,
     val nickname: String?,
     val emissionsTotal: Double,
     val avatarUrl: String?,
-    val pointsTotal: Int
+    val pointsToday: Int = 0,
+    val pointsMonth: Int = 0,
+    val pointsTotal: Int = 0
 )

mobile/AD/app/src/main/java/iss/nus/edu/sg/sharedprefs/admobile/data/model/LeaderboardDto.kt

@@ -19,7 +19,7 @@ data class UserStatsResponse(
 // 请求体
 data class StepSyncRequest(
     val stepCount: Int,
-    val date: String // 后端要求的格式: "2026-02-04T05:58:42.407Z"
+    val date: String
 )
 
 // 响应体

mobile/AD/app/src/main/java/iss/nus/edu/sg/sharedprefs/admobile/data/model/MainPageDto.kt

@@ -1,14 +1,14 @@
 package iss.nus.edu.sg.sharedprefs.admobile.data.model
 
-// 1. 发送给后端的请求对象 (对应 Swagger Request Body)
+// 1. 发送给后端的请求对象
 data class AddTravelRequest(
-    val originAddress: String,      // 起点地址文字
-    val destinationAddress: String, // 终点地址文字
-    val transportMode: Int,         // 交通工具 ID (0, 1, 2...)
-    val notes: String?              // 备注
+    val originAddress: String,
+    val destinationAddress: String,
+    val transportMode: Int,
+    val notes: String?
 )
 
-// 2. 后端返回的结果对象 (对应 Swagger 200 Response)
+// 2. 后端返回的结果对象
 data class TravelResponse(
     val id: Int,
     val transportModeName: String,

mobile/AD/app/src/main/java/iss/nus/edu/sg/sharedprefs/admobile/data/model/TravelDto.kt

@@ -94,7 +94,7 @@ interface EcoLensApiService {
 
     // 获取总排行榜 (假设路径为原有的 api/Leaderboard)
     @GET("api/Leaderboard")
-    suspend fun getAllTimeLeaderboard(@Query("limit") limit: Int): Response<List<LeaderboardItem>>
+    suspend fun getAllTimeLeaderboard(@Query("period") period: String = "total",@Query("limit") limit: Int): Response<List<LeaderboardItem>>
 
     // ApiService.kt
     @POST("api/ai/chat")

mobile/AD/app/src/main/java/iss/nus/edu/sg/sharedprefs/admobile/data/network/EcoLensApiService.kt

@@ -1,24 +1,34 @@
 package iss.nus.edu.sg.sharedprefs.admobile.data.network
 
 import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 object NetworkClient {
-    private const val BASE_URL = "https://ecolens-api-daa7a0e4a3d4d7e8.southeastasia-01.azurewebsites.net/"
+    private const val BASE_URL = "http://10.0.2.2:5133/"
+    //private const val BASE_URL = "https://ecolens-api-daa7a0e4a3d4d7e8.southeastasia-01.azurewebsites.net/"
 
-    // 1. 创建自定义的 OkHttpClient
+    // 1. 日志拦截器
+    private val loggingInterceptor = HttpLoggingInterceptor().apply {
+        // Level.BODY 会打印：请求行、请求头、请求体、响应行、响应头、响应体
+        // 这对调试 Multipart 上传至关重要
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    // 2. 自定义的 OkHttpClient
     private val okHttpClient = OkHttpClient.Builder()
-        .connectTimeout(30, TimeUnit.SECONDS) // 连接服务器超时：30秒
-        .readTimeout(60, TimeUnit.SECONDS)    // 等待服务器返回数据超时（这对AI很重要）：60秒
-        .writeTimeout(30, TimeUnit.SECONDS)   // 发送数据给服务器超时：30秒
+        // 🌟 注入日志拦截器
+        .addInterceptor(loggingInterceptor)
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(60, TimeUnit.SECONDS)
+        .writeTimeout(30, TimeUnit.SECONDS)
         .build()
 
     val apiService: EcoLensApiService by lazy {
         Retrofit.Builder()
             .baseUrl(BASE_URL)
-            // 2. 将自定义的 client 关联到 Retrofit
             .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build()

mobile/AD/app/src/main/java/iss/nus/edu/sg/sharedprefs/admobile/data/network/NetworkClient.kt

@@ -24,14 +24,12 @@ class AuthRepository(context: Context) {
         }
     }
 
-    // AuthRepository.kt 中的建议写法
     suspend fun register(request: RegisterRequestDto): Result<Unit> {
         return try {
             val response = apiService.register(request) // 假设返回的是 Response<Unit>
             if (response.isSuccessful) {
                 Result.success(Unit)
             } else {
-                // 🌟 关键：提取后端返回的原始 JSON 错误信息
                 val errorJson = response.errorBody()?.string() ?: "Unknown server error"
                 Log.e("API_DEBUG", "Server Response Error Body: $errorJson")
 
@@ -48,15 +46,12 @@ class AuthRepository(context: Context) {
             putString("token", data.token)
             putString("userId", data.user.id)
             putString("username", data.user.username)
-            // 存下这些，ProfileActivity 就能直接显示了
             apply()
         }
     }
 
-    // AuthRepository.kt 增加以下方法
     suspend fun getMainPageData(token: String): Result<MainPageResponseDto> {
         return try {
-            // 注意：这里需要传入 Bearer 前缀
             val response = apiService.getMainPageData("Bearer $token")
             if (response.isSuccessful) {
                 Result.success(response.body()!!)