v5.0

README.md

@@ -27,6 +27,12 @@
 - 由于原版推荐接口恢复正常，回退相关代码
 - 视频及番剧均优先采用TV源，次优采用web源（B站接口变换过于频繁，先尽可能找个清晰度比较高的凑合着用）
 
+### v5.0
+> 尝试基于java层修复
+
+- 用捉急的Java代码水平重写了直播源获取相关逻辑，锁定原画画质，仅支持ijk解码（现在勉强可以看直播了）
+- 简陋地实现了直播弹幕播放
+
 
 ## todo list
 - [ ] 似乎6月1日后web源只能拿到720P，继续寻找可用源。。。
@@ -40,6 +46,13 @@
 
 ## 编译
 ```bash
-sudo apt install apktool signapk
+#环境安装
+sudo apt install apktool signapk openjdk-8-jdk
+sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
+#编译java类
+cd mybv/java
+./build.sh
+cd ../..
+#编译apk
 ./build.sh
 ```

mybv/java/build.sh

@@ -0,0 +1,7 @@
+#d2j-dex2jar --force ../../bv0/build/apk/classes.dex
+rm $(find classes -name *.class)
+javac -Xlint:unchecked -Xdiags:verbose -classpath 'classes-dex2jar.jar:android.jar' $(find classes -name *.java)
+rm $(find classes/com/bilibili/tv -name R*.class)
+rm classes/bl/u.class
+java -jar dx.jar --dex --output=out.dex classes
+java -jar baksmali-2.5.2.jar d out.dex -l -o ../smali

mybv/java/classes/bl/aef.java

