fix:修复评论时输入框被键盘遮挡的问题

Author: Mamba_out

app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java

@@ -211,31 +211,44 @@ public static SpiderQueen obtainSpiderQueen(@NonNull Context context,
 
     @UiThread
     public static int findStartPage(@NonNull Context context, @NonNull GalleryInfo galleryInfo) {
-        SpiderInfo spiderInfo = null;
-        SimpleDiskCache msic;
-        EhApplication application = (EhApplication) context.getApplicationContext();
-        msic = EhApplication.getSpiderInfoCache(application);
-        InputStreamPipe pipe = msic.getInputStreamPipe(Long.toString(galleryInfo.gid));
-        if (null != pipe) {
-            try {
-                pipe.obtain();
-                spiderInfo = SpiderInfo.read(pipe.open());
-            } catch (IOException ignore) {
-                // Ignore
-//                Crashes.trackError(ignore);
-            } finally {
-                pipe.close();
-                pipe.release();
-            }
-        }
+        SpiderInfo fromDownload = SpiderInfo.getSpiderInfo(galleryInfo);
+        SpiderInfo fromCache = readSpiderInfoFromCache(context, galleryInfo.gid);
 
         int startPage = 0;
-        if (spiderInfo != null) {
-            startPage = spiderInfo.startPage;
+        if (isValidSpiderInfo(fromDownload, galleryInfo)) {
+            startPage = fromDownload.startPage;
+        }
+        if (isValidSpiderInfo(fromCache, galleryInfo)) {
+            startPage = Math.max(startPage, fromCache.startPage);
         }
         return startPage;
     }
 
+    @Nullable
+    private static SpiderInfo readSpiderInfoFromCache(@NonNull Context context, long gid) {
+        EhApplication application = (EhApplication) context.getApplicationContext();
+        SimpleDiskCache cache = EhApplication.getSpiderInfoCache(application);
+        InputStreamPipe pipe = cache.getInputStreamPipe(Long.toString(gid));
+        if (pipe == null) {
+            return null;
+        }
+        try {
+            pipe.obtain();
+            return SpiderInfo.read(pipe.open());
+        } catch (IOException ignore) {
+            return null;
+        } finally {
+            pipe.close();
+            pipe.release();
+        }
+    }
+
+    private static boolean isValidSpiderInfo(@Nullable SpiderInfo spiderInfo,
+            @NonNull GalleryInfo galleryInfo) {
+        return spiderInfo != null && spiderInfo.gid == galleryInfo.gid
+                && TextUtils.equals(spiderInfo.token, galleryInfo.token);
+    }
+
     @UiThread
     public static void releaseSpiderQueen(@NonNull SpiderQueen queen, @Mode int mode) {
         OSUtils.checkMainLoop();
@@ -721,13 +734,20 @@ public int getStartPage() {
 
     @SuppressLint("StaticFieldLeak")
     public void putStartPage(int page) {
-        final SpiderInfo spiderInfo = mSpiderInfo.get();
+        SpiderInfo spiderInfo = mSpiderInfo.get();
+        if (spiderInfo == null) {
+            spiderInfo = readSpiderInfoFromLocal();
+            if (spiderInfo != null) {
+                mSpiderInfo.lazySet(spiderInfo);
+            }
+        }
         if (spiderInfo != null) {
             spiderInfo.startPage = page;
+            final SpiderInfo infoToWrite = spiderInfo;
             new AsyncTask<Void, Void, Void>() {
                 @Override
                 protected Void doInBackground(Void... params) {
-                    writeSpiderInfoToLocal(spiderInfo);
+                    writeSpiderInfoToLocal(infoToWrite);
                     return null;
                 }
             }.executeOnExecutor(IoThreadPoolExecutor.Companion.getInstance());
@@ -740,36 +760,46 @@ private synchronized SpiderInfo readSpiderInfoFromLocal() {
             return spiderInfo;
         }
 
-        // Read from download dir
+        SpiderInfo fromDownload = null;
         UniFile downloadDir = mSpiderDen.getDownloadDir();
         if (downloadDir != null) {
             UniFile file = downloadDir.findFile(SPIDER_INFO_FILENAME);
-            spiderInfo = SpiderInfo.read(file);
-            if (spiderInfo != null && spiderInfo.gid == mGalleryInfo.gid &&
-                    spiderInfo.token.equals(mGalleryInfo.token)) {
-                return spiderInfo;
+            SpiderInfo read = SpiderInfo.read(file);
+            if (isValidSpiderInfo(read, mGalleryInfo)) {
+                fromDownload = read;
             }
         }
 
-        // Read from cache
-        InputStreamPipe pipe = mSpiderInfoCache.getInputStreamPipe(Long.toString(mGalleryInfo.gid));
-        if (null != pipe) {
-            try {
-                pipe.obtain();
-                spiderInfo = SpiderInfo.read(pipe.open());
-                if (spiderInfo != null && spiderInfo.gid == mGalleryInfo.gid &&
-                        spiderInfo.token.equals(mGalleryInfo.token)) {
-                    return spiderInfo;
-                }
-            } catch (IOException e) {
-                // Ignore
-            } finally {
-                pipe.close();
-                pipe.release();
-            }
+        SpiderInfo fromCache = readSpiderInfoFromCache(mGalleryInfo.gid);
+        if (!isValidSpiderInfo(fromCache, mGalleryInfo)) {
+            fromCache = null;
         }
 
-        return null;
+        if (fromDownload == null) {
+            return fromCache;
+        }
+        if (fromCache == null) {
+            return fromDownload;
+        }
+        fromDownload.startPage = Math.max(fromDownload.startPage, fromCache.startPage);
+        return fromDownload;
+    }
+
+    @Nullable
+    private SpiderInfo readSpiderInfoFromCache(long gid) {
+        InputStreamPipe pipe = mSpiderInfoCache.getInputStreamPipe(Long.toString(gid));
+        if (pipe == null) {
+            return null;
+        }
+        try {
+            pipe.obtain();
+            return SpiderInfo.read(pipe.open());
+        } catch (IOException e) {
+            return null;
+        } finally {
+            pipe.close();
+            pipe.release();
+        }
     }
 
     private void readPreviews(String body, int index, SpiderInfo spiderInfo) throws ParseException {
@@ -862,21 +892,19 @@ private String getPTokenFromInternet(int index) {
     }
 
     private synchronized void writeSpiderInfoToLocal(@NonNull SpiderInfo spiderInfo) {
-        // Only download mode or sync-while-reading is allowed to write into download dir.
-        if (mSpiderDen.shouldWriteToDownloadDir()) {
-            UniFile downloadDir = mSpiderDen.getDownloadDir();
-            if (downloadDir != null) {
-                UniFile file = downloadDir.createFile(SPIDER_INFO_FILENAME);
-                try {
-                    spiderInfo.write(file.openOutputStream());
-                } catch (Throwable e) {
-                    ExceptionUtils.throwIfFatal(e);
-                    // Ignore
-                }
+        // Sync reading progress into an existing download folder; does not create one.
+        UniFile downloadDir = mSpiderDen.getDownloadDir();
+        if (downloadDir != null) {
+            UniFile file = downloadDir.createFile(SPIDER_INFO_FILENAME);
+            try {
+                spiderInfo.write(file.openOutputStream());
+            } catch (Throwable e) {
+                ExceptionUtils.throwIfFatal(e);
+                // Ignore
             }
         }
 
-        // Read from cache
+        // Write to cache
         OutputStreamPipe pipe = mSpiderInfoCache.getOutputStreamPipe(Long.toString(mGalleryInfo.gid));
         try {
             pipe.obtain();

app/src/main/java/com/hippo/ehviewer/ui/scene/gallery/detail/GalleryDetailScene.java

@@ -685,6 +685,15 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        GalleryInfo info = getGalleryInfo();
+        if (info != null && mGalleryDetail != null && mPages != null) {
+            bindReadProgress(info);
+        }
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();