update

670848654 · Apr 30, 2020 · 1e8abcf · 1e8abcf
1 parent eb337b3
commit 1e8abcf
Show file tree

Hide file tree

Showing 63 changed files with 1,363 additions and 943 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "my.project.sakuraproject"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 16
-        versionName "1.8.6_b"
+        versionCode 17
+        versionName "1.8.7"
         ndk{abiFilters "armeabi", "armeabi-v7a", "x86"}
         resConfigs"zh"
     }

diff --git a/app/src/main/java/my/project/sakuraproject/adapter/AnimeDescDetailsAdapter.java b/app/src/main/java/my/project/sakuraproject/adapter/AnimeDescDetailsAdapter.java
@@ -0,0 +1,39 @@
+package my.project.sakuraproject.adapter;
+
+import android.content.Context;
+import android.widget.Button;
+
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+
+import java.util.List;
+
+import my.project.sakuraproject.R;
+import my.project.sakuraproject.bean.AnimeDescDetailsBean;
+
+/**
+ * 播放列表适配器
+ */
+public class AnimeDescDetailsAdapter extends BaseQuickAdapter<AnimeDescDetailsBean, BaseViewHolder> {
+    private Context context;
+
+    public AnimeDescDetailsAdapter(Context context, @Nullable List<AnimeDescDetailsBean> data) {
+        super(R.layout.item_desc_details, data);
+        this.context = context;
+    }
+
+    @Override
+    protected void convert(final BaseViewHolder helper, AnimeDescDetailsBean item) {
+        Button btn = helper.getView(R.id.tag_group);
+        helper.setText(R.id.tag_group, item.getTitle().replaceAll("第", "").replaceAll("集", ""));
+        if (item.isSelected()) {
+            helper.getView(R.id.tag_group).setBackgroundResource(R.drawable.button_selected);
+            btn.setTextColor(context.getResources().getColor(R.color.tabSelectedTextColor));
+        } else {
+            helper.getView(R.id.tag_group).setBackgroundResource(R.drawable.button_default);
+            btn.setTextColor(context.getResources().getColor(R.color.text_color_primary));
+        }
+    }
+}
diff --git a/app/src/main/java/my/project/sakuraproject/adapter/AnimeDescDramaAdapter.java b/app/src/main/java/my/project/sakuraproject/adapter/AnimeDescDramaAdapter.java
@@ -0,0 +1,39 @@
+package my.project.sakuraproject.adapter;
+
+import android.content.Context;
+import android.widget.Button;
+
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+
+import java.util.List;
+
+import my.project.sakuraproject.R;
+import my.project.sakuraproject.bean.AnimeDescDetailsBean;
+
+/**
+ * 展开播放列表适配器
+ */
+public class AnimeDescDramaAdapter extends BaseQuickAdapter<AnimeDescDetailsBean, BaseViewHolder> {
+    private Context context;
+
+    public AnimeDescDramaAdapter(Context context, @Nullable List<AnimeDescDetailsBean> data) {
+        super(R.layout.item_desc_drama, data);
+        this.context = context;
+    }
+
+    @Override
+    protected void convert(final BaseViewHolder helper, AnimeDescDetailsBean item) {
+        Button btn = helper.getView(R.id.tag_group);
+        helper.setText(R.id.tag_group, item.getTitle().replaceAll("第", "").replaceAll("集", ""));
+        if (item.isSelected()) {
+            helper.getView(R.id.tag_group).setBackgroundResource(R.drawable.button_selected);
+            btn.setTextColor(context.getResources().getColor(R.color.tabSelectedTextColor));
+        } else {
+            helper.getView(R.id.tag_group).setBackgroundResource(R.drawable.button_default);
+            btn.setTextColor(context.getResources().getColor(R.color.text_color_primary));
+        }
+    }
+}
diff --git a/app/src/main/java/my/project/sakuraproject/adapter/AnimeDescRecommendAdapter.java b/app/src/main/java/my/project/sakuraproject/adapter/AnimeDescRecommendAdapter.java
@@ -0,0 +1,34 @@
+package my.project.sakuraproject.adapter;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+
+import java.util.List;
+
+import my.project.sakuraproject.R;
+import my.project.sakuraproject.bean.AnimeDescRecommendBean;
+import my.project.sakuraproject.util.Utils;
+
+/**
+ * 相关推荐适配器
+ */
+public class AnimeDescRecommendAdapter extends BaseQuickAdapter<AnimeDescRecommendBean, BaseViewHolder> {
+    private Context context;
+
+    public AnimeDescRecommendAdapter(Context context, @Nullable List<AnimeDescRecommendBean> data) {
+        super(R.layout.item_desc_recommend, data);
+        this.context = context;
+    }
+
+    @Override
+    protected void convert(final BaseViewHolder helper, AnimeDescRecommendBean item) {
+        Utils.setCardDefaultBg(context, helper.getView(R.id.card_view), helper.getView(R.id.title));
+        helper.setText(R.id.title, item.getTitle());
+        Utils.setDefaultImage(context, item.getImg(), helper.getView(R.id.img));
+        Utils.setCardBg(context, item.getImg(), helper.getView(R.id.card_view), helper.getView(R.id.title));
+    }
+}
diff --git a/app/src/main/java/my/project/sakuraproject/adapter/DescAdapter.java b/app/src/main/java/my/project/sakuraproject/adapter/DescAdapter.java
diff --git a/app/src/main/java/my/project/sakuraproject/adapter/DramaAdapter.java b/app/src/main/java/my/project/sakuraproject/adapter/DramaAdapter.java
@@ -11,22 +11,21 @@
 import java.util.List;
 
 import my.project.sakuraproject.R;
