fix(net): Fix time formatting anomalies

Author: suzhelan

.github/workflows/android-ci.yml

@@ -43,7 +43,7 @@ jobs:
           # KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
 
       - name: Upload APK
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v5
         with:
           name: TimTool-unsign.apk
           path: ./app/build/outputs/apk/release/*.apk

app/build.gradle.kts

@@ -1,7 +1,5 @@
-
-
-import top.sacz.buildplugin.BuildVersionConfig
 import com.google.protobuf.gradle.proto
+import top.sacz.buildplugin.BuildVersionConfig
 
 plugins {
     alias(libs.plugins.android.application)
@@ -67,7 +65,7 @@ android {
             "--package-id", "0x42"
         )
     }
-    
+
     buildFeatures {
         viewBinding = true
     }
@@ -114,10 +112,12 @@ dependencies {
     //常用
     implementation(libs.okhttp3)
     implementation(libs.retrofit2)
-    implementation(libs.squareup.retrofit.converter.gson)
     implementation(libs.glide)
     implementation(libs.fastkv)
     implementation(libs.fastjson2)
+    implementation(libs.fastjson2.kotlin)
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlin.reflect)
     implementation(libs.base.recyclerview.helper)
 
     //dialogx

app/src/main/java/top/sacz/timtool/net/HttpClient.java

@@ -1,11 +1,9 @@
 package top.sacz.timtool.net;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+
 
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 import top.sacz.timtool.net.api.PayApi;
 import top.sacz.timtool.net.api.UpdateApi;
 import top.sacz.timtool.net.api.UserApi;
@@ -21,7 +19,7 @@
  */
 public class HttpClient {
 
-    public static final String BASE_URL = "https://timtool.sacz.top";
+    public static final String BASE_URL = "https://timtool.suzhelan.top";
 
 
     public static String createKey() {
@@ -68,11 +66,10 @@ public static PayApi getPayApi() {
     }
 
     public static UpdateApi getUpdateApi() {
-        Gson gson = new GsonBuilder().setLenient().create();
         return new Retrofit.Builder()
                 .baseUrl(BASE_URL)
                 .client(buildClient(false))
-                .addConverterFactory(GsonConverterFactory.create(gson))
+                .addConverterFactory(new FastJsonConverterFactory())
                 .build()
                 .create(UpdateApi.class);
     }

app/src/main/java/top/sacz/timtool/net/UpdateService.kt

@@ -174,4 +174,4 @@ class UpdateService {
     }
 
 
-}
+}

app/src/main/java/top/sacz/timtool/net/entity/Update.kt

@@ -1,6 +1,6 @@
 package top.sacz.timtool.net.entity
 
-import java.util.Date
+import java.time.LocalDateTime
 
 data class HasUpdate(
     val hasUpdate: Boolean,
@@ -12,8 +12,8 @@ data class UpdateInfo(
     val fileName: String,
     val forceUpdate: Boolean,
     val id: Int,
-    val time: Date,
+    val time: LocalDateTime,
     val updateLog: String,
     val versionCode: Int,
     val versionName: String
-)
+)

app/src/main/java/top/sacz/timtool/net/entity/User.java

@@ -5,7 +5,7 @@
 import com.alibaba.fastjson2.JSON;
 
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public class User implements Serializable {
 
@@ -19,9 +19,11 @@ public class User implements Serializable {
 
     private String label;
 
-    private Date createTime;
+    private LocalDateTime createTime;
 
-    private Date updateTime;
+    private LocalDateTime updateTime;
+
+    public LocalDateTime sponsorEndDate;
 
     /**
      * QQ
@@ -96,34 +98,42 @@ public void setLabel(String label) {
     /**
      * 创建时间
      */
-    public Date getCreateTime() {
+    public LocalDateTime getCreateTime() {
         return createTime;
     }
 
     /**
      * 创建时间
      */
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(LocalDateTime createTime) {
         this.createTime = createTime;
     }
 
     /**
      * 更新时间
      */
-    public Date getUpdateTime() {
+    public LocalDateTime getUpdateTime() {
         return updateTime;
     }
 
     /**
      * 更新时间
      */
-    public void setUpdateTime(Date updateTime) {
+    public void setUpdateTime(LocalDateTime updateTime) {
         this.updateTime = updateTime;
     }
 
+    public LocalDateTime getSponsorEndDate() {
+        return sponsorEndDate;
+    }
+
+    public void setSponsorEndDate(LocalDateTime sponsorEndDate) {
+        this.sponsorEndDate = sponsorEndDate;
+    }
+
     @NonNull
     @Override
     public String toString() {
         return JSON.toJSONString(this);
     }
-}
+}

app/src/main/java/top/sacz/timtool/ui/dialog/UpdateLogDialog.kt

@@ -5,10 +5,12 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import top.sacz.timtool.R
+import top.sacz.timtool.hook.util.LogUtils
 import top.sacz.timtool.hook.util.ToastTool
 import top.sacz.timtool.net.HttpClient
 import top.sacz.timtool.net.entity.QSResult
 import top.sacz.timtool.net.entity.UpdateInfo
+import top.sacz.timtool.util.Log
 import top.sacz.timtool.util.TimeUtils
 import top.sacz.xphelper.util.ActivityTools
 
@@ -54,8 +56,9 @@ class UpdateLogDialog {
                 p0: Call<QSResult<List<UpdateInfo>>?>,
                 p1: Throwable
             ) {
+                Log.e("update-log-dialog", p1)
                 ToastTool.show(p1.message!!)
             }
         })
     }
