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

准备新的礼物和机器人部分业务

Browse Source
This commit is contained in:
ningwenqiang 2024-09-24 10:30:48 +08:00
parent 84bbb0c143
commit 7976d36701
7 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1030,7 +1030,7 @@ Limited ride And limited avatar frame</string>
<string name="anchor_task">Anchor Task</string>
<string name="anchor_agreement">I have read and agreed to the </string>
<string name="anchor_agreement_hint">Please read and agree to the PandoraLive Host Agreement</string>
<string name="anchor_hint">PDLIVE Host Agreement</string>
<string name="anchor_hint">PandoraLive Host Agreement</string>
<string name="live_task_new_user_timer">The statute of limitations for new anchors expires</string>
<string name="live_data_coin">Get diamonds</string>
<string name="live_data_gold">Get gold beans</string>

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

@ -1052,7 +1052,7 @@
<string name="anchor_task">主播任務</string>
<string name="anchor_agreement">我已閱讀並同意</string>
<string name="anchor_agreement_hint">請閱讀並同意《PandoraLive主播協議》</string>
<string name="anchor_hint">《PDLIVE主播協議》</string>
<string name="anchor_hint">《PandoraLive主播協議》</string>
<string name="live_task_new_user_timer">新秀主播時效截止至 </string>
<string name="live_data_coin">收穫鑽石</string>
<string name="live_data_gold">收穫金豆</string>

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

@ -863,7 +863,7 @@ Limited ride And limited avatar frame</string>
<string name="anchor_task">Anchor Task</string>
<string name="anchor_agreement">I have read and agreed to the </string>
<string name="anchor_agreement_hint">Please read and agree to the PandoraLive Host Agreement</string>
<string name="anchor_hint">PDLIVE Host Agreement</string>
<string name="anchor_hint">PandoraLive Host Agreement</string>
<string name="live_task_new_user_timer">The statute of limitations for new anchors expires</string>
<string name="live_data_coin">Get diamonds</string>
<string name="live_data_gold">Get gold beans</string>

3
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -6564,12 +6564,13 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mRoot.post(new Runnable() {
@Override
public void run() {
//TODO 设置布局参数
int mScreenWdith = ScreenDimenUtil.getInstance().getScreenWdith();
int vHeight = mScreenWdith * 720 / 960;
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) detailsView.getLayoutParams();
params.height = vHeight;
params.width = mScreenWdith;
params.topMargin = DpUtil.dp2px(105);
params.topMargin = DpUtil.dp2px(128);
params.addRule(RelativeLayout.ALIGN_TOP);
detailsView.setLayoutParams(params);
}

18
live/src/main/res/layout/view_live_pk_details.xml
View File

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<!--左上-->
<LinearLayout
android:id="@+id/lin_pk1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:id="@+id/linear_grade1"
@ -64,7 +66,8 @@
android:layout_gravity="end"
android:gravity="end"
android:orientation="vertical"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<LinearLayout
android:id="@+id/linear_grade2"
@ -120,7 +123,8 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/text_pk_name3"
@ -177,7 +181,8 @@
android:layout_gravity="bottom|end"
android:gravity="end"
android:orientation="vertical"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/text_pk_name4"
@ -233,7 +238,8 @@
android:layout_height="18dp"
android:layout_gravity="center_horizontal"
android:background="@mipmap/live_pk_time_bg"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/text_time"

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

@ -1800,7 +1800,7 @@
android:id="@+id/lt_pk_line"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="148dp"
android:layout_marginTop="156dp"
android:visibility="gone"
tools:visibility="visible">
@ -3150,7 +3150,7 @@
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
tools:text="主播發起了整蠱娛樂，點擊查看"
android:text="主播發起了整蠱娛樂，點擊查看"
android:textColor="@color/black1"
android:textSize="12dp" />

11
live/src/main/res/layout/view_ry_live_anchor.xml
View File

@ -10,9 +10,10 @@
android:id="@+id/live_time"
android:layout_width="wrap_content"
android:layout_height="23dp"
android:layout_marginTop="82dp"
android:layout_gravity="end"
android:layout_centerVertical="true"
android:layout_gravity="end"
android:layout_marginTop="82dp"
android:layout_marginEnd="10dp"
android:background="@drawable/bg_live_push_time"
android:drawablePadding="5dp"
@ -25,7 +26,8 @@
android:visibility="visible"
app:dt_left_drawable="@drawable/bg_push_time_point"
app:dt_left_height="4dp"
app:dt_left_width="4dp" />
app:dt_left_width="4dp"
tools:visibility="visible" />
<LinearLayout
android:layout_width="match_parent"
@ -286,7 +288,8 @@
android:textColor="#fff"
android:textSize="10sp"
android:translationY="-4dp"
android:visibility="gone" />
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout>