novel impr

CeuiLiSA · Mar 1, 2024 · 86a45fd · 86a45fd
1 parent e0177bc
commit 86a45fd
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 262
-        versionName "3.3.6"
+        versionCode 270
+        versionName "3.3.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {

diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentNovelHolder.java b/app/src/main/java/ceui/lisa/fragments/FragmentNovelHolder.java
@@ -1,5 +1,7 @@
 package ceui.lisa.fragments;
 
+import static ceui.lisa.activities.Shaft.sUserModel;
+
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.net.Uri;
@@ -45,6 +47,7 @@
 import ceui.lisa.interfaces.Callback;
 import ceui.lisa.models.NovelBean;
 import ceui.lisa.models.NovelDetail;
+import ceui.lisa.models.NovelSearchResponse;
 import ceui.lisa.models.TagsBean;
 import ceui.lisa.utils.Common;
 import ceui.lisa.utils.Dev;
@@ -107,7 +110,7 @@ public void onFinish(boolean isTransformed) {
 
     @Override
     protected void initData() {
-        getNovel(mNovelBean);
+        displayNovel(mNovelBean);
     }
 
     public void setBackgroundColor(int color) {
@@ -121,7 +124,7 @@ public void setTextColor(int color) {
         setNovelAdapter();
     }
 
-    private void getNovel(NovelBean novelBean) {
+    private void displayNovel(NovelBean novelBean) {
         mNovelBean = novelBean;
         if (mNovelBean.isIs_bookmarked()) {
             baseBind.like.setText(mContext.getString(R.string.string_179));
@@ -288,7 +291,15 @@ public boolean onTouch(View v, MotionEvent event) {
                 @Override
                 public void onClick(View view) {
                     baseBind.transformationLayout.finishTransform();
-                    getNovel(novelDetail.getSeries_prev());
+                    Retro.getAppApi().getNovelByID(sUserModel.getAccess_token(), novelDetail.getSeries_prev().getId())
+                            .subscribeOn(Schedulers.newThread())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new NullCtrl<NovelSearchResponse>() {
+                                @Override
+                                public void success(NovelSearchResponse novelSearchResponse) {
+                                    displayNovel(novelSearchResponse.getNovel());
+                                }
+                            });
                 }
             });
         } else {
@@ -300,7 +311,15 @@ public void onClick(View view) {
                 @Override
                 public void onClick(View view) {
                     baseBind.transformationLayout.finishTransform();
-                    getNovel(novelDetail.getSeries_next());
+                    Retro.getAppApi().getNovelByID(sUserModel.getAccess_token(), novelDetail.getSeries_next().getId())
+                            .subscribeOn(Schedulers.newThread())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(new NullCtrl<NovelSearchResponse>() {
+                                @Override
+                                public void success(NovelSearchResponse novelSearchResponse) {
+                                    displayNovel(novelSearchResponse.getNovel());
+                                }
+                            });
                 }
             });
         } else {
@@ -404,13 +423,15 @@ private void setNovelAdapter() {
                 int pageIndex = Math.min(novelDetail.getNovel_marker().getPage(),novelDetail.getParsedChapters().get(parsedSize-1).getChapterIndex());
                 pageIndex = Math.max(pageIndex,novelDetail.getParsedChapters().get(0).getChapterIndex());
                 baseBind.viewPager.scrollToPosition(pageIndex-1);
-            }
 
-            // 设置书签
-            int markerPage = mNovelDetail.getNovel_marker().getPage();
-            if(markerPage > 0){
-                baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_add)));
-            }else{
+                // 设置书签
+                int markerPage = mNovelDetail.getNovel_marker().getPage();
+                if(markerPage > 0){
+                    baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_add)));
+                }else{
+                    baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_none)));
+                }
+            } else  {
                 baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_none)));
             }