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

合并潘多拉新人任务功能：

Browse Source 
1、直播间Im消息布局，手动拷贝
This commit is contained in:
老皮 2024-10-07 11:14:42 +08:00
parent 9d2814c36f
commit 684106bc59
11 changed files with 415 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1099,7 +1099,7 @@
<string name="lunar_wish">Month Wishes</string>
<string name="seasonal_wish">Seasonal Wishes</string>
<string name="wish_number">Wish%s</string>
<string name="aristocrat">aristocrat</string>
<string name="aristocrat">noble</string>
<string name="aristocrat_determine">sure</string>
<string name="replacement_wish_day">Reset Your: Day</string>
<string name="replacement_wish_zhou">Reset Wish: Week</string>

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

@ -2728,6 +2728,404 @@
</RelativeLayout>
<!--新用户观播活动-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<!--送免費禮物-->
<RelativeLayout
android:id="@+id/new_task_send_gift_notify"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:background="@mipmap/background_live_notify_gift"
android:paddingStart="5dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/new_task_send_gift_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="15dp"
android:text="@string/live_room_push_look_5min"
android:textColor="#FF444444"
android:textSize="12dp" />
<TextView
android:id="@+id/new_task_send_gift_details"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_below="@+id/new_task_send_gift_content"
android:layout_alignParentEnd="true"
android:layout_marginEnd="15dp"
android:ellipsize="end"
android:fontFamily="sans-serif-condensed-medium"
android:singleLine="true"
android:text="@string/live_room_push_view_gift"
android:textColor="#FF2B5AB8"
android:textSize="12sp"
android:visibility="visible"
tools:visibility="visible" />
<ImageView
android:id="@+id/close_task_send_gift_close"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:src="@mipmap/icon_live_notify_close" />
</RelativeLayout>
<!--可領取獎勵-->
<RelativeLayout
android:id="@+id/new_task_gift_notify1"
android:layout_width="250dp"
android:layout_height="46dp"
android:layout_marginTop="5dp"
android:background="@mipmap/background_live_notify_gift"
android:paddingStart="5dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/notify_gift_receive_icon1"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_centerVertical="true"
android:layout_marginStart="7dp"
android:layout_marginTop="2dp"
android:src="@mipmap/icon_live_notify_gift" />
<com.yunbao.common.views.weight.MarqueeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="5dp"
android:layout_marginEnd="50dp"
android:layout_toEndOf="@+id/notify_gift_receive_icon1"
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/live_room_push_you_gift"
android:textColor="#FF444444"
android:textSize="12dp" />
<TextView
android:id="@+id/new_task_gift_details1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginEnd="18dp"
android:fontFamily="sans-serif-condensed-medium"
android:gravity="center"
android:maxWidth="50dp"
android:text="@string/live_room_push_to_new_task"
android:textColor="#FF2B5AB8"
android:textSize="12sp"
android:visibility="visible"
tools:visibility="visible" />
<ImageView
android:id="@+id/close_task_receive_close1"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:src="@mipmap/icon_live_notify_close" />
</RelativeLayout>
<!--完成任務-->
<RelativeLayout
android:id="@+id/new_task_gift_notify"
android:layout_width="250dp"
android:layout_height="46dp"
android:layout_marginTop="5dp"
android:background="@mipmap/background_live_notify_gift"
android:paddingStart="5dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/notify_gift_receive_icon"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_centerVertical="true"
android:layout_marginStart="7dp"
android:layout_marginTop="2dp"
android:src="@mipmap/icon_live_notify_gift" />
<com.yunbao.common.views.weight.MarqueeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="5dp"
android:layout_marginEnd="50dp"
android:layout_toEndOf="@+id/notify_gift_receive_icon"
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/live_room_push_new_person_task"
android:textColor="#FF444444"
android:textSize="12dp" />
<TextView
android:id="@+id/new_task_gift_details"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:fontFamily="sans-serif-condensed-medium"
android:gravity="center"
android:maxWidth="50dp"
android:singleLine="true"
android:text="@string/live_room_push_details"
android:textColor="#FF2B5AB8"
android:textSize="12sp"
android:visibility="visible"
tools:visibility="visible" />
<ImageView
android:id="@+id/close_task_receive_close"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="1dp"
android:layout_marginEnd="1dp"
android:src="@mipmap/icon_live_notify_close" />
</RelativeLayout>
<!--關注主播-->
<RelativeLayout
android:id="@+id/notify_follow_layout"
android:layout_width="250dp"
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_marginTop="5dp"
android:visibility="gone"
tools:visibility="visible">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="41dp"
android:layout_marginTop="5dp"
android:background="@mipmap/bg_live_room_notify_follow"
android:paddingStart="10dp">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_centerVertical="true"
android:layout_marginTop="2dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_live_room_follow_avatar" />
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/notify_follow_coin"
android:layout_width="29dp"
android:layout_height="29dp"
android:layout_centerVertical="true"
android:layout_marginStart="0.5dp"
android:layout_marginTop="2dp"
android:scaleType="centerCrop"
android:src="@mipmap/icon_live_room_follow_avatar"
app:riv_oval="true" />
<TextView
android:id="@+id/notify_follow_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="35dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="20dp"
tools:text="主播名稱"
android:textColor="@color/white"
android:textSize="14sp"
android:visibility="visible"
tools:visibility="visible" />
<com.yunbao.common.views.weight.MarqueeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginStart="35dp"
android:layout_marginEnd="65dp"
android:layout_marginBottom="5dp"
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/live_room_push_like_an"
android:textColor="@color/white"
android:textSize="10sp" />
<ImageView
android:id="@+id/follow_first_look"
android:layout_width="45dp"
android:layout_height="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="15dp"
android:src="@mipmap/icon_live_room_follow" />
</RelativeLayout>
<ImageView
android:id="@+id/close_first_look_follow"
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_alignParentEnd="true"
android:src="@mipmap/icon_live_notify_close1" />
</RelativeLayout>
<!--整蛊消息-->
<RelativeLayout
android:id="@+id/tricky_layout_name"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_marginStart="13dp"
android:layout_marginTop="5dp"
android:background="@drawable/background_live_sud_hint"
android:visibility="gone"
tools:visibility="gone">
<ImageView
android:id="@+id/tricky_coin"
android:layout_width="22dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:src="@mipmap/ic_live_rom_tricky" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/tricky_text_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="5dp"
android:layout_toEndOf="@+id/tricky_coin"
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="@string/anchor_initiated_prank_entertainment"
android:textColor="@color/black1"
android:textSize="12dp" />
<TextView
android:id="@+id/tricky_join"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_toEndOf="@+id/tricky_text_name"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_live_room_tricky_hint_join"
android:ellipsize="end"
android:fontFamily="sans-serif-condensed-medium"
android:gravity="center"
android:maxWidth="50dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:singleLine="true"
android:text="@string/see_tips"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="visible"
tools:visibility="visible" />
</RelativeLayout>
<!--游戏消息-->
<RelativeLayout
android:id="@+id/sud_layout_name"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_marginStart="13dp"
android:layout_marginTop="5dp"
android:background="@drawable/background_live_sud_hint"
android:visibility="gone"
tools:visibility="gone">
<ImageView
android:id="@+id/sud_game_coin"
android:layout_width="22dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:src="@mipmap/live_room_sud_hint_icon" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/sud_text_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="5dp"
android:layout_toEndOf="@+id/sud_game_coin"
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
tools:text="主播創建了【游戲名】房間"
android:textColor="@color/black1"
android:textSize="12dp" />
<TextView
android:id="@+id/sud_join"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_toEndOf="@+id/sud_text_name"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_live_room_sud_hint_join"
android:ellipsize="end"
android:fontFamily="sans-serif-condensed-medium"
android:gravity="center"
android:maxWidth="50dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:singleLine="true"
android:text="@string/live_room_sud_hint_join"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="visible"
tools:visibility="visible" />
<ImageView
android:visibility="gone"
android:id="@+id/iconSudClose"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_alignParentTop="true"
android:layout_toEndOf="@+id/sud_join"
android:layout_marginTop="2dp"
android:layout_marginEnd="2dp"
android:src="@mipmap/icon_live_room_sud_close" />
</RelativeLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/pa_pao_layout"
android:layout_width="match_parent"

