update

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "my.project.sakuraproject"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 46
-        versionName "2.3.7"
+        versionCode 47
+        versionName "2.3.8"
         ndk{abiFilters "arm64-v8a", "x86_64"}
         resConfigs"zh"
     }

app/src/main/java/my/project/sakuraproject/adapter/AnimeDescDetailsAdapter.java

@@ -2,13 +2,14 @@
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.android.material.button.MaterialButton;
 
 import java.util.List;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.AnimeDescDetailsBean;
 

app/src/main/java/my/project/sakuraproject/adapter/AnimeDescDramaAdapter.java

@@ -2,13 +2,14 @@
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.android.material.button.MaterialButton;
 
 import java.util.List;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.AnimeDescDetailsBean;
 

app/src/main/java/my/project/sakuraproject/adapter/AnimeDescRecommendAdapter.java

@@ -2,12 +2,13 @@
 
 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 androidx.annotation.Nullable;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.AnimeDescRecommendBean;
 import my.project.sakuraproject.util.Utils;

app/src/main/java/my/project/sakuraproject/adapter/DownloadDramaAdapter.java

@@ -2,13 +2,14 @@
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.android.material.button.MaterialButton;
 
 import java.util.List;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.DownloadDramaBean;
 

app/src/main/java/my/project/sakuraproject/adapter/DramaAdapter.java

@@ -2,13 +2,14 @@
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.android.material.button.MaterialButton;
 
 import java.util.List;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.AnimeDescDetailsBean;
 

app/src/main/java/my/project/sakuraproject/adapter/FragmentAdapter.java

@@ -2,12 +2,13 @@
 
 import android.content.Context;
 
+import androidx.cardview.widget.CardView;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 
 import java.util.List;
 
-import androidx.cardview.widget.CardView;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.HomeWekBean;
 

app/src/main/java/my/project/sakuraproject/adapter/HomeAdapter.java

@@ -4,15 +4,16 @@
 import android.view.View;
 import android.widget.ImageView;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 
 import java.util.List;
 
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.HomeBean;
 import my.project.sakuraproject.bean.HomeHeaderBean;

app/src/main/java/my/project/sakuraproject/adapter/MaliTagAdapter.java

@@ -2,12 +2,13 @@
 
 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 androidx.annotation.Nullable;
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.bean.MaliTagBean;
 

app/src/main/java/my/project/sakuraproject/adapter/MyFragmentAdapter.java

@@ -2,13 +2,14 @@
 
 import android.view.ViewGroup;
 
-import java.util.HashMap;
-import java.util.List;
-
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import java.util.HashMap;
+import java.util.List;
+
 import my.project.sakuraproject.bean.AnimeUpdateInfoBean;
 import my.project.sakuraproject.main.my.fragment.DownloadFragment;
 import my.project.sakuraproject.main.my.fragment.FavoriteFragment;

app/src/main/java/my/project/sakuraproject/adapter/WeekAdapter.java

@@ -2,12 +2,13 @@
 
 import android.view.ViewGroup;
 
-import java.util.HashMap;
-
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import java.util.HashMap;
+
 import my.project.sakuraproject.R;
 import my.project.sakuraproject.main.week.WeekFragment;
 import my.project.sakuraproject.util.Utils;

app/src/main/java/my/project/sakuraproject/application/Sakura.java

@@ -5,6 +5,8 @@
 import android.content.Intent;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatDelegate;
+
 import com.arialyy.aria.core.Aria;
 import com.bumptech.glide.Glide;
 import com.google.android.material.snackbar.Snackbar;
@@ -17,8 +19,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import androidx.appcompat.app.AppCompatDelegate;
-
 import javax.net.ssl.HttpsURLConnection;
 
 import my.project.sakuraproject.R;

app/src/main/java/my/project/sakuraproject/bean/HomeHeaderBean.java

@@ -1,10 +1,11 @@
 package my.project.sakuraproject.bean;
 
+import androidx.annotation.DrawableRes;
+
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 
 import java.util.List;
 
