diff --git a/live/src/main/assets/week_bg.svga b/live/src/main/assets/week_bg.svga index 1578134ca..c1a820305 100644 Binary files a/live/src/main/assets/week_bg.svga and b/live/src/main/assets/week_bg.svga differ diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java index 82a2e3cb9..bf8dc3178 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java @@ -35,7 +35,7 @@ import kotlin.Unit; */ public class MainHomeLiveWeekItemViewHolder extends RecyclerView.ViewHolder { private ImageView imgWeekHead; - public SVGAImageView weekSvga; + public SVGAImageView weekSvga; private ViewFlipper viewflipperBanner; private final int bannerNextShow = 1003; //Handler定时加载下一张的数据 diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java index 8e571836f..d853fd558 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java @@ -60,6 +60,7 @@ import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.CustomViewHolder; import com.yunbao.live.utils.LiveStorge; import com.yunbao.live.views.LiveRoomViewHolder; @@ -103,7 +104,7 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O private List mBannerList; private List mWeekListBean; public static ImageView btnUseIco; - private int select = 0; + private int select = WordUtil.isNewZh()?0:17; //是否是首頁 private int intoIndex = 0; private List new_data; @@ -245,6 +246,7 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O mRefreshView.getRefreshView().scrollToPosition(0); mAdapter.clearData(); select = bean.getId(); + Log.i("MainHomeViewHolder2", bean.getChinese()+"::"+bean.getId()); boolean flag = false; if (position == 0) { Log.i("MainHomeViewHolder2", "mLiveOptFollAgent:"); diff --git a/main/src/main/res/layout/item_main_home_lives_pola.xml b/main/src/main/res/layout/item_main_home_lives_pola.xml index 199470545..c2e84db0a 100644 --- a/main/src/main/res/layout/item_main_home_lives_pola.xml +++ b/main/src/main/res/layout/item_main_home_lives_pola.xml @@ -101,7 +101,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="10dp" - android:drawablePadding="4dp" android:gravity="center" android:singleLine="true" @@ -204,6 +203,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="type,dr_pk_ico,pk_ico,pk_avatar"/> + - -