BIN
live/src/main/res/mipmap-xhdpi/background_live_notify_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 KiB

BIN
live/src/main/res/mipmap-xhdpi/bg_live_room_notify_follow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
live/src/main/res/mipmap-xhdpi/icon_live_notify_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
live/src/main/res/mipmap-xhdpi/icon_live_notify_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
live/src/main/res/mipmap-xhdpi/icon_live_room_follow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
live/src/main/res/mipmap-xhdpi/icon_live_room_follow_avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
live/src/main/res/mipmap-zh/icon_live_room_follow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

8
live/src/main/res/values-zh/strings.xml
View File

@ -154,4 +154,12 @@
<string name="report_second_6">已收到您的補充信息，我們正在加急處理中</string>
<string name="report_second_7">提交成功</string>
<string name="live_room_push_to_new_task">點擊\n前往</string>
<string name="live_room_push_you_gift">您有一份獎勵可領取,速速前往！</string>
<string name="live_room_push_look_5min">看了這麼久，送ta一份免費禮物吧 ~ 完成首次送禮任務還可以領取精美獎品！</string>
<string name="live_room_push_view_gift">查看禮物</string>
<string name="live_room_push_new_person_task">完成新人任務，可領多重專屬豪禮！</string>
<string name="live_room_push_details">詳情</string>
<string name="live_room_push_like_an">喜歡主播就關注ta吧~</string>
</resources>

8
live/src/main/res/values/strings.xml
View File

@ -157,4 +157,12 @@
<string name="report_second_6">Your supplementary information has been received. We are handling it urgently</string>
<string name="report_second_7">Submitted successfully</string>
<string name="live_room_push_to_new_task">Click \nto go</string>
<string name="live_room_push_you_gift">You have a viewing reward to claim, go there quickly!</string>
<string name="live_room_push_look_5min">After watching for so long, give her a free gift~ You can also receive exquisite gifts by completing the gift-giving task!</string>
<string name="live_room_push_view_gift">View Gifts</string>
<string name="live_room_push_new_person_task">Complete the newcomer tasks and receive multiple gifts</string>
<string name="live_room_push_details">Details</string>
<string name="live_room_push_like_an">If you like this anchor, please subscribe to him.</string>
</resources>