修改测试问题,shouye ytuijian
This commit is contained in:
parent
6f8768025c
commit
0643209e8e
@ -117,10 +117,11 @@ public class LiveEndViewHolder extends AbsViewHolder implements View.OnClickList
|
|||||||
}
|
}
|
||||||
if (data.getList().size()>2){
|
if (data.getList().size()>2){
|
||||||
listShow.setVisibility(View.VISIBLE);
|
listShow.setVisibility(View.VISIBLE);
|
||||||
}else {
|
|
||||||
listShow.setVisibility(View.GONE);
|
|
||||||
//组装搜索历史数据
|
//组装搜索历史数据
|
||||||
adapter.showData(data.getList());
|
adapter.showData(data.getList());
|
||||||
|
}else {
|
||||||
|
listShow.setVisibility(View.GONE);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -669,7 +669,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
|
|||||||
//获取指导员引导逻辑
|
//获取指导员引导逻辑
|
||||||
NoviceInstructorManager.get(mContext).getNoviceInstructor();
|
NoviceInstructorManager.get(mContext).getNoviceInstructor();
|
||||||
NoviceInstructorManager.get(mContext).checktHomeZdyPop();
|
NoviceInstructorManager.get(mContext).checktHomeZdyPop();
|
||||||
|
initAnchorRecommendBanner();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ public class SearchRecommendHeardViewHolder extends RecyclerView.ViewHolder {
|
|||||||
searchHistory.removeAllViews();
|
searchHistory.removeAllViews();
|
||||||
LinearLayout.LayoutParams layoutParams =
|
LinearLayout.LayoutParams layoutParams =
|
||||||
new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
||||||
layoutParams.setMargins(17, 10, 0, 7);
|
layoutParams.setMargins(15, 10, 15, 7);
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (String key : historyMap.keySet()) {
|
for (String key : historyMap.keySet()) {
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<item android:gravity="center_horizontal">
|
<item android:gravity="center_horizontal">
|
||||||
<shape>
|
<shape>
|
||||||
<corners android:radius="5dp" />
|
<corners android:radius="5dp" />
|
||||||
<size android:width="20dp"
|
<size android:width="14dp"
|
||||||
android:height="4dp"/>
|
android:height="4dp"/>
|
||||||
</shape>
|
</shape>
|
||||||
</item>
|
</item>
|
||||||
|
@ -1,27 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="2px"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true" />
|
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/type_title"
|
android:id="@+id/type_title"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:layout_marginRight="20dp">
|
android:layout_marginRight="20dp"
|
||||||
|
android:layout_marginBottom="-7dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_vertical">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
@ -33,27 +28,28 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:text="@string/anchor" />
|
android:text="@string/anchor"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/anchor_more"
|
android:id="@+id/anchor_more"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical|right"
|
android:layout_gravity="center_vertical|right"
|
||||||
android:drawableRight="@mipmap/icon_more"
|
android:drawableRight="@mipmap/icon_more"
|
||||||
android:drawablePadding="5dp"
|
android:drawablePadding="5dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
android:text="@string/anchor_more" />
|
android:text="@string/anchor_more" />
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/anchor_list"
|
android:id="@+id/anchor_list"
|
||||||
|
android:layout_below="@id/type_title"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:layout_marginRight="20dp"
|
android:layout_marginRight="20dp"
|
||||||
android:fadingEdge="none" />
|
android:fadingEdge="none" />
|
||||||
</LinearLayout>
|
</RelativeLayout>
|
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/live_list"
|
android:id="@+id/live_list"
|
||||||
android:layout_marginEnd="8dp"
|
android:layout_marginEnd="6dp"
|
||||||
android:layout_marginBottom="15dp"
|
android:layout_marginBottom="15dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -19,8 +19,8 @@
|
|||||||
app:tabIndicatorColor="#FFFF8D41"
|
app:tabIndicatorColor="#FFFF8D41"
|
||||||
app:tabIndicatorHeight="4dp"
|
app:tabIndicatorHeight="4dp"
|
||||||
app:tabMode="fixed"
|
app:tabMode="fixed"
|
||||||
app:tabPaddingEnd="20dp"
|
app:tabPaddingEnd="35dp"
|
||||||
app:tabPaddingStart="20dp"
|
app:tabPaddingStart="35dp"
|
||||||
app:tabSelectedTextColor="#FFFF8D41"
|
app:tabSelectedTextColor="#FFFF8D41"
|
||||||
app:tabTextAppearance="@style/TabLayoutTextStyle"
|
app:tabTextAppearance="@style/TabLayoutTextStyle"
|
||||||
app:tabTextColor="#FF000000">
|
app:tabTextColor="#FF000000">
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="65dp"
|
android:layout_height="80dp"
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:paddingTop="10dp">
|
android:paddingTop="25dp">
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/avatar_layout"
|
android:id="@+id/avatar_layout"
|
||||||
@ -55,7 +55,7 @@
|
|||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/contribute"
|
android:id="@+id/contribute"
|
||||||
android:layout_width="55dp"
|
android:layout_width="55dp"
|
||||||
android:layout_height="20dp" />
|
android:layout_height="19dp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -1,26 +1,21 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="2px"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true" />
|
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/type_title"
|
android:id="@+id/type_title"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_marginRight="20dp"
|
android:layout_marginTop="30dp"
|
||||||
android:layout_marginTop="20dp">
|
android:layout_marginBottom="-7dp"
|
||||||
|
android:layout_marginRight="20dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:gravity="center_vertical"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
@ -33,6 +28,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
|
android:textSize="16sp"
|
||||||
android:text="@string/user" />
|
android:text="@string/user" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@ -40,11 +36,11 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/anchor_more"
|
android:id="@+id/anchor_more"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical|right"
|
android:layout_gravity="center_vertical|right"
|
||||||
android:drawableRight="@mipmap/icon_more"
|
android:drawableRight="@mipmap/icon_more"
|
||||||
android:drawablePadding="5dp"
|
android:drawablePadding="5dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
android:text="@string/anchor_more" />
|
android:text="@string/anchor_more" />
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
||||||
@ -52,8 +48,8 @@
|
|||||||
android:id="@+id/anchor_list"
|
android:id="@+id/anchor_list"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_below="@id/type_title"
|
||||||
android:layout_marginLeft="20dp"
|
android:layout_marginLeft="20dp"
|
||||||
android:layout_marginRight="20dp"
|
android:layout_marginRight="20dp"
|
||||||
android:fadingEdge="none" />
|
android:fadingEdge="none" />
|
||||||
</LinearLayout>
|
</RelativeLayout>
|
Loading…
Reference in New Issue
Block a user