@@ -0,0 +1,319 @@
+package bl;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import com.bilibili.tv.R;
+import com.bilibili.tv.ui.live.LiveActivity;
+import com.bilibili.tv.ui.live.player.LivePlayerActivity;
+import com.bilibili.tv.widget.DrawRelativeLayout;
+import com.bilibili.tv.widget.ScalableImageView;
+import com.bilibili.tv.widget.border.BorderGridLayoutManager;
+import com.bilibili.tv.widget.side.SideRightGridLayoutManger;
+import java.util.ArrayList;
+import java.util.List;
+
+import mybl.BiliLiveEx;
+import android.util.Log;
+import org.json.JSONObject;
+import java.util.concurrent.Future;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+
+/* compiled from: BL */
+/* loaded from: classes.dex */
+public class aef extends ady {
+    private b c;
+    private a d;
+    private boolean e;
+    private int f = 1;
+    private boolean g = true;
+    private boolean h;
+    private int i;
+
+    static /* synthetic */ int e(aef aefVar) {
+        int i = aefVar.f;
+        aefVar.f = i + 1;
+        return i;
+    }
+
+    public static aef b(int i) {
+        Bundle bundle = new Bundle();
+        bundle.putInt("live_area_id", i);
+        aef aefVar = new aef();
+        aefVar.setArguments(bundle);
+        return aefVar;
+    }
+
+    @Override // bl.ady
+    public void a(RecyclerView recyclerView, @Nullable Bundle bundle) {
+        super.a(recyclerView, bundle);
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+            this.i = arguments.getInt("live_area_id");
+        }
+        if (this.i == 0) {
+            return;
+        }
+        this.d = new a();
+        final SideRightGridLayoutManger sideRightGridLayoutManger = new SideRightGridLayoutManger(getActivity(), 2);
+        final LiveActivity liveActivity = (LiveActivity) getActivity();
+        sideRightGridLayoutManger.a(new BorderGridLayoutManager.a() { // from class: bl.aef.1
+            @Override // com.bilibili.tv.widget.border.BorderGridLayoutManager.a
+            public void a(View view, View view2, int i, int i2, int i3) {
+                agd m;
+                if (liveActivity == null || (m = liveActivity.m()) == null || view == null) {
+                    return;
+                }
+                m.setUpRectDrawable(aj.a(liveActivity, (int) R.drawable.shadow_white_rect));
+                m.a(view, i2, i3, aef.this.e);
+                aef.this.e = false;
+            }
+        });
+        recyclerView.setHasFixedSize(true);
+        recyclerView.setLayoutManager(sideRightGridLayoutManger);
+        final int b2 = adl.b(R.dimen.px_4);
+        final int b3 = adl.b(R.dimen.px_20);
+        int b4 = adl.b(R.dimen.px_30);
+        recyclerView.setPadding(b4, b4, b4, b4);
+        recyclerView.a(new RecyclerView.g() { // from class: bl.aef.2
+            @Override // android.support.v7.widget.RecyclerView.g
+            public void a(Rect rect, View view, RecyclerView recyclerView2, RecyclerView.s sVar) {
+                int i;
+                int i2;
+                int g = recyclerView2.g(view);
+                int i3 = g > 1 ? b3 : 0;
+                if (g % 2 == 0) {
+                    i2 = b2;
+                    i = 0;
+                } else {
+                    i = b2;
+                    i2 = 0;
+                }
+                rect.set(i, i3, i2, 0);
+            }
+        });
+        recyclerView.a(new RecyclerView.m() { // from class: bl.aef.3
+            @Override // android.support.v7.widget.RecyclerView.m
+            public void a(RecyclerView recyclerView2, int i) {
+                super.a(recyclerView2, i);
+                if (!aef.this.g || aef.this.h || aef.this.c == null) {
+                    return;
+                }
+                int p = sideRightGridLayoutManger.p();
+                if (sideRightGridLayoutManger.x() <= 0 || p + 10 < sideRightGridLayoutManger.H() - 1 || sideRightGridLayoutManger.H() <= sideRightGridLayoutManger.x()) {
+                    return;
+                }
+                aef.e(aef.this);
+                aef.this.a();
+            }
+        });
+        this.c = new b();
+        recyclerView.setAdapter(this.c);
+        i();
+        ((aeh) vo.a(aeh.class)).a(this.i, null, "online", this.f, 20).a(this.d);
+    }
+
+    @Override // bl.adw
+    public boolean c() {
+        return isVisible() && this.c != null && this.c.a() > 0;
+    }
+
+    @Override // android.support.v4.app.Fragment
+    public void onDestroyView() {
+        this.c = null;
+        this.d = null;
+        super.onDestroyView();
+    }
+
+    @Override // bl.ady, bl.aea
+    public void d_() {
+        super.d_();
+        a();
+    }
+
+    /* JADX INFO: Access modifiers changed from: private */
+    public void a() {
+        this.h = true;
+        ((aeh) vo.a(aeh.class)).a(this.i, null, "online", this.f, 20).a(this.d);
+    }
+
+    public static String getPlayUrl(int roomId) {
+        ExecutorService threadPool  = Executors.newSingleThreadExecutor();
+        Future<String> future = threadPool.submit(new Callable<String>() {
+            @Override
+            public String call() {
+                d dVar = (d) pz.a(new qa.a(d.class).a("https://api.live.bilibili.com/room/v1/Room/playUrl").a(true).b("cid", String.valueOf(roomId)).b("quality", "10000").b("platform", "h5").a(new qb()).a(), "GET");
+                return dVar.e();
+            }
+        });
+        try {
+            return future.get();
+        } catch (Exception e){
+            return "";
+        }
+    }
+
+    /* compiled from: BL */
+    /* loaded from: classes.dex */
+    class a extends vm<BiliLiveEx> {
+        private a() {
+        }
+
+        @Override // bl.vm
+        public /* synthetic */ void onSuccess(BiliLiveEx biliLiveEx) {
+            a(biliLiveEx);
+        }
+
+        @Override // bl.vm
+        public boolean isCancel() {
+            return !aef.this.isAdded();
+        }
+
+        public void a(@Nullable BiliLiveEx biliLiveEx) {
+            if (aef.this.c == null) {
+                return;
+            }
+            aef.this.j();
+            aef.this.h = false;
+            if (aef.this.c.a() != 0 || (biliLiveEx != null && !biliLiveEx.getData().isEmpty())) {
+                if (aef.this.f == 1) {
+                    aef.this.c.a(biliLiveEx);
+                    return;
+                } else {
+                    aef.this.c.b(biliLiveEx);
+                    return;
+                }
+            }
+            if (aef.this.f == 1) {
+                aef.this.l();
+                aef.this.a(R.string.nothing_show);
+            }
+            aef.this.g = false;
+        }
+
+        @Override // bl.vm
+        public void onError(Throwable th) {
+            if (aef.this.c == null) {
+                return;
+            }
+            aef.this.h = false;
+            if (aef.this.f == 1) {
+                aef.this.k();
+            }
+        }
+    }
+
+    /* JADX INFO: Access modifiers changed from: package-private */
+    /* compiled from: BL */
+    /* loaded from: classes.dex */
+    public static class b extends RecyclerView.a<adv> implements View.OnClickListener {
+        private List<BiliLiveEx.Content> a;
+
+        private b() {
+            this.a = new ArrayList();
+        }
+
+        @Override // android.support.v7.widget.RecyclerView.a
+        public adv a(ViewGroup viewGroup, int i) {
+            return new c(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recycler_view_item_video_history, viewGroup, false));
+        }
+
+        @Override // android.support.v7.widget.RecyclerView.a
+        public void a(adv advVar, int i) {
+            BiliLiveEx.Content biliLive;
+            if (!(advVar instanceof c) || (biliLive = this.a.get(i)) == null) {
+                return;
+            }
+            if (biliLive.mCover != null) {
+                nv.a().a(biliLive.mCover, ((c) advVar).n);
+            }
+            c cVar = (c) advVar;
+            cVar.o.setText(biliLive.mTitle);
+            TextView textView = cVar.p;
+            textView.setText("在线 " + adh.a(biliLive.mOnline));
+            cVar.a.setTag(biliLive);
+            cVar.a.setOnClickListener(this);
+        }
+
+        @Override // android.support.v7.widget.RecyclerView.a
+        public int a() {
+            return this.a.size();
+        }
+
+        /* JADX INFO: Access modifiers changed from: private */
+        public void a(BiliLiveEx biliLiveEx) {
+            this.a = biliLiveEx.getData();
+            d();
+        }
+
+        /* JADX INFO: Access modifiers changed from: private */
+        public void b(BiliLiveEx biliLiveEx) {
+            int size = this.a.size();
+            this.a.addAll(biliLiveEx.getData());
+            d(size);
+        }
+
+        @Override // android.view.View.OnClickListener
+        public void onClick(View view) {
+            Activity a = adl.a(view.getContext());
+            if (a == null) {
+                return;
+            }
+            Object tag = view.getTag();
+            if (tag instanceof BiliLiveEx.Content) {
+                ((BiliLiveEx.Content) tag).mPlayUrl = aef.getPlayUrl(((BiliLiveEx.Content) tag).mRoomId);
+                a.startActivity(LivePlayerActivity.a(a, (BiliLiveEx.Content) tag));
+            }
+        }
+    }
+
+    /* compiled from: BL */
+    /* loaded from: classes.dex */
+    public static class c extends adv implements View.OnFocusChangeListener {
+        public ScalableImageView n;
+        public TextView o;
+        public TextView p;
+        public DrawRelativeLayout q;
+
+        public c(View view) {
+            super(view);
+            this.n = (ScalableImageView) a(view, R.id.img);
+            this.o = (TextView) a(view, R.id.title);
+            this.p = (TextView) a(view, R.id.sub_title);
+            this.q = (DrawRelativeLayout) a(view, R.id.draw);
+            view.setOnFocusChangeListener(this);
+        }
+
+        public static c a(ViewGroup viewGroup) {
+            return new c(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recycler_view_item_video_history, viewGroup, false));
+        }
+
+        @Override // android.view.View.OnFocusChangeListener
+        public void onFocusChange(View view, boolean z) {
+            this.q.setUpEnabled(z);
+        }
+    }
+
+    public static class d extends qe {
+        public String e() {
+            JSONObject optJSONObject;
+            try {
+                if (a() && (optJSONObject = new JSONObject(new String(this.b)).optJSONObject("data")) != null) {
+                    return optJSONObject.optJSONArray("durl").getJSONObject(0).optString("url");
+                }
+                return "";
+            } catch (Exception e) {
+                return "";
+            }
+        }
+    }
+
+}

mybv/java/classes/bl/aeh.java

@@ -0,0 +1,18 @@
+package bl;
+
+import com.bilibili.okretro.GeneralResponse;
+import mybl.BiliLiveEx;
+import java.util.List;
+import retrofit2.http.BaseUrl;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+import com.alibaba.fastjson.JSONObject;
+
+/* compiled from: BL */
+@BaseUrl(a = "https://api.live.bilibili.com")
+/* loaded from: classes.dex */
+public interface aeh {
+    @GET(a = "/room/v1/Area/getListByAreaID")
+    vp<BiliLiveEx> a(@Query(a = "areaId") int i, @Query(a = "tag") String str, @Query(a = "sort") String str2, @Query(a = "page") int i2, @Query(a = "pageSize") int i3);
+}