update 1.9.6.8

1.紧急修复了获取不到原图链接导致无法下载原图的问题 2.画廊详情页新增阅读进度显示
xiaojieonly · Nov 11, 2023 · c87fb68 · c87fb68
1 parent 31b95ed
commit c87fb68
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 27 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 111
-        versionName "1.9.6.7"
+        versionName "1.9.6.8"
         vectorDrawables.useSupportLibrary = true
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
         testOptions.unitTests.includeAndroidResources = true

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java
@@ -32,6 +32,7 @@
 import com.hippo.ehviewer.client.data.GalleryCommentList;
 import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ehviewer.client.data.GalleryInfo;
+import com.hippo.ehviewer.client.data.HomeDetail;
 import com.hippo.ehviewer.client.data.userTag.TagPushParam;
 import com.hippo.ehviewer.client.data.userTag.UserTag;
 import com.hippo.ehviewer.client.data.userTag.UserTagList;

diff --git a/...com/hippo/ehviewer/client/HomeDetail.java → ...ippo/ehviewer/client/data/HomeDetail.java b/...com/hippo/ehviewer/client/HomeDetail.java → ...ippo/ehviewer/client/data/HomeDetail.java
@@ -1,4 +1,4 @@
-package com.hippo.ehviewer.client;
+package com.hippo.ehviewer.client.data;
 
 public class HomeDetail {
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/EhHomeParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/EhHomeParser.java
@@ -2,7 +2,7 @@
 
 import android.util.Log;
 
-import com.hippo.ehviewer.client.HomeDetail;
+import com.hippo.ehviewer.client.data.HomeDetail;
 import com.hippo.ehviewer.client.exception.EhException;
 import com.hippo.yorozuya.NumberUtils;
 import com.microsoft.appcenter.crashes.Crashes;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageApiParser.java
@@ -28,7 +28,7 @@ public class GalleryPageApiParser {
 
     private static final Pattern PATTERN_IMAGE_URL = Pattern.compile("<img[^>]*src=\"([^\"]+)\" style");
     private static final Pattern PATTERN_SKIP_HATH_KEY = Pattern.compile("onclick=\"return nl\\('([^\\)]+)'\\)");
-    private static final Pattern PATTERN_ORIGIN_IMAGE_URL = Pattern.compile("<a href=\"([^\"]+)fullimg.php([^\"]+)\">");
+    private static final Pattern PATTERN_ORIGIN_IMAGE_URL = Pattern.compile("<a href=\"([^\"]+)fullimg([^\"]+)\">");
     private static final Pattern PATTERN_ORIGIN_IMAGE_URL_NEW = Pattern.compile("<a href=\"#\" onclick=\"prompt\\('Copy the URL below.', '([^\"]+)'\\)");
 
     public static Result parse(String body) throws ParseException {

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/gallery/detail/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/gallery/detail/GalleryDetailScene.java
@@ -135,6 +135,7 @@
 import com.microsoft.appcenter.crashes.Crashes;
 
 import com.hippo.ehviewer.spider.SpiderQueen;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -947,8 +948,18 @@ private void bindViewSecond() {
         Context context = getEHContext();
         SpiderQueen mSpiderQueen;
         mSpiderQueen = SpiderQueen.obtainSpiderQueen(context, galleryInfo, SpiderQueen.MODE_READ);
-        mPages.setText(mSpiderQueen.getStartPage()+"/"+resources.getQuantityString(
-               R.plurals.page_count, gd.pages, gd.pages));
+        int ssp = mSpiderQueen.getStartPage();
+        int startPage;
+        if (ssp == 0) {
+            startPage = 0;
+        } else {
+            startPage = ssp + 1;
+        }
+
+        mPages.setText(startPage + "/" + resources.getQuantityString(
+                R.plurals.page_count, gd.pages, gd.pages));
+//        mPages.setText(resources.getQuantityString(
+//                R.plurals.page_count, gd.pages, gd.pages));
         mSize.setText(gd.size);
         mPosted.setText(gd.posted);
         mFavoredTimes.setText(resources.getString(R.string.favored_times, gd.favoriteCount));

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/gallery/list/GalleryAdapterNew.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/gallery/list/GalleryAdapterNew.java
@@ -50,13 +50,17 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+
 import android.content.Context;
+
 import com.hippo.ehviewer.spider.SpiderQueen;
+
 abstract class GalleryAdapterNew extends RecyclerView.Adapter<GalleryAdapterNew.GalleryHolder> {
 
     @IntDef({TYPE_LIST, TYPE_GRID})
     @Retention(RetentionPolicy.SOURCE)
-    public @interface Type {}
+    public @interface Type {
+    }
 
     public static final int TYPE_INVALID = -1;
     public static final int TYPE_LIST = 0;
@@ -78,7 +82,6 @@ abstract class GalleryAdapterNew extends RecyclerView.Adapter<GalleryAdapterNew.
     private DownloadManager mDownloadManager;
 
 
-
     public GalleryAdapterNew(@NonNull LayoutInflater inflater, @NonNull Resources resources,
                              @NonNull RecyclerView recyclerView, int type, boolean showFavourited) {
         mInflater = inflater;
@@ -174,7 +177,7 @@ public GalleryAdapterNew.GalleryHolder onCreateViewHolder(ViewGroup parent, int
                 break;
         }
 
-        GalleryAdapterNew.GalleryHolder holder = new GalleryAdapterNew.GalleryHolder(mInflater.inflate(layoutId, parent, false),myOnThumbItemClickListener,viewType);
+        GalleryAdapterNew.GalleryHolder holder = new GalleryAdapterNew.GalleryHolder(mInflater.inflate(layoutId, parent, false), myOnThumbItemClickListener, viewType);
 
         if (viewType == TYPE_LIST) {
             ViewGroup.LayoutParams lp = holder.thumb.getLayoutParams();
@@ -192,7 +195,7 @@ public int getItemViewType(int position) {
     }
 
     @Nullable
-    public  GalleryInfo getDataAt(int position) {
+    public GalleryInfo getDataAt(int position) {
         return null;
     }
 
@@ -221,15 +224,16 @@ public void onBindViewHolder(GalleryAdapterNew.GalleryHolder holder, int positio
                     holder.pages.setText(null);
                     holder.pages.setVisibility(View.GONE);
                 } else {
-                     SpiderQueen mSpiderQueen;
-                     mSpiderQueen = SpiderQueen.obtainSpiderQueen(mInflater.getContext(), gi, SpiderQueen.MODE_READ);
-                     if(mSpiderQueen.getStartPage()>0)
-                     {
-                         holder.pages.setText(mSpiderQueen.getStartPage()+1+"/"+gi.pages + "P");
-                     }else
-                     {
-                         holder.pages.setText("0/"+gi.pages + "P");
-                     }
+//                    会导致卡顿
+//                    SpiderQueen mSpiderQueen;
+//                    mSpiderQueen = SpiderQueen.obtainSpiderQueen(mInflater.getContext(), gi, SpiderQueen.MODE_READ);
+//                    if (mSpiderQueen.getStartPage() > 0) {
+//                        holder.pages.setText(mSpiderQueen.getStartPage() + 1 + "/" + gi.pages + "P");
+//                    } else {
+//                        holder.pages.setText("0/" + gi.pages + "P");
+//                    }
+//                    holder.pages.setVisibility(View.VISIBLE);
+                    holder.pages.setText(gi.pages + "P");
                     holder.pages.setVisibility(View.VISIBLE);
                 }
                 if (TextUtils.isEmpty(gi.simpleLanguage)) {
@@ -262,12 +266,12 @@ public void onBindViewHolder(GalleryAdapterNew.GalleryHolder holder, int positio
         ViewCompat.setTransitionName(holder.thumb, TransitionNameFactory.getThumbTransitionName(gi.gid));
     }
 
-    public void setThumbItemClickListener(OnThumbItemClickListener listener){
+    public void setThumbItemClickListener(OnThumbItemClickListener listener) {
         myOnThumbItemClickListener = listener;
     }
 
-    public interface OnThumbItemClickListener{
-        void onThumbItemClick(int position,View view,GalleryInfo gi);
+    public interface OnThumbItemClickListener {
+        void onThumbItemClick(int position, View view, GalleryInfo gi);
     }
 
     public class GalleryHolder extends RecyclerView.ViewHolder {
@@ -283,7 +287,7 @@ public class GalleryHolder extends RecyclerView.ViewHolder {
         public final ImageView favourite;
         public final ImageView downloaded;
 
-        public GalleryHolder(View itemView,final OnThumbItemClickListener onThumbItemClickListener,int mType) {
+        public GalleryHolder(View itemView, final OnThumbItemClickListener onThumbItemClickListener, int mType) {
             super(itemView);
             thumb = itemView.findViewById(R.id.thumb_new);
             title = itemView.findViewById(R.id.title);
@@ -295,11 +299,11 @@ public GalleryHolder(View itemView,final OnThumbItemClickListener onThumbItemCli
             simpleLanguage = itemView.findViewById(R.id.simple_language);
             favourite = itemView.findViewById(R.id.favourited);
             downloaded = itemView.findViewById(R.id.downloaded);
-            if (mType == 0){
+            if (mType == 0) {
                 thumb.setOnClickListener(v -> {
-                    if (onThumbItemClickListener != null){
+                    if (onThumbItemClickListener != null) {
                         int position = getAdapterPosition();
-                        onThumbItemClickListener.onThumbItemClick(position,itemView,getDataAt(position));
+                        onThumbItemClickListener.onThumbItemClick(position, itemView, getDataAt(position));
                     }
                 });
             }

diff --git a/app/src/main/java/com/hippo/ehviewer/widget/LimitsCountView.java b/app/src/main/java/com/hippo/ehviewer/widget/LimitsCountView.java
@@ -19,7 +19,7 @@
 import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.client.EhClient;
 import com.hippo.ehviewer.client.EhRequest;
-import com.hippo.ehviewer.client.HomeDetail;
+import com.hippo.ehviewer.client.data.HomeDetail;
 
 import java.util.ArrayList;
 import java.util.List;