update

README.md

@@ -70,6 +70,7 @@
 - 增加可修改包名的自定义编译方式
 - 增加查看关注用户功能
 - 长按记忆播放速度调节状态
+- 修复原版uid过长导致的用户搜索失败问题
 
 
 ## todo list

mybv/java/classes/bl/afc.java

@@ -30,6 +30,9 @@
 import com.bilibili.tv.widget.FixGridLayoutManager;
 import kotlin.TypeCastException;
 
+import com.bilibili.tv.widget.border.BorderGridLayoutManager;
+import com.bilibili.tv.widget.side.SideRightGridLayoutManger;
+
 /* compiled from: BL */
 /* loaded from: classes.dex */
 public final class afc extends adu implements aez, wf {
@@ -110,7 +113,7 @@ public void a(RecyclerView recyclerView, Bundle bundle) {
         int b2 = adl.b(R.dimen.px_24);
         int b3 = adl.b(R.dimen.px_48);
         recyclerView.setPadding(b2, b3, b2, b3);
-        this.a = new FixGridLayoutManager(getActivity(), e) { // from class: com.bilibili.tv.ui.main.content.MainMyFragment$onViewCreated$1
+        this.a = new BorderGridLayoutManager(getActivity(), 1, 0, false) { // from class: com.bilibili.tv.ui.main.content.MainMyFragment$onViewCreated$1
             @Override // android.support.v7.widget.RecyclerView.h
             public View d(View view, int direction) {
                 if (direction != View.FOCUS_LEFT) {
@@ -131,27 +134,27 @@ public View d(View view, int direction) {
         };
         this.b = new b();
         recyclerView.setLayoutManager(this.a);
-        recyclerView.a(new d(b2));
+        recyclerView.a(new ItemDecoration(b2));
         recyclerView.setFocusable(false);
         recyclerView.setAdapter(this.b);
         recyclerView.addOnLayoutChangeListener(new e());
     }
 
     /* compiled from: BL */
     /* loaded from: classes.dex */
-    public static final class d extends RecyclerView.g {
-        final /* synthetic */ int a;
+    public static final class ItemDecoration extends RecyclerView.g {
+        final /* synthetic */ int space;
 
-        d(int i) {
-            this.a = i;
+        ItemDecoration(int space) {
+            this.space = space;
         }
 
         @Override // android.support.v7.widget.RecyclerView.g
-        public void a(Rect rect, View view, RecyclerView recyclerView, RecyclerView.s sVar) {
-            bbi.b(rect, "outRect");
+        public void a(Rect outRect, View view, RecyclerView parent, RecyclerView.s state) {
+            bbi.b(outRect, "outRect");
             bbi.b(view, "view");
-            bbi.b(recyclerView, "parent");
-            rect.set(this.a, 0, this.a, 0);
+            bbi.b(parent, "parent");
+            outRect.set(this.space, 0, 0, 0);
         }
     }
 

mybv/java/classes/bl/afd.java

@@ -131,7 +131,7 @@ public View d(View view, int i) {
             bbi.a();
         }
         borderGridLayoutManager.a(new f());
-        recyclerView.a(new g(b2));
+        recyclerView.a(new ItemDecoration(b2));
         recyclerView.setFocusable(false);
         recyclerView.setAdapter(this.a);
         ((kh) vo.a(kh.class)).a().a(new d());
@@ -166,35 +166,35 @@ public int a(int i) {
 
     /* compiled from: BL */
     /* loaded from: classes.dex */
-    public static final class g extends RecyclerView.g {
-        final /* synthetic */ int a;
+    public static final class ItemDecoration extends RecyclerView.g {
+        final /* synthetic */ int space;
 
-        g(int i) {
-            this.a = i;
+        ItemDecoration(int space) {
+            this.space = space;
         }
 
         /* JADX WARN: Removed duplicated region for block: B:17:0x003f  */
         @Override // android.support.v7.widget.RecyclerView.g
         /*
             Code decompiled incorrectly, please refer to instructions dump.
         */
-        public void a(Rect rect, View view, RecyclerView recyclerView, RecyclerView.s sVar) {
+        public void a(Rect outRect, View view, RecyclerView parent, RecyclerView.s state) {
             int i;
             int i2;
-            bbi.b(rect, "outRect");
+            bbi.b(outRect, "outRect");
             bbi.b(view, "view");
-            bbi.b(recyclerView, "parent");
-            int f = recyclerView.f(view);
+            bbi.b(parent, "parent");
+            int f = parent.f(view);
             int floor = f - (((int) Math.floor(f / 5)) + 1);
             if (f%5==0) {
-                if(((afd.c)null).b.size()==5 && ((afd.c)null).b.get(f/5)==null)rect.set(0, 0, 0, 0);
-                else rect.set(f > 0 ? this.a * 2 : 0, 0, this.a, 0);
+                if(((afd.c)null).b.size()==5 && ((afd.c)null).b.get(f/5)==null)outRect.set(0, 0, 0, 0);
+                else outRect.set(f > 0 ? this.space * 2 : 0, 0, this.space, 0);
             } else if (floor % 2 == 0) {
-                if(((afd.c)null).a.size()==20 && ((afd.c)null).a.get(floor)==null)rect.set(0, 0, 0, 0);
-                else rect.set(f > 0 ? this.a * 2 : 0, 0, this.a, this.a);
+                if(((afd.c)null).a.size()==20 && ((afd.c)null).a.get(floor)==null)outRect.set(0, 0, 0, 0);
+                else outRect.set(f > 0 ? this.space * 2 : 0, 0, this.space, this.space);
             } else {
-                if(((afd.c)null).a.size()==20 && ((afd.c)null).a.get(floor)==null)rect.set(0, 0, 0, 0);
-                else rect.set(f > 0 ? this.a * 2 : 0, this.a, this.a, 0);
+                if(((afd.c)null).a.size()==20 && ((afd.c)null).a.get(floor)==null)outRect.set(0, 0, 0, 0);
+                else outRect.set(f > 0 ? this.space * 2 : 0, this.space, this.space, 0);
             }
         }
     }

mybv/java/classes/com/bilibili/tv/api/search/BiliSearchResultUper.java

@@ -0,0 +1,36 @@
+package com.bilibili.tv.api.search;
+
+import android.support.annotation.Keep;
+import com.alibaba.fastjson.annotation.JSONField;
+
+/* compiled from: BL */
+@Keep
+/* loaded from: classes.dex */
+public class BiliSearchResultUper {
+    public int fans;
+    public int gender;
+    @JSONField(name = "is_upuser")
+    public int isUpUser;
+    public int level;
+    public long mid;
+    @JSONField(name = "official_verify")
+    public UpVerify officialVerify;
+    @JSONField(name = "room_id")
+    public int roomId;
+    public String type;
+    public String uname;
+    public String upic;
+    public String usign;
+    public String verify_info;
+    public int videos;
+
+    /* compiled from: BL */
+    /* loaded from: classes.dex */
+    public class UpVerify {
+        public String desc;
+        public int type;
+
+        public UpVerify() {
+        }
+    }
+}

mybv/res/layout/recycler_view_item_main_my.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.bilibili.tv.widget.DrawLinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/frame" android:focusable="true" android:focusableInTouchMode="true" android:clipChildren="false" android:layout_width="fill_parent" android:layout_height="@dimen/px_540"
+<com.bilibili.tv.widget.DrawLinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/frame" android:focusable="true" android:focusableInTouchMode="true" android:clipChildren="false" android:layout_width="@dimen/px_406" android:layout_height="@dimen/px_540"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <FrameLayout android:layout_width="@dimen/px_180" android:layout_height="@dimen/px_180" android:layout_marginTop="@dimen/px_120">
         <com.bilibili.tv.widget.CircleImageView android:layout_gravity="center_horizontal" android:id="@id/img_icon" android:focusable="false" android:layout_width="@dimen/px_180" android:layout_height="@dimen/px_180" />

mybv/smali/bl/afc$1.smali

@@ -1,5 +1,5 @@
 .class Lbl/afc$1;
-.super Lcom/bilibili/tv/widget/FixGridLayoutManager;
+.super Lcom/bilibili/tv/widget/border/BorderGridLayoutManager;
 .source "afc.java"
 
 
@@ -19,14 +19,14 @@
 
 
 # direct methods
-.method constructor <init>(Lbl/afc;Landroid/content/Context;I)V
+.method constructor <init>(Lbl/afc;Landroid/content/Context;IIZ)V
     .locals 0
 
     .prologue
-    .line 113
+    .line 116
     iput-object p1, p0, Lbl/afc$1;->this$0:Lbl/afc;
 
-    invoke-direct {p0, p2, p3}, Lcom/bilibili/tv/widget/FixGridLayoutManager;-><init>(Landroid/content/Context;I)V
+    invoke-direct {p0, p2, p3, p4, p5}, Lcom/bilibili/tv/widget/border/BorderGridLayoutManager;-><init>(Landroid/content/Context;IIZ)V
 
     return-void
 .end method
@@ -39,17 +39,17 @@
     .prologue
     const/4 v1, 0x0
 
-    .line 116
+    .line 119
     const/16 v0, 0x11
 
     if-eq p2, v0, :cond_11
 
-    .line 117
+    .line 120
     const/16 v0, 0x21
 
     if-eq p2, v0, :cond_17
 
-    .line 118
+    .line 121
     const/16 v0, 0x42
 
     if-eq p2, v0, :cond_11
@@ -58,31 +58,31 @@
 
     if-ne p2, v0, :cond_12
 
-    .line 129
+    .line 132
     :cond_11
     :goto_11
     return-object p1
 
-    .line 118
+    .line 121
     :cond_12
-    invoke-super {p0, p1, p2}, Lcom/bilibili/tv/widget/FixGridLayoutManager;->d(Landroid/view/View;I)Landroid/view/View;
+    invoke-super {p0, p1, p2}, Lcom/bilibili/tv/widget/border/BorderGridLayoutManager;->d(Landroid/view/View;I)Landroid/view/View;
 
     move-result-object p1
 
     goto :goto_11
 
-    .line 120
+    .line 123
     :cond_17
     iget-object v0, p0, Lbl/afc$1;->this$0:Lbl/afc;
 
     invoke-virtual {v0}, Lbl/afc;->getActivity()Landroid/support/v4/app/FragmentActivity;
 
     move-result-object v0
 
-    .line 121
+    .line 124
     if-nez v0, :cond_27
 
-    .line 122
+    .line 125
     new-instance v0, Lkotlin/TypeCastException;
 
     const-string v1, "null cannot be cast to non-null type com.bilibili.tv.ui.main.MainActivity"
@@ -91,17 +91,17 @@
 
     throw v0
 
-    .line 124
+    .line 127
     :cond_27
     check-cast v0, Lcom/bilibili/tv/ui/main/MainActivity;
 
-    .line 125
+    .line 128
     invoke-virtual {v0, v1}, Lcom/bilibili/tv/ui/main/MainActivity;->a(Z)V
 
-    .line 126
+    .line 129
     invoke-virtual {v0, v1}, Lcom/bilibili/tv/ui/main/MainActivity;->b(Z)V
 
-    .line 127
+    .line 130
     invoke-virtual {v0}, Lcom/bilibili/tv/ui/main/MainActivity;->j()Landroid/view/View;
 
     move-result-object p1

mybv/smali/bl/afc$ItemDecoration.smali

@@ -0,0 +1,66 @@
+.class public final Lbl/afc$ItemDecoration;
+.super Landroid/support/v7/widget/RecyclerView$g;
+.source "afc.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+    value = Lbl/afc;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = "ItemDecoration"
+.end annotation
+
+
+# instance fields
+.field final space:I
+
+
+# direct methods
+.method constructor <init>(I)V
+    .locals 0
+
+    .prologue
+    .line 148
+    invoke-direct {p0}, Landroid/support/v7/widget/RecyclerView$g;-><init>()V
+
+    .line 149
+    iput p1, p0, Lbl/afc$ItemDecoration;->space:I
+
+    .line 150
+    return-void
+.end method
+
+
+# virtual methods
+.method public a(Landroid/graphics/Rect;Landroid/view/View;Landroid/support/v7/widget/RecyclerView;Landroid/support/v7/widget/RecyclerView$s;)V
+    .locals 2
+
+    .prologue
+    const/4 v1, 0x0
+
+    .line 154
+    const-string v0, "outRect"
+
+    invoke-static {p1, v0}, Lbl/bbi;->b(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 155
+    const-string v0, "view"
+
+    invoke-static {p2, v0}, Lbl/bbi;->b(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 156
+    const-string v0, "parent"
+
+    invoke-static {p3, v0}, Lbl/bbi;->b(Ljava/lang/Object;Ljava/lang/String;)V
+
+    .line 157
+    iget v0, p0, Lbl/afc$ItemDecoration;->space:I
+
+    invoke-virtual {p1, v0, v1, v1, v1}, Landroid/graphics/Rect;->set(IIII)V
+
+    .line 158
+    return-void
+.end method