-import androidx.annotation.DrawableRes;
 import my.project.sakuraproject.adapter.HomeAdapter;
 
 public class HomeHeaderBean implements MultiItemEntity {

app/src/main/java/my/project/sakuraproject/cling/control/ClingPlayControl.java

@@ -2,6 +2,8 @@
 
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import org.fourthline.cling.controlpoint.ControlPoint;
 import org.fourthline.cling.model.action.ActionInvocation;
 import org.fourthline.cling.model.message.UpnpResponse;
@@ -25,7 +27,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.cling.control.callback.ControlCallback;
 import my.project.sakuraproject.cling.control.callback.ControlReceiveCallback;
 import my.project.sakuraproject.cling.entity.ClingPositionResponse;

app/src/main/java/my/project/sakuraproject/cling/control/IPlayControl.java

@@ -1,6 +1,7 @@
 package my.project.sakuraproject.cling.control;
 
 import androidx.annotation.Nullable;
+
 import my.project.sakuraproject.cling.control.callback.ControlCallback;
 import my.project.sakuraproject.cling.control.callback.ControlReceiveCallback;
 

app/src/main/java/my/project/sakuraproject/cling/control/SubscriptionControl.java

@@ -2,10 +2,11 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import org.fourthline.cling.controlpoint.ControlPoint;
 import org.fourthline.cling.model.meta.Device;
 
-import androidx.annotation.NonNull;
 import my.project.sakuraproject.cling.entity.IDevice;
 import my.project.sakuraproject.cling.service.callback.AVTransportSubscriptionCallback;
 import my.project.sakuraproject.cling.service.callback.RenderingControlSubscriptionCallback;

app/src/main/java/my/project/sakuraproject/cling/entity/ClingDeviceList.java

@@ -1,11 +1,12 @@
 package my.project.sakuraproject.cling.entity;
 
+import androidx.annotation.Nullable;
+
 import org.fourthline.cling.model.meta.Device;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.cling.util.OtherUtils;
 
 /**

app/src/main/java/my/project/sakuraproject/cling/entity/DLANPlayState.java

@@ -1,10 +1,10 @@
 package my.project.sakuraproject.cling.entity;
 
+import androidx.annotation.IntDef;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import androidx.annotation.IntDef;
-
 /**
  * 说明：连接设备状态
  * 作者：zhouzhan

app/src/main/java/my/project/sakuraproject/cling/service/manager/ClingManager.java

@@ -2,6 +2,8 @@
 
 import android.content.Context;
 
+import androidx.annotation.Nullable;
+
 import org.fourthline.cling.model.meta.Device;
 import org.fourthline.cling.model.types.DeviceType;
 import org.fourthline.cling.model.types.ServiceType;
@@ -12,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.cling.entity.ClingControlPoint;
 import my.project.sakuraproject.cling.entity.ClingDevice;
 import my.project.sakuraproject.cling.entity.IControlPoint;

app/src/main/java/my/project/sakuraproject/cling/util/ClingUtils.java

@@ -1,11 +1,12 @@
 package my.project.sakuraproject.cling.util;
 
+import androidx.annotation.Nullable;
+
 import org.fourthline.cling.controlpoint.ControlPoint;
 import org.fourthline.cling.model.meta.Device;
 import org.fourthline.cling.model.meta.Service;
 import org.fourthline.cling.model.types.ServiceType;
 
-import androidx.annotation.Nullable;
 import my.project.sakuraproject.cling.entity.IControlPoint;
 import my.project.sakuraproject.cling.entity.IDevice;
 import my.project.sakuraproject.cling.service.manager.ClingManager;

app/src/main/java/my/project/sakuraproject/custom/CustomDanmakuParser.java

@@ -11,7 +11,6 @@
 import master.flame.danmaku.danmaku.model.android.Danmakus;
 import master.flame.danmaku.danmaku.parser.BaseDanmakuParser;
 import master.flame.danmaku.danmaku.parser.android.JSONSource;
-import my.project.sakuraproject.util.Utils;
 
 public class CustomDanmakuParser extends BaseDanmakuParser {
     @Override
@@ -76,7 +75,7 @@ private Danmakus _parse(JSONArray jsonArray, Danmakus danmakus) {
 //                    item.textShadowColor = Color.GRAY;
                     item.underlineColor = Color.TRANSPARENT;
                     item.borderColor = Color.TRANSPARENT;
-                    item.priority = 3;
+                    item.priority = 0;
 //                    item.textSize = Utils.dpToPx(Utils.getContext(), 14);
                     item.textSize = 20 * (mDispDensity - 0.6f);
                     danmakus.addItem(item);

app/src/main/java/my/project/sakuraproject/custom/MyButton.java

@@ -4,11 +4,11 @@
 import android.graphics.Rect;
 import android.util.AttributeSet;
 
-import com.google.android.material.button.MaterialButton;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.google.android.material.button.MaterialButton;
+
 public class MyButton extends MaterialButton {
 
     public MyButton(@NonNull Context context) { super(context); }

app/src/main/java/my/project/sakuraproject/custom/ScrollAwareBehavior.java

@@ -9,12 +9,13 @@
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewPropertyAnimatorListener;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import my.project.sakuraproject.R;
 
 public class ScrollAwareBehavior extends FloatingActionButton.Behavior {

app/src/main/java/my/project/sakuraproject/database/DatabaseUtil.java

@@ -8,6 +8,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 
 import com.arialyy.aria.core.Aria;
 
@@ -19,7 +20,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import androidx.annotation.NonNull;
 import my.project.sakuraproject.application.Sakura;
 import my.project.sakuraproject.bean.AnimeListBean;
 import my.project.sakuraproject.bean.AnimeUpdateInfoBean;
@@ -323,6 +323,18 @@ public static void addIndex(String animeId,  String playUrl, int playSource, Str
      * @return
      */
     public static String queryAllIndex(String animeId) {
+        Cursor cursor = db.rawQuery("select F_ID, F_DESC_URL from T_HISTORY WHERE F_LINK_ID = ? AND F_DESC_URL LIKE '%voddetail%'", new String[]{animeId});
+        if (cursor.getCount() > 0) {
+            while (cursor.moveToNext()) {
+                String id = cursor.getString(0);
+                String descNumber = cursor.getString(1).replaceAll("/voddetail/|.html", "");
+                // 删除错误的数据
+                db.execSQL("DELETE FROM T_HISTORY_DATA WHERE F_LINK_ID = ? AND F_PLAY_URL NOT LIKE '%"+descNumber+"%'", new String[] {
+                        id
+                });
+            }
+        }
+        cursor.close();
         StringBuffer buffer = new StringBuffer();
         String Query = "select t2.F_PLAY_URL from T_HISTORY t1 INNER JOIN T_HISTORY_DATA t2 ON t1.F_ID = t2.F_LINK_ID where t1.F_LINK_ID =?";
         Cursor c = db.rawQuery(Query, new String[]{animeId});