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

星级挑战修改，聊天修改

Browse Source
This commit is contained in:
18401019693 2022-10-22 17:42:17 +08:00
parent f9fd849ce0
commit e0861ff7eb
4 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
View File

@ -171,13 +171,13 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
void setData(final LiveChatBean bean, int position) { void setData(final LiveChatBean bean, int position) {
itemView.setTag(bean); itemView.setTag(bean);
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
params.setMargins(0, 0, DpUtil.dp2px(95), 12); params.setMargins(0, 0, DpUtil.dp2px(95), 12);
mBg.setLayoutParams(params); mBg.setLayoutParams(params);
if (bean.getType() == 6) {//大作战活动 if (bean.getType() == 6) {//大作战活动
view_action_game.setVisibility(View.VISIBLE); view_action_game.setVisibility(View.VISIBLE);
bean.setHeart(position); bean.setHeart(position);
params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
params.setMargins(0, 0, 80, 12); params.setMargins(0, 0, 80, 12);
mBg.setLayoutParams(params); mBg.setLayoutParams(params);

2
live/src/main/res/layout/item_live_chat.xml
View File

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/bg" android:id="@+id/bg"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:orientation="vertical"> android:orientation="vertical">

8
live/src/main/res/layout/view_live_room.xml
View File

@ -2100,8 +2100,8 @@
<LinearLayout <LinearLayout
android:id="@+id/btn_event2" android:id="@+id/btn_event2"
android:layout_width="70dp" android:layout_width="78dp"
android:layout_height="93dp" android:layout_height="106dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_gravity="right" android:layout_gravity="right"
@ -2113,8 +2113,8 @@
<com.ms.banner.Banner <com.ms.banner.Banner
android:id="@+id/banner2" android:id="@+id/banner2"
android:layout_width="70dp" android:layout_width="78dp"
android:layout_height="93dp" android:layout_height="106dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
app:delay_time="5000" app:delay_time="5000"
app:indicator_height="8dp" app:indicator_height="8dp"

51
live/src/main/res/layout/view_start_level.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="70dp" android:layout_width="78dp"
android:layout_height="93dp"> android:layout_height="106dp">
<ImageView <ImageView
android:id="@+id/banner_back" android:id="@+id/banner_back"
@ -21,8 +21,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="18.33dp" android:layout_marginTop="23dp"
android:text="星级挑战" android:text="星级挑战"
android:textStyle="bold"
android:textColor="#C53F4E" android:textColor="#C53F4E"
android:textSize="7sp" /> android:textSize="7sp" />
@ -30,15 +31,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginTop="33dp" android:layout_marginTop="40dp"
android:layout_marginEnd="5.67dp" android:layout_marginEnd="5.67dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
<ImageView
android:id="@+id/icon_start"
android:layout_width="13.33dp"
android:layout_height="13.33dp"
android:src="@mipmap/icon_start" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -46,13 +42,26 @@
android:layout_marginStart="3.33dp" android:layout_marginStart="3.33dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom">
<ImageView
android:id="@+id/icon_start"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@mipmap/icon_start" />
<TextView <TextView
android:id="@+id/total_star_value" android:id="@+id/total_star_value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/total_star_value" android:text="@string/total_star_value"
android:textColor="#C53F4E" android:textColor="#C53F4E"
android:textSize="6.5sp" /> android:textSize="7.97sp" />
</LinearLayout>
<com.yunbao.common.views.weight.ProgressView <com.yunbao.common.views.weight.ProgressView
android:id="@+id/total_star_progress" android:id="@+id/total_star_progress"
@ -89,15 +98,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginTop="58dp" android:layout_marginTop="70dp"
android:layout_marginEnd="5.67dp" android:layout_marginEnd="5.67dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
<ImageView
android:id="@+id/icon_start_number"
android:layout_width="13.33dp"
android:layout_height="13.33dp"
android:src="@mipmap/icon_start_number" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -105,13 +109,26 @@
android:layout_marginStart="3.33dp" android:layout_marginStart="3.33dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom">
<ImageView
android:id="@+id/icon_start_number"
android:layout_width="12dp"
android:layout_height="12dp"
android:src="@mipmap/icon_start_number" />
<TextView <TextView
android:id="@+id/number_of_people_assisted" android:id="@+id/number_of_people_assisted"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/number_of_people_assisted" android:text="@string/number_of_people_assisted"
android:textColor="#C53F4E" android:textColor="#C53F4E"
android:textSize="6.5sp" /> android:textSize="7.97sp" />
</LinearLayout>
<com.yunbao.common.views.weight.ProgressView <com.yunbao.common.views.weight.ProgressView
android:id="@+id/assist_progress" android:id="@+id/assist_progress"