-}
+}

app/src/main/java/top/sacz/timtool/util/TimeUtils.java

@@ -1,6 +1,9 @@
 package top.sacz.timtool.util;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.Locale;
 
@@ -29,4 +32,27 @@ public static String formatTime(long time, String pattern) {
         SimpleDateFormat format = new SimpleDateFormat(pattern, Locale.getDefault());
         return format.format(time);
     }
-}
+    
+    /**
+     * 格式化LocalDateTime时间
+     */
+    public static String formatTime(LocalDateTime dateTime) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
+        return dateTime.format(formatter);
+    }
+    
+    /**
+     * 格式化LocalDateTime时间
+     */
+    public static String formatTime(LocalDateTime dateTime, String pattern) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        return dateTime.format(formatter);
+    }
+    
+    /**
+     * 将LocalDateTime转换为时间戳
+     */
+    public static long toTimestamp(LocalDateTime dateTime) {
+        return dateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+    }
+}

gradle/libs.versions.toml

@@ -35,6 +35,9 @@ xphelper = "2.8"
 
 # kotlin
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutine" }
 androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
 androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" }
@@ -47,6 +50,7 @@ material = { group = "com.google.android.material", name = "material", version.r
 #常用库
 fastkv = { group = 'io.github.billywei01', name = 'fastkv', version.ref = "fastkv" }
 fastjson2 = { module = "com.alibaba.fastjson2:fastjson2", version.ref = "fastjson2" }
+fastjson2-kotlin = { module = "com.alibaba.fastjson2:fastjson2-kotlin", version.ref = "fastjson2" }
 okhttp3 = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 squareup-retrofit-converter-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit2" }
 

libs/annotation-scanner/src/main/java/top/sacz/timtool/scanner/HookItemScanner.kt

@@ -35,25 +35,67 @@ class HookItemScanner(
     val logger: KSPLogger
 ) : SymbolProcessor {
 
+    companion object {
+        /**
+         * 不动
+         */
+        private const val RETURN_TYPE_PACKAGE = "kotlin.collections"
+
+        /**
+         * 不动
+         */
+        private const val RETURN_TYPE_NAME = "List"
+
+        /**
+         * Base类包名
+         */
+        private const val BASE_CLASS_PACKAGE = "top.sacz.timtool.hook.base"
+
+        /**
+         * Base类名
+         */
+        private const val BASE_CLASS_NAME = "BaseHookItem"
+
+        /**
+         * 生成的包名
+         */
+        private const val GENERATED_PACKAGE = "top.sacz.timtool.hook.gen"
+
+        /**
+         * 要扫描的字段
+         */
+        private const val TARGET_ANNOTATION = "top.sacz.timtool.hook.core.annotation.HookItem"
+
+        /**
+         * 生成的类名称
+         * */
+        private const val GENERATED_CLASS_NAME = "HookItemEntryList"
+
+        /**
+         * 生成的方法名称
+         */
+        private const val GENERATED_FUNCTION_NAME = "getAllHookItems"
+    }
+
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         //获取被注解标记的类列表
         val symbols =
-            resolver.getSymbolsWithAnnotation("top.sacz.timtool.hook.core.annotation.HookItem")
+            resolver.getSymbolsWithAnnotation(TARGET_ANNOTATION)
                 .filterIsInstance<KSClassDeclaration>()
                 .toList()
         if (symbols.isEmpty()) return emptyList()
         //返回类型
-        val returnType = ClassName("kotlin.collections", "List")
-        //基😮类
-        val genericsType = ClassName("top.sacz.timtool.hook.base", "BaseHookItem")
+        val returnType = ClassName(RETURN_TYPE_PACKAGE, RETURN_TYPE_NAME)
+        //基类
+        val genericsType = ClassName(BASE_CLASS_PACKAGE, BASE_CLASS_NAME)
         //方法构建
-        val methodBuilder = FunSpec.builder("getAllHookItems")
+        val methodBuilder = FunSpec.builder(GENERATED_FUNCTION_NAME)
         methodBuilder.returns(returnType.parameterizedBy(genericsType))//泛型返回
         methodBuilder.addAnnotation(JvmStatic::class)//jvm静态方法
         methodBuilder.addCode(
             CodeBlock.Builder().apply {
-                addStatement("val list = mutableListOf<BaseHookItem>()")
+                addStatement("val list = mutableListOf<%T>()", genericsType)
                 for (symbol in symbols) {
                     val typeName = symbol.toClassName()
                     //获取 hook item 注解
@@ -72,14 +114,14 @@ class HookItemScanner(
         )
 
         //class
-        val classSpec = TypeSpec.objectBuilder("HookItemEntryList")
+        val classSpec = TypeSpec.objectBuilder(GENERATED_CLASS_NAME)
             .addFunction(methodBuilder.build())
             .build()
         val dependencies = Dependencies(true, *Array(symbols.size) {
             symbols[it].containingFile!!
         })
         //文件
-        FileSpec.builder("top.sacz.timtool.hook.gen", "HookItemEntryList")
+        FileSpec.builder(GENERATED_PACKAGE, GENERATED_CLASS_NAME)
             .addType(classSpec)
             .build()
             .writeTo(codeGenerator, dependencies)