diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java index c13c287ba..5a42ddacb 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java @@ -49,7 +49,6 @@ public class LiveDialog implements LiveAdapter.OnClickListener { binding.recycler.setHasFixedSize(true); binding.recycler.setItemAnimator(null); binding.recycler.addItemDecoration(new SpaceItemDecoration(1, 16)); - binding.recycler.setLayoutManager(new GridLayoutManager(dialog.getContext(), 1)); binding.recycler.post(() -> binding.recycler.scrollToPosition(LiveConfig.getHomeIndex())); } diff --git a/app/src/leanback/res/layout/dialog_doh.xml b/app/src/leanback/res/layout/dialog_doh.xml index 29632553f..a856de7e1 100644 --- a/app/src/leanback/res/layout/dialog_doh.xml +++ b/app/src/leanback/res/layout/dialog_doh.xml @@ -1,9 +1,12 @@ \ No newline at end of file + app:maxHeight="296dp" + tools:itemCount="5" + tools:listitem="@layout/adapter_doh" /> \ No newline at end of file diff --git a/app/src/leanback/res/layout/dialog_live.xml b/app/src/leanback/res/layout/dialog_live.xml index cb2f85076..b2124f51e 100644 --- a/app/src/leanback/res/layout/dialog_live.xml +++ b/app/src/leanback/res/layout/dialog_live.xml @@ -6,6 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="16dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:maxHeight="296dp" tools:itemCount="5" tools:listitem="@layout/adapter_live" /> \ No newline at end of file diff --git a/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java b/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java index eb3e24c2d..4814accd5 100644 --- a/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java +++ b/catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java @@ -1,5 +1,7 @@ package com.github.catvod.net.interceptor; +import android.net.Uri; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -45,9 +47,13 @@ public class DefaultInterceptor implements Interceptor { } private void checkAuth(Response response, String location) { - URI uri = URI.create(location); - if (uri.getUserInfo() == null) return; - response.header(HttpHeaders.AUTHORIZATION, Util.basic(uri.getUserInfo())); + try { + Uri uri = Uri.parse(location); + if (uri.getUserInfo() == null) return; + response.header(HttpHeaders.AUTHORIZATION, Util.basic(uri.getUserInfo())); + } catch (Exception e) { + e.printStackTrace(); + } } private Response deflate(Response response) {