Merge pull request #737 from LoxiaLiSA/master

aa

Author: CeuiLiSA

app/build.gradle

@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId "ceui.lisa.pixiv"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 34
         versionCode 506
         versionName "5.0.6"
@@ -131,7 +131,7 @@ dependencies {
 
     implementation 'com.github.lzyzsd:circleprogress:1.2.1'
 
-    def refresh_version = "2.1.0"
+    def refresh_version = "3.0.0-alpha"
     implementation "io.github.scwang90:refresh-layout-kernel:$refresh_version"     //核心必须依赖
     implementation "io.github.scwang90:refresh-header-classics:$refresh_version"    //经典刷新头
     implementation "io.github.scwang90:refresh-header-falsify:$refresh_version"     //虚拟刷新头
@@ -146,6 +146,8 @@ dependencies {
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
     implementation 'androidx.room:room-runtime:2.5.0'
     implementation "androidx.room:room-ktx:2.5.0"
+    implementation "androidx.room:room-paging:2.5.0"
+
     kapt 'androidx.room:room-compiler:2.5.0'
     implementation 'com.github.Justson.AgentWeb:agentweb-core:v4.1.9-androidx'
     implementation 'com.github.Justson.AgentWeb:agentweb-filechooser:v4.1.9-androidx'
@@ -195,15 +197,21 @@ dependencies {
     implementation project(path: ':progressmanager')
     implementation project(path: ':flowlayout-lib')
     implementation 'com.waynejo:androidndkgif:0.3.3'
-    implementation 'com.tencent:mmkv-static:1.3.9'
+
+    implementation 'com.tencent:mmkv-static:2.2.2'
     implementation 'com.github.tbruyelle:RxPermissions:0.12'
 
+
     implementation 'androidx.webkit:webkit:1.12.1'
     implementation 'org.jsoup:jsoup:1.18.1'
 
     implementation 'com.hjq:toast:8.8'
     implementation 'com.jakewharton.timber:timber:5.0.1'
 
+
+    def paging_version = "3.3.6"
+    implementation "androidx.paging:paging-runtime-ktx:$paging_version"
+
     testImplementation 'junit:junit:4.13.2'
 
     implementation 'com.github.yalantis:ucrop:2.2.10'

app/src/main/java/ceui/lisa/activities/Shaft.java

@@ -40,6 +40,7 @@
 import ceui.pixiv.db.EntityWrapper;
 import ceui.pixiv.session.SessionManager;
 import ceui.pixiv.ui.background.AppBackground;
+import ceui.pixiv.ui.task.TaskPool;
 import ceui.pixiv.utils.NetworkStateManager;
 import me.jessyan.progressmanager.ProgressManager;
 import okhttp3.OkHttpClient;
@@ -80,6 +81,7 @@ public class Shaft extends Application implements ServicesProvider {
     private OkHttpClient mOkHttpClient;
     private EntityWrapper entityWrapper;
     private AppBackground appBackground;
+    private TaskPool taskPool;
 
     public static Context getContext() {
         return sContext;
@@ -130,6 +132,7 @@ public void onCreate() {
 
         networkStateManager = new NetworkStateManager(this);
         appBackground = new AppBackground();
+        taskPool = new TaskPool();
         sUserModel = Local.getUser();
 
         sSettings = Local.getSettings();
@@ -263,4 +266,9 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
     public @NotNull AppBackground getAppBackground() {
         return appBackground;
     }
+
+    @Override
+    public @NotNull TaskPool getTaskPool() {
+        return taskPool;
+    }
 }

app/src/main/java/ceui/lisa/database/AppDatabase.java

@@ -6,12 +6,14 @@
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
-
 import androidx.room.migration.Migration;
 import androidx.sqlite.db.SupportSQLiteDatabase;
+
 import ceui.lisa.feature.FeatureEntity;
 import ceui.pixiv.db.GeneralDao;
 import ceui.pixiv.db.GeneralEntity;
+import ceui.pixiv.db.RemoteKey;
+import ceui.pixiv.db.RemoteKeyDao;
 
 @Database(
         entities = {
@@ -26,30 +28,26 @@
                 FeatureEntity.class, //记录用户收藏的精华列表
                 DownloadingEntity.class, //记录用户正在下载中的列表
                 GeneralEntity.class, // 新增的 GeneralEntity
+                RemoteKey.class,
         },
-        version = 26,
+        version = 27,
         exportSchema = false
 )
 public abstract class AppDatabase extends RoomDatabase {
 
     public static final String DATABASE_NAME = "roomDemo-database";
-
-    private static AppDatabase INSTANCE;
-
     private static final Migration MIGRATION_23_24 = new Migration(23, 24) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
             database.execSQL("ALTER TABLE feature_table ADD COLUMN seriesId INTEGER NOT NULL DEFAULT 0");
         }
     };
-
     private static final Migration MIGRATION_24_25 = new Migration(24, 25) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
             database.execSQL("ALTER TABLE search_table ADD COLUMN pinned INTEGER NOT NULL DEFAULT 0");
         }
     };
-
     // 迁移 25 -> 26 (创建 general_table)
     private static final Migration MIGRATION_25_26 = new Migration(25, 26) {
         @Override
@@ -66,7 +64,21 @@ public void migrate(@NonNull SupportSQLiteDatabase database) {
             );
         }
     };
+    private static final Migration MIGRATION_26_27 = new Migration(26, 27) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            // 创建 remote_keys 表
+            database.execSQL(
+                    "CREATE TABLE IF NOT EXISTS remote_keys (" +
+                            "recordType INTEGER NOT NULL PRIMARY KEY, " +
+                            "nextPageUrl TEXT" +
+                            ")"
+            );
+        }
+    };
+
 