-import my.project.sakuraproject.bean.AnimeDescBean;
+import my.project.sakuraproject.bean.AnimeDescDetailsBean;
 
-public class DramaAdapter extends BaseQuickAdapter<AnimeDescBean, BaseViewHolder> {
+public class DramaAdapter extends BaseQuickAdapter<AnimeDescDetailsBean, BaseViewHolder> {
     private Context context;
 
-    public DramaAdapter(Context context, @Nullable List<AnimeDescBean> data) {
+    public DramaAdapter(Context context, @Nullable List<AnimeDescDetailsBean> data) {
         super(R.layout.item_btn, data);
         this.context = context;
     }
 
     @Override
-    protected void convert(final BaseViewHolder helper, AnimeDescBean item) {
-        String title = item.getTitle();
+    protected void convert(final BaseViewHolder helper, AnimeDescDetailsBean item) {
         Button btn = helper.getView(R.id.tag_group);
-        helper.setText(R.id.tag_group, title.replaceAll("第", "").replaceAll("集", ""));
-        if (item.isSelect()) {
+        helper.setText(R.id.tag_group, item.getTitle().replaceAll("第", "").replaceAll("集", ""));
+        if (item.isSelected()) {
             helper.getView(R.id.tag_group).setBackgroundResource(R.drawable.button_selected);
             btn.setTextColor(context.getResources().getColor(R.color.item_selected_color));
         }

diff --git a/app/src/main/java/my/project/sakuraproject/application/Sakura.java b/app/src/main/java/my/project/sakuraproject/application/Sakura.java
@@ -2,13 +2,15 @@
 
 import android.app.Activity;
 import android.app.Application;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.appcompat.app.AppCompatDelegate;
 
 import com.bumptech.glide.Glide;
+import com.google.android.material.snackbar.Snackbar;
 import com.tencent.smtt.sdk.QbSdk;
 
 import org.json.JSONObject;
@@ -109,6 +111,14 @@ public void showCustomToastMsg(String msg, @DrawableRes int iconRes, @ColorRes i
                 iconRes, color, Toast.LENGTH_LONG, true, true).show();
     }
 
+    public void showSnackbarMsgAction(View view, String msg, String actionMsg, View.OnClickListener listener) {
+        Snackbar.make(view, msg, Snackbar.LENGTH_LONG).setAction(actionMsg, listener).show();
+    }
+
+    public void showSnackbarMsg(View view, String msg) {
+        Snackbar.make(view, msg, Snackbar.LENGTH_LONG).show();
+    }
+
     public void addActivity(Activity activity) {
         if (!oList.contains(activity)) {
             oList.add(activity);

diff --git a/app/src/main/java/my/project/sakuraproject/bean/AnimeDescBean.java b/app/src/main/java/my/project/sakuraproject/bean/AnimeDescBean.java