Merge pull request #482 from sunbeams001/minor-fix-54

一些修改
CeuiLiSA · Oct 17, 2022 · 7d01a8d · 7d01a8d
2 parents 144a4f3 + 202145a
commit 7d01a8d
Show file tree

Hide file tree

Showing 29 changed files with 253 additions and 97 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -28,6 +28,7 @@ body:
   - type: checkboxes
     id: official-support
     attributes:
+      label: Official support / 官方支持情况
       options:
         - label: Is this feature supported by the official pixiv app? / 官方App是否支持
 

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -50,8 +50,8 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled = true
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     sourceSets {
@@ -91,26 +91,26 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     //=============== lifecycle
-    def lifecycle_version = '2.4.0'
+    def lifecycle_version = '2.5.1'
 
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 
 
 
     //=============== Navigation
-    def nav_version = "2.3.5"
+    def nav_version = "2.5.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
 
     api 'com.squareup.retrofit2:retrofit:2.9.0'
     api 'com.squareup.retrofit2:converter-gson:2.9.0'
@@ -155,8 +155,8 @@ dependencies {
     implementation 'com.github.skydoves:transformationlayout:1.1.1'
     implementation 'com.blankj:utilcodex:1.31.0'
     implementation 'com.safframework.log:saf-logginginterceptor:1.6.0'
-    implementation 'com.google.firebase:firebase-analytics:20.0.2'
-    implementation 'com.google.firebase:firebase-crashlytics:18.2.7'
+    implementation 'com.google.firebase:firebase-analytics:21.1.0'
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.12'
 
     implementation 'com.afollestad:drag-select-recyclerview:2.4.0'
 
@@ -200,7 +200,7 @@ dependencies {
     implementation 'org.honorato.multistatetogglebutton:multistatetogglebutton:0.2.2'
     implementation "io.noties.markwon:core:4.6.2"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
 
     configurations {
         all*.exclude group: 'com.android.support', module: 'support-v13'

diff --git a/app/src/main/java/ceui/lisa/activities/TemplateActivity.java b/app/src/main/java/ceui/lisa/activities/TemplateActivity.java
@@ -145,8 +145,9 @@ protected Fragment createNewFragment() {
                 }
                 case "按标签收藏": {
                     int id = intent.getIntExtra(Params.ILLUST_ID, 0);
+                    String type = intent.getStringExtra(Params.DATA_TYPE);
                     String[] tagNames = intent.getStringArrayExtra(Params.TAG_NAMES);
-                    return FragmentSB.newInstance(id, tagNames);
+                    return FragmentSB.newInstance(id, type, tagNames);
                 }
                 case "关于软件":
                     return new FragmentAboutApp();

diff --git a/app/src/main/java/ceui/lisa/adapters/IAdapter.java b/app/src/main/java/ceui/lisa/adapters/IAdapter.java
@@ -99,6 +99,7 @@ public void onClick(View v) {
             public boolean onLongClick(View v) {
                 Intent intent = new Intent(mContext, TemplateActivity.class);
                 intent.putExtra(Params.ILLUST_ID, target.getId());
+                intent.putExtra(Params.DATA_TYPE, Params.TYPE_ILLUST);
                 intent.putExtra(Params.TAG_NAMES, target.getTagNames());
                 intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "按标签收藏");
                 mContext.startActivity(intent);

diff --git a/app/src/main/java/ceui/lisa/adapters/NAdapter.java b/app/src/main/java/ceui/lisa/adapters/NAdapter.java
@@ -133,12 +133,12 @@ public void onClick(View v) {
             bindView.baseBind.like.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
-                    if (target.isIs_bookmarked()) {
-
-                    } else {
-                        PixivOperate.postLikeNovel(allItems.get(position), Shaft.sUserModel,
-                                Params.TYPE_PRIVATE, bindView.baseBind.like);
-                    }
+                    Intent intent = new Intent(mContext, TemplateActivity.class);
+                    intent.putExtra(Params.ILLUST_ID, target.getId());
+                    intent.putExtra(Params.DATA_TYPE, Params.TYPE_NOVEL);
+                    intent.putExtra(Params.TAG_NAMES, target.getTagNames());
+                    intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "按标签收藏");
+                    mContext.startActivity(intent);
                     return true;
                 }
             });

diff --git a/app/src/main/java/ceui/lisa/feature/worker/BatchStarTask.java b/app/src/main/java/ceui/lisa/feature/worker/BatchStarTask.java
@@ -32,7 +32,7 @@ public BatchStarTask(String name, int illustID, int starType) {
     @Override
     public void run(IEnd end) {
         if (starType == 0) {
-            Retro.getAppApi().postLike(Shaft.sUserModel.getAccess_token(), illustID, Params.TYPE_PUBLIC)
+            Retro.getAppApi().postLikeIllust(Shaft.sUserModel.getAccess_token(), illustID, Params.TYPE_PUBLIC)
                     .subscribeOn(Schedulers.newThread())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new ErrorCtrl<NullResponse>() {
@@ -50,7 +50,7 @@ public void must() {
                         }
                     });
         } else {
-            Retro.getAppApi().postDislike(sUserModel.getAccess_token(), illustID)
+            Retro.getAppApi().postDislikeIllust(sUserModel.getAccess_token(), illustID)
                     .subscribeOn(Schedulers.newThread())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new ErrorCtrl<NullResponse>() {

diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentAboutApp.kt b/app/src/main/java/ceui/lisa/fragments/FragmentAboutApp.kt
@@ -75,7 +75,7 @@ class FragmentAboutApp : SwipeFragment<FragmentAboutBinding>() {
                         when (which) {
                             0 -> {
                                 intent.data = Uri.parse(
-                                    "mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + "_RMaPSgL-eB-JZPMFdXGJTSqIqtgCn5G"
+                                    "mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + "_4iHqW5v5XkiRxeLKl3hB0me60VVKD9b"
                                 )
                             }
                             1 -> {
@@ -85,7 +85,7 @@ class FragmentAboutApp : SwipeFragment<FragmentAboutBinding>() {
                             }
                             2 -> {
                                 intent.data = Uri.parse(
-                                    "mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + "w0SMWZx3anocpwrHSC9ZRFHAmfJrC9Nt"
+                                    "mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26jump_from%3Dwebapi%26k%3D" + "oDdX8b0zEBsZtZF9QNqoTmamW_hTP1By"
                                 )
                             }
                             3 -> {

diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentIllust.java b/app/src/main/java/ceui/lisa/fragments/FragmentIllust.java
@@ -4,6 +4,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.SpannableString;
@@ -26,8 +28,15 @@
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.blankj.utilcode.util.FileIOUtils;
+import com.blankj.utilcode.util.FileUtils;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.hjq.toast.ToastUtils;
 import com.qmuiteam.qmui.skin.QMUISkinManager;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
@@ -47,12 +56,14 @@
 import ceui.lisa.databinding.FragmentIllustBinding;
 import ceui.lisa.dialogs.MuteDialog;
 import ceui.lisa.download.IllustDownload;
+import ceui.lisa.feature.HostManager;
 import ceui.lisa.models.IllustsBean;
 import ceui.lisa.models.TagsBean;
 import ceui.lisa.notification.BaseReceiver;
 import ceui.lisa.notification.CallBackReceiver;
 import ceui.lisa.utils.Common;
 import ceui.lisa.utils.DensityUtil;
+import ceui.lisa.utils.GlideUrlChild;
 import ceui.lisa.utils.GlideUtil;
 import ceui.lisa.utils.Params;
 import ceui.lisa.utils.PixivOperate;
@@ -139,6 +150,31 @@ public void onPrepare() {
                         }
                     }.execute();
                     return true;
+                } else if (menuItem.getItemId() == R.id.action_share_image) {
+                    Glide.with(mContext)
+                            .asBitmap()
+                            .load(new GlideUrlChild(IllustDownload.getUrl(illust, 0, Params.IMAGE_RESOLUTION_LARGE)))
+                            .listener(new RequestListener<Bitmap>() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+                                    Uri uri = Common.copyBitmapToImageCacheFolder(resource, illust.getId() + ".png");
+                                    if(uri != null){
+                                        Intent shareIntent = new Intent();
+                                        shareIntent.setAction(Intent.ACTION_SEND);
+                                        shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                                        shareIntent.setDataAndType(uri, mContext.getContentResolver().getType(uri));
+                                        shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
+                                        startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
+                                    }
+                                    return true;
+                                }
+                            }).submit();
+
                 } else if (menuItem.getItemId() == R.id.action_dislike) {
                     MuteDialog muteDialog = MuteDialog.newInstance(illust);
                     muteDialog.show(getChildFragmentManager(), "MuteDialog");
@@ -179,6 +215,7 @@ public void onClick(View v) {
             public boolean onLongClick(View v) {
                 Intent intent = new Intent(mContext, TemplateActivity.class);
                 intent.putExtra(Params.ILLUST_ID, illust.getId());
+                intent.putExtra(Params.DATA_TYPE, Params.TYPE_ILLUST);
                 intent.putExtra(Params.TAG_NAMES, illust.getTagNames());
                 intent.putExtra(Params.LAST_CLASS, getClass().getSimpleName());
                 intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "按标签收藏");

diff --git a/app/src/main/java/ceui/lisa/fragments/FragmentNovelHolder.java b/app/src/main/java/ceui/lisa/fragments/FragmentNovelHolder.java
@@ -137,10 +137,12 @@ public void onClick(View v) {
         baseBind.like.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                if (!mNovelBean.isIs_bookmarked()) {
-                    PixivOperate.postLikeNovel(mNovelBean, Shaft.sUserModel,
-                            Params.TYPE_PRIVATE, baseBind.like);
-                }
+                Intent intent = new Intent(mContext, TemplateActivity.class);
+                intent.putExtra(Params.ILLUST_ID, mNovelBean.getId());
+                intent.putExtra(Params.DATA_TYPE, Params.TYPE_NOVEL);
+                intent.putExtra(Params.TAG_NAMES, mNovelBean.getTagNames());
+                intent.putExtra(TemplateActivity.EXTRA_FRAGMENT, "按标签收藏");
+                mContext.startActivity(intent);
                 return true;
             }
         });