+    private static AppDatabase INSTANCE;
 
     public static AppDatabase getAppDatabase(Context context) {
         if (INSTANCE == null) {
@@ -79,6 +91,7 @@ public static AppDatabase getAppDatabase(Context context) {
                             .addMigrations(MIGRATION_23_24)
                             .addMigrations(MIGRATION_24_25)
                             .addMigrations(MIGRATION_25_26) // 注册 25 -> 26 迁移
+                            .addMigrations(MIGRATION_26_27)
                             .build();
         }
         return INSTANCE;
@@ -96,5 +109,7 @@ public static void destroyInstance() {
 
     public abstract GeneralDao generalDao();
 
+    public abstract RemoteKeyDao remoteKeyDao();
+
 }
 

app/src/main/java/ceui/lisa/fragments/FragmentIllust.kt

@@ -180,7 +180,10 @@ class FragmentIllust : SwipeFragment<FragmentIllustBinding>() {
                 }
 
                 override fun updateDrawState(ds: TextPaint) {
-                    ds.color = Common.resolveThemeAttribute(mContext, androidx.appcompat.R.attr.colorPrimary)
+                    ds.color = Common.resolveThemeAttribute(
+                        mContext,
+                        androidx.appcompat.R.attr.colorPrimary
+                    )
                 }
             }
             val spannableString: SpannableString
@@ -286,7 +289,7 @@ class FragmentIllust : SwipeFragment<FragmentIllustBinding>() {
                 val intent = Intent(mContext, TemplateActivity::class.java)
                 intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "举报插画")
                 intent.putExtra(FlagDescFragment.FlagObjectIdKey, illust.id)
-                intent.putExtra(FlagDescFragment.FlagObjectTypeKey, ObjectSpec.POST)
+                intent.putExtra(FlagDescFragment.FlagObjectTypeKey, ObjectSpec.JAVA_ILLUST)
                 startActivity(intent)
                 return@OnMenuItemClickListener true
             }
