yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测试问题,shouye ytuijian

Browse Source
This commit is contained in:
18401019693 2022-08-10 17:28:48 +08:00
parent 0a36dc99f3
commit 6f8768025c
11 changed files with 303 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/res/layout/view_home_float_banner.xml
View File

@ -24,16 +24,16 @@
android:layout_centerVertical="true"
android:layout_marginStart="25dp"
android:gravity="center"
android:padding="1.5dp"
android:padding="1dp"
android:background="@drawable/bg_white_clip"
android:visibility="visible">
<com.yunbao.common.views.weight.ClipPathCircleImage
android:id="@+id/clip_image2"
android:layout_centerInParent="true"
android:layout_width="23.5dp"
android:layout_width="24dp"
android:layout_gravity="center"
android:layout_height="23.5dp" />
android:layout_height="24dp" />
</RelativeLayout>
<RelativeLayout
@ -41,15 +41,15 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:gravity="center"
android:padding="1.5dp"
android:padding="1dp"
android:layout_centerVertical="true"
android:layout_marginStart="25dp"
android:background="@drawable/bg_white_clip">
<com.yunbao.common.views.weight.ClipPathCircleImage
android:id="@+id/clip_image3"
android:layout_width="23.5dp"
android:layout_height="23.5dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:layout_gravity="center" />
</RelativeLayout>
@ -62,14 +62,14 @@
android:gravity="center"
android:layout_centerVertical="true"
android:layout_marginStart="7dp"
android:padding="1.5dp"
android:padding="1dp"
android:background="@drawable/bg_white_clip"
android:visibility="visible">
<com.yunbao.common.views.weight.ClipPathCircleImage
android:id="@+id/clip_image1"
android:layout_width="23.5dp"
android:layout_height="23.5dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:layout_gravity="center" />
</RelativeLayout>

2
common/src/main/res/values-en/strings.xml
View File

@ -527,7 +527,7 @@
<string name="setting_clear_cache_ing">Scavenging</string>
<string name="setting_clear_cache">Cache cleared</string>
<string name="search">search</string>
<string name="search_hint">Search by nickname or ID</string>
<string name="search_hint">Please enter the nickname or ID you want to search</string>
<string name="search_no_data">No content found</string>
<string name="share_type_qq">QQ</string>
<string name="share_type_qzone">QQ Zone</string>

2
common/src/main/res/values/strings.xml
View File

@ -464,7 +464,7 @@
<string name="setting_clear_cache_ing">清除中</string>
<string name="setting_clear_cache">緩存已清除</string>
<string name="search">蒐索</string>
<string name="search_hint">搜索昵稱或ID</string>
<string name="search_hint">請輸入您要搜索的昵稱或ID</string>
<string name="search_no_data">沒有搜索到相關內容</string>
<string name="share_type_qq">QQ電話</string>
<string name="share_type_qzone">QQ空間</string>

2
main/src/main/java/com/yunbao/main/adapter/SearchRecommendBodyAdapter.java
View File

@ -30,7 +30,7 @@ public class SearchRecommendBodyAdapter extends RecyclerView.Adapter {
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_home_lives, parent, false);
View herdView = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_main_home_lives2, parent, false);
return new SearchRecommendBodyItemViewHolder(herdView);
}

2
main/src/main/java/com/yunbao/main/views/SearchRecommendHeardViewHolder.java
View File

