From 7a0cfd6b7553318300ab441d692d17c9f82a10b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Wed, 12 Jul 2023 17:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/github/tvbox/osc/player/IjkMediaPlayer.java | 13 +++++++------
 .../github/tvbox/osc/ui/fragment/GridFragment.java  |  8 ++------
 .../github/tvbox/osc/ui/fragment/UserFragment.java  |  3 ++-
 .../tvbox/osc/viewmodel/SubtitleViewModel.java      |  3 ++-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/player/IjkMediaPlayer.java b/app/src/main/java/com/github/tvbox/osc/player/IjkMediaPlayer.java
index 3c9e27b4..238c32ff 100644
--- a/app/src/main/java/com/github/tvbox/osc/player/IjkMediaPlayer.java
+++ b/app/src/main/java/com/github/tvbox/osc/player/IjkMediaPlayer.java
@@ -99,14 +99,15 @@ public class IjkMediaPlayer extends IjkPlayer {
             if (headers.size() > 0) {
                 StringBuilder sb = new StringBuilder();
                 for (Map.Entry<String, String> entry : headers.entrySet()) {
-                    sb.append(entry.getKey());
-                    sb.append(":");
                     String value = entry.getValue();
-                    if (!TextUtils.isEmpty(value))
-                        sb.append(entry.getValue());
-                    sb.append("\r\n");
-                    mMediaPlayer.setOption(tv.danmaku.ijk.media.player.IjkMediaPlayer.OPT_CATEGORY_FORMAT, "headers", sb.toString());
+                    if (!TextUtils.isEmpty(value)) {
+                        sb.append(entry.getKey());
+                        sb.append(": ");
+                        sb.append(value);
+                        sb.append("\r\n");
+                    }
                 }
+                mMediaPlayer.setOption(tv.danmaku.ijk.media.player.IjkMediaPlayer.OPT_CATEGORY_FORMAT, "headers", sb.toString());
             }
         }
     }
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
index ff96681c..d527f792 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
@@ -260,6 +260,7 @@ public class GridFragment extends BaseLazyFragment {
                     if (page > maxPage) {
                         gridAdapter.loadMoreEnd();
                         gridAdapter.setEnableLoadMore(false);
+                        if(page>2)Toast.makeText(getContext(), "没有更多了", Toast.LENGTH_SHORT).show();
                     } else {
                         gridAdapter.loadMoreComplete();
                         gridAdapter.setEnableLoadMore(true);
@@ -267,14 +268,9 @@ public class GridFragment extends BaseLazyFragment {
                 } else {
                     if(page == 1){
                         showEmpty();
-                    }
-                    if(page > maxPage){
+                    }else{
                         Toast.makeText(getContext(), "没有更多了", Toast.LENGTH_SHORT).show();
-                    }
-                    if (page > maxPage) {
                         gridAdapter.loadMoreEnd();
-                    } else {
-                        gridAdapter.loadMoreComplete();
                     }
                     gridAdapter.setEnableLoadMore(false);
                 }
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
index 030ddc2e..632562db 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/UserFragment.java
@@ -277,7 +277,8 @@ public class UserFragment extends BaseLazyFragment implements View.OnClickListen
                 Movie.Video vod = new Movie.Video();
                 vod.name = obj.get("title").getAsString();
                 vod.note = obj.get("rate").getAsString();
-                vod.pic = obj.get("cover").getAsString();
+                if(!vod.note.isEmpty())vod.note+=" 分";
+                vod.pic = obj.get("cover").getAsString()+"@User-Agent=com.douban.frodo";
                 result.add(vod);
             }
         } catch (Throwable th) {
diff --git a/app/src/main/java/com/github/tvbox/osc/viewmodel/SubtitleViewModel.java b/app/src/main/java/com/github/tvbox/osc/viewmodel/SubtitleViewModel.java
index a67c1b90..d6cc6a3e 100644
--- a/app/src/main/java/com/github/tvbox/osc/viewmodel/SubtitleViewModel.java
+++ b/app/src/main/java/com/github/tvbox/osc/viewmodel/SubtitleViewModel.java
@@ -74,6 +74,7 @@ public class SubtitleViewModel extends ViewModel {
             String searchApiUrl = "https://secure.assrt.net/sub/";
             OkGo.<String>get(searchApiUrl)
                     .params("searchword", title)
+                    .params("sort", "rank")
                     .params("page", page)
                     .params("no_redir", "1")
                     .execute(new AbsCallback<String>() {
@@ -82,7 +83,7 @@ public class SubtitleViewModel extends ViewModel {
                             try {
                                 String content = response.body();
                                 Document doc = Jsoup.parse(content);
-                                Elements items = doc.select(".resultcard .subitem a.introtitle");
+                                Elements items = doc.select(".resultcard .sublist_box_title a.introtitle");
                                 List<Subtitle> data = new ArrayList<>();
                                 for (Element item : items) {
                                     String title = item.attr("title");