From 0c9326c26d3597f5e9e9e32ac232c7918459dc2b Mon Sep 17 00:00:00 2001
From: CeuiLiSA <32817377+CeuiLiSA@users.noreply.github.com>
Date: Mon, 25 Jan 2021 13:58:29 +0800
Subject: [PATCH] 2.6.7

---
 app/build.gradle                              |  4 +--
 .../ceui/lisa/activities/MainActivity.java    | 26 +++++++++++++++++++
 app/src/main/java/ceui/lisa/file/OutPut.kt    | 20 ++++++++++----
 .../lisa/fragments/FragmentSingleUgora.java   |  2 +-
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8cb03c6e5..3ea719587 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 158
-        versionName "2.6.6"
+        versionCode 159
+        versionName "2.6.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
diff --git a/app/src/main/java/ceui/lisa/activities/MainActivity.java b/app/src/main/java/ceui/lisa/activities/MainActivity.java
index c0d585676..a62a3b131 100644
--- a/app/src/main/java/ceui/lisa/activities/MainActivity.java
+++ b/app/src/main/java/ceui/lisa/activities/MainActivity.java
@@ -36,6 +36,7 @@
 import ceui.lisa.fragments.FragmentCenter;
 import ceui.lisa.fragments.FragmentLeft;
 import ceui.lisa.fragments.FragmentRight;
+import ceui.lisa.http.Retro;
 import ceui.lisa.notification.BaseReceiver;
 import ceui.lisa.notification.CallBackReceiver;
 import ceui.lisa.utils.Common;
@@ -44,6 +45,9 @@
 import ceui.lisa.utils.Params;
 import ceui.lisa.utils.ReverseImage;
 import ceui.lisa.utils.ReverseWebviewCallback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 import static ceui.lisa.activities.Shaft.sUserModel;
 
@@ -424,5 +428,27 @@ protected void onResume() {
             initDrawerHeader();
             Dev.refreshUser = false;
         }
+        getUrl();
+    }
+
+    private void getUrl() {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                OkHttpClient client = Retro.getLogClient().build();
+
+                Request request = new Request.Builder()
+                        .url("http://www.pixiv.me/psyg2")
+                        .build();
+
+                try {
+                    Response response = client.newCall(request).execute();
+                    String result = response.body().string();
+                    Common.showLog("getUrl " + result);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }).start();
     }
 }
diff --git a/app/src/main/java/ceui/lisa/file/OutPut.kt b/app/src/main/java/ceui/lisa/file/OutPut.kt
index 3d05519a7..ccc3509c9 100644
--- a/app/src/main/java/ceui/lisa/file/OutPut.kt
+++ b/app/src/main/java/ceui/lisa/file/OutPut.kt
@@ -2,10 +2,14 @@ package ceui.lisa.file
 
 import android.content.ContentValues
 import android.content.Context
+import android.net.Uri
 import android.os.Environment
 import android.provider.MediaStore
+import ceui.lisa.activities.Shaft
 import ceui.lisa.download.ImageSaver
+import ceui.lisa.models.IllustsBean
 import ceui.lisa.utils.Common
+import ceui.lisa.utils.Settings
 import com.blankj.utilcode.util.FileUtils
 import com.blankj.utilcode.util.PathUtils
 import rxhttp.wrapper.utils.query
@@ -16,7 +20,7 @@ object OutPut {
     private val relativePath: String = Environment.DIRECTORY_PICTURES + "/ShaftImages"
 
     @JvmStatic
-    fun outPutGif(context: Context, from: File) {
+    fun outPutGif(context: Context, from: File, illust: IllustsBean) {
         if (Common.isAndroidQ()) {
             var uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI.query(context, from.name, relativePath)
             if (uri != null) {
@@ -55,11 +59,17 @@ object OutPut {
                 e.printStackTrace()
             }
         } else {
-            val parent = File(PathUtils.getExternalPicturesPath() + "/ShaftImages")
-            if (!parent.exists()) {
-                parent.mkdir()
+            val parentFile: File
+            if (illust.isR18File && Shaft.sSettings.isR18DivideSave) {
+                parentFile = File(Settings.FILE_PATH_SINGLE_R18)
+            } else {
+                parentFile = File(Settings.FILE_PATH_SINGLE)
+            }
+            if (!parentFile.exists()) {
+                parentFile.mkdir()
             }
-            val gifResult = File(parent, from.name)
+
+            val gifResult = File(parentFile, from.name)
             FileUtils.copy(from, gifResult)
             object : ImageSaver() {
                 override fun whichFile(): File {
diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentSingleUgora.java b/app/src/main/java/ceui/lisa/fragments/FragmentSingleUgora.java
index fa02fe8b7..180bc11cc 100644
--- a/app/src/main/java/ceui/lisa/fragments/FragmentSingleUgora.java
+++ b/app/src/main/java/ceui/lisa/fragments/FragmentSingleUgora.java
@@ -328,7 +328,7 @@ public void onPrepare() {
         baseBind.download.setOnClickListener(v -> {
             File gifFile = new LegacyFile().gifResultFile(mContext, illust);
             if (gifFile.exists() && gifFile.length() > 1024) {
-                OutPut.outPutGif(mContext, gifFile);
+                OutPut.outPutGif(mContext, gifFile, illust);
             } else {
                 Common.showToast("请先播放后下载");
             }