release 1.9.9.1

xiaojieonly · Nov 4, 2024 · 612c3cd · 612c3cd
1 parent 2821abf
commit 612c3cd
Show file tree

Hide file tree

Showing 189 changed files with 405 additions and 405 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,27 @@
 # [感谢名单](https://github.com/xiaojieonly/Ehviewer_CN_SXJ/blob/BiLi_PC_Gamer/feedauthor/thankyou.md) 
 # [常见问题汇总](https://github.com/xiaojieonly/Ehviewer_CN_SXJ/blob/BiLi_PC_Gamer/feedauthor/EhviewerIssue.md)
 
+# 2024/10/29 : 紧急修复(不再支持Android 9以下手机)
+ ###  新版发布1.9.9.1
+ ###  紧急更新webp格式支持
+
+   点击前往下载：[EhViewer (20.8 MB)](https://appteka.store/app/2f4r195618)   
+   点击前往下载：[Microsoft App Center](install.appcenter.ms/users/xiaojieonly/apps/com.xjs.ehviewer/distribution_groups/let's%20roll)   
+   点击前往下载：[百度云](https://pan.baidu.com/s/1UYLjcVUM_6Y9vLo85oIAEQ)  密码:3f4g   
+   点击前往下载（电脑端可正常下载）：[蓝奏云](https://wwsu.lanzouj.com/iJPTF2e9p5cd)  密码:73ym   
+   点击前往下载：[github](https://github.com/xiaojieonly/Ehviewer_CN_SXJ/releases)    
+   点击前往赏饭：[要饭嘛不寒掺](https://github.com/xiaojieonly/Ehviewer_CN_SXJ/blob/BiLi_PC_Gamer/feedauthor/support.md)    
+   Torrent链接：magnet:?xt=urn:btih:44ee110643fb1830843e197feb6403503fa554c7&xt=urn:btmh:122047ea931afbe25cb0f4c5fa74a57c03194ed8f2cb76e0d070b99b8a99b3c31b50&dn=EhViewer-1.9.9.1.apk   
+   Telegram群:https://t.me/+WyclP8pPlk-JfbwS    
+   Telegram通知群:https://t.me/Ehviewer_xiaojieonly_channel
+
+
 # 2024/10/29 : 紧急修复
-###  新版发布1.9.9.0
-###  紧急修复解析详情页的正则表达式
-###  修复画廊详情H@H功能解析失败的问题
-###  紧急修复解析详情页的正则表达式在Gallery Page Thumbnail Labeling设置不为none时解析失败的问题
-###  紧急修复解析详情页的正则表达式在Thumbnail Settings为small时解析失败的问题
+ ###  新版发布1.9.9.0
+ ###  紧急修复解析详情页的正则表达式
+ ###  修复画廊详情H@H功能解析失败的问题
+ ###  紧急修复解析详情页的正则表达式在Gallery Page Thumbnail Labeling设置不为none时解析失败的问题
+ ###  紧急修复解析详情页的正则表达式在Thumbnail Settings为small时解析失败的问题
 
 
    点击前往下载：[EhViewer (20.8 MB)](https://appteka.store/app/2f4r195618)   

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
     testNamespace 'com.hippo.ehviewer.debug'
     compileSdk 34
 //    buildToolsVersion "30.0.3"
-    ndkVersion '25.1.8937393'
+//    ndkVersion '25.1.8937393'
 
     flavorDimensions "distribute"
     productFlavors {
@@ -30,7 +30,7 @@ android {
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 111
-        versionName "1.9.9.0"
+        versionName "1.9.9.1"
         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/app/ListCheckBoxDialogBuilder.java b/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java
@@ -26,7 +26,7 @@
 import android.widget.ListView;
 import androidx.appcompat.app.AlertDialog;
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.ViewUtils;
+import com.hippo.lib.yorozuya.ViewUtils;
 
 public class ListCheckBoxDialogBuilder extends AlertDialog.Builder {
 

diff --git a/app/src/main/java/com/hippo/conaco/Conaco.java b/app/src/main/java/com/hippo/conaco/Conaco.java
@@ -23,8 +23,8 @@
 import androidx.annotation.UiThread;
 
 import com.hippo.beerbelly.BeerBelly;
-import com.hippo.yorozuya.thread.PriorityThreadFactory;
-import com.hippo.yorozuya.thread.SerialThreadExecutor;
+import com.hippo.lib.yorozuya.thread.PriorityThreadFactory;
+import com.hippo.lib.yorozuya.thread.SerialThreadExecutor;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/app/src/main/java/com/hippo/conaco/ConacoTask.java b/app/src/main/java/com/hippo/conaco/ConacoTask.java
@@ -260,7 +260,7 @@ Builder<T> setCache(ValueCache<T> cache) {
             return this;
         }
 
-        Builder<T> setOkHttpClient(OkHttpClient okHttpClient) {
+        public Builder<T> setOkHttpClient(OkHttpClient okHttpClient) {
             mOkHttpClient = okHttpClient;
             return this;
         }

diff --git a/app/src/main/java/com/hippo/conaco/Register.java b/app/src/main/java/com/hippo/conaco/Register.java
@@ -16,8 +16,8 @@
 
 package com.hippo.conaco;
 
-import com.hippo.yorozuya.collect.Multimap;
-import com.hippo.yorozuya.collect.SparseILArray;
+import com.hippo.lib.yorozuya.collect.Multimap;
+import com.hippo.lib.yorozuya.collect.SparseILArray;
 
 import java.util.List;
 

diff --git a/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java b/app/src/main/java/com/hippo/drawable/AddDeleteDrawable.java
@@ -29,7 +29,7 @@
 import android.os.Build;
 
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.lib.yorozuya.MathUtils;
 
 public class AddDeleteDrawable extends Drawable {
 

diff --git a/app/src/main/java/com/hippo/drawable/BatteryDrawable.java b/app/src/main/java/com/hippo/drawable/BatteryDrawable.java
@@ -24,7 +24,7 @@
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.lib.yorozuya.MathUtils;
 
 public class BatteryDrawable extends Drawable {
 

diff --git a/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java b/app/src/main/java/com/hippo/drawable/DrawerArrowDrawable.java
@@ -29,7 +29,7 @@
 import android.os.Build;
 import androidx.annotation.ColorInt;
 import com.hippo.ehviewer.R;
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.lib.yorozuya.MathUtils;
 
 /**
  * A drawable that can draw a "Drawer hamburger" menu or an Arrow and animate between them.

diff --git a/app/src/main/java/com/hippo/drawable/PreciselyClipDrawable.java b/app/src/main/java/com/hippo/drawable/PreciselyClipDrawable.java
@@ -21,7 +21,7 @@
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 
-import com.hippo.yorozuya.MathUtils;
+import com.hippo.lib.yorozuya.MathUtils;
 
 /**
  * Show a part of the original drawable

diff --git a/app/src/main/java/com/hippo/ehviewer/AppConfig.java b/app/src/main/java/com/hippo/ehviewer/AppConfig.java
@@ -22,8 +22,8 @@
 import androidx.annotation.Nullable;
 import com.hippo.ehviewer.client.exception.ParseException;
 import com.hippo.util.ReadableTime;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.IOUtils;
+import com.hippo.lib.yorozuya.FileUtils;
+import com.hippo.lib.yorozuya.IOUtils;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/app/src/main/java/com/hippo/ehviewer/Crash.java b/app/src/main/java/com/hippo/ehviewer/Crash.java
@@ -27,9 +27,9 @@
 import com.hippo.scene.StageActivity;
 import com.hippo.util.PackageUtils;
 import com.hippo.util.ReadableTime;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.IOUtils;
-import com.hippo.yorozuya.OSUtils;
+import com.hippo.lib.yorozuya.FileUtils;
+import com.hippo.lib.yorozuya.IOUtils;
+import com.hippo.lib.yorozuya.OSUtils;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;

diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java
@@ -67,10 +67,10 @@
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.IoThreadPoolExecutor;
 import com.hippo.util.ReadableTime;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.IntIdGenerator;
-import com.hippo.yorozuya.OSUtils;
-import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.lib.yorozuya.FileUtils;
+import com.hippo.lib.yorozuya.IntIdGenerator;
+import com.hippo.lib.yorozuya.OSUtils;
+import com.hippo.lib.yorozuya.SimpleHandler;
 
 import org.conscrypt.Conscrypt;
 

diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java
@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabaseLockedException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Bundle;
 import android.os.Handler;
@@ -57,9 +56,9 @@
 import com.hippo.ehviewer.download.DownloadManager;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.SqlUtils;
-import com.hippo.yorozuya.IOUtils;
-import com.hippo.yorozuya.ObjectUtils;
-import com.hippo.yorozuya.collect.SparseJLArray;
+import com.hippo.lib.yorozuya.IOUtils;
+import com.hippo.lib.yorozuya.ObjectUtils;
+import com.hippo.lib.yorozuya.collect.SparseJLArray;
 
 import org.greenrobot.greendao.AbstractDao;
 import org.greenrobot.greendao.query.CloseableListIterator;

diff --git a/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java b/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.java
@@ -18,7 +18,7 @@
 
 import android.annotation.SuppressLint;
 import com.hippo.ehviewer.client.data.GalleryInfo;
-import com.hippo.yorozuya.IntIdGenerator;
+import com.hippo.lib.yorozuya.IntIdGenerator;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java
@@ -34,17 +34,16 @@
 import com.hippo.ehviewer.client.EhConfig;
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.client.data.FavListUrlBuilder;
-import com.hippo.ehviewer.client.data.GalleryDetail;
 import com.hippo.ehviewer.client.data.GalleryInfo;
 import com.hippo.ehviewer.ui.CommonOperations;
 import com.hippo.ehviewer.ui.scene.gallery.list.GalleryListScene;
 import com.hippo.lib.glgallery.GalleryView;
 import com.hippo.unifile.UniFile;
 import com.hippo.util.ExceptionUtils;
-import com.hippo.yorozuya.AssertUtils;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.MathUtils;
-import com.hippo.yorozuya.NumberUtils;
+import com.hippo.lib.yorozuya.AssertUtils;
+import com.hippo.lib.yorozuya.FileUtils;
+import com.hippo.lib.yorozuya.MathUtils;
+import com.hippo.lib.yorozuya.NumberUtils;
 
 import java.io.File;
 import java.util.Locale;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhClient.java b/app/src/main/java/com/hippo/ehviewer/client/EhClient.java
@@ -26,7 +26,7 @@
 import com.hippo.ehviewer.client.exception.CancelledException;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.IoThreadPoolExecutor;
-import com.hippo.yorozuya.SimpleHandler;
+import com.hippo.lib.yorozuya.SimpleHandler;
 
 import java.io.File;
 import java.util.concurrent.ThreadPoolExecutor;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.java
@@ -65,7 +65,7 @@
 import com.hippo.network.StatusCodeException;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.FileUtils;
-import com.hippo.yorozuya.AssertUtils;
+import com.hippo.lib.yorozuya.AssertUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java
@@ -17,7 +17,6 @@
 package com.hippo.ehviewer.client;
 
 import android.content.Context;
-import android.os.Build;
 import android.util.Base64;
 import android.util.Pair;
 
@@ -31,17 +30,15 @@
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.IoThreadPoolExecutor;
 import com.hippo.util.TextUrl;
-import com.hippo.yorozuya.FileUtils;
-import com.hippo.yorozuya.IOUtils;
+import com.hippo.lib.yorozuya.FileUtils;
+import com.hippo.lib.yorozuya.IOUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -57,13 +54,8 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import okio.Buffer;
 import okio.BufferedSource;
-import okio.ByteString;
 import okio.Okio;
-import okio.Options;
-import okio.Sink;
-import okio.Timeout;
 
 public class EhTagDatabase {
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/LargePreviewSet.java b/app/src/main/java/com/hippo/ehviewer/client/data/LargePreviewSet.java
@@ -17,11 +17,10 @@
 package com.hippo.ehviewer.client.data;
 
 import android.os.Parcel;
-import android.os.Parcelable;
 
 import com.hippo.ehviewer.client.EhCacheKeyFactory;
 import com.hippo.widget.LoadImageView;
-import com.hippo.yorozuya.collect.IntList;
+import com.hippo.lib.yorozuya.collect.IntList;
 
 import java.util.ArrayList;
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.java
@@ -35,8 +35,8 @@
 import com.hippo.ehviewer.widget.AdvanceSearchTable;
 import com.hippo.ehviewer.widget.GalleryInfoContentHelper;
 import com.hippo.network.UrlBuilder;
-import com.hippo.yorozuya.NumberUtils;
-import com.hippo.yorozuya.StringUtils;
+import com.hippo.lib.yorozuya.NumberUtils;
+import com.hippo.lib.yorozuya.StringUtils;
 import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/NormalPreviewSet.java b/app/src/main/java/com/hippo/ehviewer/client/data/NormalPreviewSet.java
@@ -19,7 +19,7 @@
 import android.os.Parcel;
 
 import com.hippo.widget.LoadImageView;
-import com.hippo.yorozuya.collect.IntList;
+import com.hippo.lib.yorozuya.collect.IntList;
 
 import java.util.ArrayList;
 

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
@@ -5,7 +5,7 @@
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.hippo.ehviewer.client.data.HomeDetail;
 import com.hippo.ehviewer.client.exception.EhException;
-import com.hippo.yorozuya.NumberUtils;
+import com.hippo.lib.yorozuya.NumberUtils;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/FavoritesParser.java
@@ -25,7 +25,7 @@
 import com.hippo.ehviewer.client.exception.ParseException;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.JsoupUtils;
-import com.hippo.yorozuya.AssertUtils;
+import com.hippo.lib.yorozuya.AssertUtils;
 import java.util.List;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.java
@@ -19,7 +19,7 @@
 import com.hippo.ehviewer.client.EhUtils;
 import com.hippo.ehviewer.client.data.GalleryInfo;
 
-import com.hippo.yorozuya.NumberUtils;
+import com.hippo.lib.yorozuya.NumberUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java
@@ -39,8 +39,8 @@
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.JsoupUtils;
 import com.hippo.util.MutableBoolean;
-import com.hippo.yorozuya.NumberUtils;
-import com.hippo.yorozuya.StringUtils;
+import com.hippo.lib.yorozuya.NumberUtils;
+import com.hippo.lib.yorozuya.StringUtils;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailUrlParser.java
@@ -18,7 +18,7 @@
 
 import androidx.annotation.Nullable;
 import com.hippo.ehviewer.client.EhUrl;
-import com.hippo.yorozuya.NumberUtils;
+import com.hippo.lib.yorozuya.NumberUtils;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.java
@@ -29,7 +29,7 @@
 import com.hippo.ehviewer.sync.GalleryListTagsSyncTask;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.util.JsoupUtils;
-import com.hippo.yorozuya.NumberUtils;
+import com.hippo.lib.yorozuya.NumberUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListUrlParser.java
@@ -20,7 +20,7 @@
 
 import com.hippo.ehviewer.client.EhUrl;
 import com.hippo.ehviewer.client.data.ListUrlBuilder;
-import com.hippo.yorozuya.Utilities;
+import com.hippo.lib.yorozuya.Utilities;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;

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
@@ -18,7 +18,7 @@
 
 import android.text.TextUtils;
 import com.hippo.ehviewer.client.exception.ParseException;
-import com.hippo.yorozuya.StringUtils;
+import com.hippo.lib.yorozuya.StringUtils;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.json.JSONException;

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java
@@ -18,7 +18,7 @@
 
 import android.text.TextUtils;
 import com.hippo.ehviewer.client.exception.ParseException;
-import com.hippo.yorozuya.StringUtils;
+import com.hippo.lib.yorozuya.StringUtils;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;