@ -45,7 +45,7 @@ public class SearchRecommendHeardViewHolder extends RecyclerView.ViewHolder {
chip.setText(key);
chip.setMaxEms(10);
chip.setTextColor(Color.parseColor("#FF999999"));
chip.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
chip.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
chip.setSingleLine();
chip.setBackgroundResource(R.drawable.background_search_chip);
chip.setLayoutParams(layoutParams);

2
main/src/main/res/drawable/background_search_chip.xml
View File

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="12dp" />
<corners android:radius="40dp" />
<solid android:color="#FFF6F6F6" />
<padding android:bottom="7dp" android:left="11dp" android:right="11dp" android:top="7dp" />
</shape>

4
main/src/main/res/layout/activity_search.xml
View File

@ -29,8 +29,8 @@
android:orientation="horizontal">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:src="@mipmap/icon_searchbar" />

273
main/src/main/res/layout/item_main_home_lives2.xml Normal file
View File

@ -0,0 +1,273 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/live_info_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="visible">
<com.yunbao.common.custom.MyRelativeLayout5
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/cover"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
app:riv_corner_radius="10dp" />
<com.yunbao.common.custom.RatioRoundImageView
android:id="@+id/bgs"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_alignParentBottom="true"
android:src="@mipmap/bg_main_item_bottom"
app:ri_ratio="0.5"
app:riv_corner_radius="10dp" />
<ImageView
android:id="@+id/live_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:gravity="center" />
<RelativeLayout
android:id="@+id/views"
android:layout_width="46dp"
android:layout_height="16dp"
android:layout_alignParentRight="true"
android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:background="@mipmap/live_zt">
<ImageView
android:id="@+id/tv_live_ico"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@mipmap/icon_main_rest_work" />
<TextView
android:id="@+id/tv_live_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:paddingLeft="8dp"
android:text="休息"
android:textColor="@color/color_white"
android:textSize="10sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="vertical">
<ImageView
android:id="@+id/type"
android:layout_width="50dp"
android:layout_height="16dp"
android:scaleType="fitXY" />
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="#fff"
android:textSize="13sp"
android:textStyle="bold" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp">
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="#fff"
android:textSize="10sp" />
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:drawablePadding="4dp"
android:gravity="center"
android:singleLine="true"
android:textColor="#B3ffffff"
android:textSize="10sp"
android:textStyle="bold"
app:dt_left_drawable="@mipmap/icon_main_live_num"
app:dt_left_height="14dp"
app:dt_left_width="14dp" />
</RelativeLayout>
</LinearLayout>
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/pk_avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginTop="6dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="50dp"
android:scaleType="centerCrop"
app:riv_border_color="@color/color_white"
app:riv_border_width="0.8dp"
app:riv_corner_radius="2dp" />
<ImageView
android:id="@+id/pk_ico"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="33dp"
android:layout_marginBottom="60dp"
android:src="@mipmap/live_pk" />
<ImageView
android:id="@+id/dr_pk_ico"
android:layout_width="100dp"
android:layout_height="18dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="40dp"
android:src="@mipmap/multiplayerpk" />
</com.yunbao.common.custom.MyRelativeLayout5>
</LinearLayout>
<LinearLayout
android:id="@+id/lt_week_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<com.yunbao.common.custom.MyRelativeLayout5
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="9dp"
android:paddingLeft="5dp">
<ViewFlipper
android:id="@+id/viewflipper_banner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:flipInterval="1000"
android:inAnimation="@anim/vice_screen_come_in"
android:outAnimation="@anim/vice_screen_come_out"
android:visibility="gone" />
<ImageView
android:id="@+id/img_week_head"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="3dp"
android:background="@color/transparent"
android:src="@mipmap/chat_head_mo"
android:visibility="visible" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/week_svga"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
app:autoPlay="true" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginBottom="12dp">
<TextView
android:id="@+id/name2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="#fff"
android:textSize="10sp" />
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/num2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:drawablePadding="4dp"
android:gravity="center"
android:singleLine="true"
android:textColor="#B3ffffff"
android:textSize="10sp"
android:textStyle="bold"
app:dt_left_drawable="@mipmap/icon_main_live_num"
app:dt_left_height="14dp"
app:dt_left_width="14dp" />
</RelativeLayout>
</LinearLayout>
</com.yunbao.common.custom.MyRelativeLayout5>
</LinearLayout>
<com.xj.marqueeview.MarqueeView
android:id="@+id/rv_ranking_list"
android:layout_width="match_parent"
android:layout_height="65dp"
android:layout_gravity="center"
android:layout_marginLeft="4dp"
android:layout_marginBottom="9dp"
android:background="@drawable/border_f1f1f1"
android:visibility="gone"
app:mvDirection="bottom_to_top"
app:mvInterval="3000" />
</LinearLayout>

24
main/src/main/res/layout/view_search_recommend_body.xml
View File

@ -2,18 +2,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="11dp"
android:paddingEnd="11dp">
android:orientation="vertical">
<FrameLayout
android:id="@+id/type_title"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="14dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp">
<ImageView
android:id="@+id/change_batch"
@ -34,17 +32,15 @@
android:textSize="16sp" />
</FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:focusable="true"
android:focusableInTouchMode="true" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/live_list"
android:layout_marginEnd="8dp"
android:layout_marginBottom="15dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadingEdge="none"
android:layout_marginTop="24dp" />
android:layout_marginTop="16dp"
android:fadingEdge="none" />
</LinearLayout>

4
main/src/main/res/layout/view_search_recommend_heard.xml
View File

@ -28,12 +28,14 @@
android:id="@+id/search_del"
android:layout_width="23dp"
android:layout_height="23dp"
android:layout_gravity="end"
android:layout_marginTop="2dp"
android:layout_gravity="end|center_vertical"
android:src="@mipmap/search_del" />
</FrameLayout>
<com.yunbao.main.views.FlowLayout
android:id="@+id/search_history"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

5
main/src/main/res/layout/view_search_results_item.xml
View File

@ -53,7 +53,6 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@ -106,10 +105,8 @@
android:id="@+id/live_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginRight="8dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="15dp"
android:fadingEdge="none" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>