@@ -374,8 +377,8 @@ class FragmentIllust : SwipeFragment<FragmentIllustBinding>() {
         baseBind.coreLinear.viewTreeObserver.addOnGlobalLayoutListener(object :
             OnGlobalLayoutListener {
             override fun onGlobalLayout() {
-                val v = view ?: return
-                val ctx = context ?: return
+                view ?: return
+                context ?: return
                 val realHeight = baseBind.bottomBar.height +
                         baseBind.viewDivider.height +
                         baseBind.secondLinear.height

app/src/main/java/ceui/lisa/fragments/FragmentImageDetail.kt

@@ -11,9 +11,9 @@ import ceui.lisa.databinding.FragmentImageDetailBinding
 import ceui.lisa.download.IllustDownload
 import ceui.lisa.models.IllustsBean
 import ceui.lisa.utils.Params
+import ceui.loxia.requireTaskPool
 import ceui.pixiv.ui.common.setUpWithTaskStatus
 import ceui.pixiv.ui.task.NamedUrl
-import ceui.pixiv.ui.task.TaskPool
 import ceui.pixiv.ui.works.ToggleToolnarViewModel
 import ceui.pixiv.utils.setOnClick
 import com.github.panpf.sketch.loadImage
@@ -59,7 +59,10 @@ class FragmentImageDetail : BaseFragment<FragmentImageDetailBinding?>() {
         }
 
         if (imageUrl?.isNotEmpty() == true) {
-            val task = TaskPool.getLoadTask(NamedUrl("", imageUrl), requireActivity().lifecycleScope)
+            val task = requireTaskPool().getLoadTask(
+                NamedUrl("", imageUrl),
+                requireActivity().lifecycleScope
+            )
             task.result.observe(viewLifecycleOwner) { file ->
                 baseBind.image.loadImage(file)
             }

app/src/main/java/ceui/lisa/view/StaggeredGridSpacingItemDecoration.kt

@@ -0,0 +1,40 @@
+package ceui.lisa.view
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+
+class StaggeredGridSpacingItemDecoration(
+    private val spacing: Int,
+) : RecyclerView.ItemDecoration() {
+
+    override fun getItemOffsets(
+        outRect: Rect, view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        val position = parent.getChildAdapterPosition(view)
+        if (position == RecyclerView.NO_POSITION) return
+
+        val layoutParams = view.layoutParams as StaggeredGridLayoutManager.LayoutParams
+        val spanIndex = layoutParams.spanIndex
+
+        // Top spacing for all items except the first row
+        outRect.top = spacing
+
+        // Horizontal spacing based on column
+        if (spanIndex == 0) {
+            // Left column (A)
+            outRect.left = spacing
+            outRect.right = spacing / 2
+        } else {
+            // Right column (B)
+            outRect.left = spacing / 2
+            outRect.right = spacing
+        }
+
+        // Bottom spacing can also be added if needed
+        // outRect.bottom = spacing
+    }
+}

app/src/main/java/ceui/loxia/FragmentUtils.kt

@@ -10,16 +10,19 @@ import android.view.View
 import android.view.Window
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
+import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import com.blankj.utilcode.util.Utils
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import java.security.MessageDigest
 
 fun Context.showKeyboard(editText: EditText?) {
     val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
@@ -35,6 +38,28 @@ fun Context.hideKeyboard(window: Window?) {
     }
 }
 
+
+fun stableHash(input: String): Int {
+    val digest = MessageDigest.getInstance("SHA-256")
+    val hashBytes = digest.digest(input.toByteArray(Charsets.UTF_8))
+    // 使用前两个字节生成 0 ~ 65535 的正整数，然后取模 10000
+    val hashInt = ((hashBytes[0].toInt() and 0xFF) shl 8) or (hashBytes[1].toInt() and 0xFF)
+    val ret = hashInt % 10000
+    Timber.d("sadasdsw2 ${ret}")
+    return ret
+}
+
+
+fun openClashApp(context: Context) {
+    val packageName = "com.github.kr328.clash"
+    val launchIntent = context.packageManager.getLaunchIntentForPackage(packageName)
+    if (launchIntent != null) {
+        context.startActivity(launchIntent)
+    } else {
+        Toast.makeText(context, "未安装 Clash", Toast.LENGTH_SHORT).show()
+    }
+}
+
 fun Fragment.showKeyboard(editText: EditText?) {
     context?.showKeyboard(editText)
 }

app/src/main/java/ceui/loxia/Models.kt

@@ -180,7 +180,7 @@ data class Illust(
     override val objectUniqueId: Long
         get() = id
     override val objectType: Int
-        get() = ObjectSpec.Illust
+        get() = ObjectSpec.KOTLIN_ILLUST
 
     fun displayCreateDate(): String {
         return DateParse.displayCreateDate(create_date)
@@ -272,7 +272,7 @@ data class User(
     override val objectUniqueId: Long
         get() = if (id > 0L) id else user_id
     override val objectType: Int
-        get() = ObjectSpec.KUser
+        get() = ObjectSpec.KOTLIN_USER
 
     fun isOfficial(): Boolean {
         return ConstantUser.officialUsers.contains(id)
@@ -449,7 +449,12 @@ data class UserPreview(
     val is_muted: Boolean? = null,
     val novels: List<Any>? = null,
     val user: User? = null
-) : Serializable
+) : Serializable, ModelObject {
+    override val objectUniqueId: Long
+        get() = hashCode().toLong()
+    override val objectType: Int
+        get() = ObjectSpec.USER_PREVIEW
+}
 
 data class UserPreviewResponse(
     val user_previews: List<UserPreview> = listOf(),
@@ -473,10 +478,15 @@ data class TrendingTag(
     val tag: String? = null,
     val translated_name: String? = null,
     val illust: Illust? = null,
-) : Serializable {
+) : Serializable, ModelObject {
     fun buildTag(): Tag {
         return Tag(name = tag, translated_name = translated_name)
     }
+
+    override val objectUniqueId: Long
+        get() = illust?.id ?: 0L
+    override val objectType: Int
+        get() = ObjectSpec.TRENDING_TAG
 }
 
 data class NotificationResponse(
@@ -741,7 +751,7 @@ data class Novel(
     override val objectUniqueId: Long
         get() = id
     override val objectType: Int
-        get() = ObjectSpec.POST
+        get() = ObjectSpec.KOTLIN_NOVEL
 }
 
 data class Series(