diff --git a/live/src/main/java/com/yunbao/live/adapter/RandomPkRecyclerAdapter.java b/live/src/main/java/com/yunbao/live/adapter/RandomPkRecyclerAdapter.java index 47cede1f8..27c2a5d4e 100644 --- a/live/src/main/java/com/yunbao/live/adapter/RandomPkRecyclerAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/RandomPkRecyclerAdapter.java @@ -103,7 +103,11 @@ public class RandomPkRecyclerAdapter extends RefreshAdapter { itemView.setBackgroundResource(R.drawable.bg_item_random_pk_type_2); } ImgLoader.display(mContext, bean.getAvatar(), mAvatar); - mName.setText(bean.getUserNiceName()); + if(bean.getUserNiceName().length()>4){ + mName.setText(bean.getUserNiceName().substring(0,4)+"..."); + }else { + mName.setText(bean.getUserNiceName()); + } mId.setText(bean.getId()); mStatus.setText(bean.getStatus()); if (bean.isPkIng()) { diff --git a/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java index 87ca3a9c1..8230f7a39 100644 --- a/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/RandomPkDialogFragment.java @@ -167,7 +167,7 @@ public class RandomPkDialogFragment extends AbsDialogFragment { RandomPkBean bean = new RandomPkBean(); bean.setId(i + ""); bean.setAvatar("https://ceshi.yaoulive.com/default.jpg"); - bean.setUserNiceName("测试样本" + i); + bean.setUserNiceName(i + "测试样本123456"); bean.setStatus(i % 3 == 0 ? "PK中" : "空闲"); bean.setPkIng(i % 3 == 0); bean.setFollow(i % 2 == 0); @@ -202,6 +202,7 @@ public class RandomPkDialogFragment extends AbsDialogFragment { mSearchLayout.setVisibility(View.INVISIBLE); switch ((int) tab.getTag()) { case 1: + mSearchLayout.setVisibility(View.GONE); mPkInfoLayout.setVisibility(View.VISIBLE); break; case 2: diff --git a/live/src/main/res/layout/dialog_live_random_pk_function.xml b/live/src/main/res/layout/dialog_live_random_pk_function.xml index d7ce86bc8..54024bda4 100644 --- a/live/src/main/res/layout/dialog_live_random_pk_function.xml +++ b/live/src/main/res/layout/dialog_live_random_pk_function.xml @@ -2,7 +2,7 @@ @@ -91,13 +91,13 @@ @@ -105,9 +105,8 @@ diff --git a/live/src/main/res/layout/item_random_pk_info.xml b/live/src/main/res/layout/item_random_pk_info.xml index b1fa08829..0d4a66181 100644 --- a/live/src/main/res/layout/item_random_pk_info.xml +++ b/live/src/main/res/layout/item_random_pk_info.xml @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" - android:layout_marginTop="2dp" + android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:text="@string/random_pk_info_desc_2" android:textColor="#F6F7FB" @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" - android:layout_marginTop="2dp" + android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:text="@string/random_pk_info_desc_3" android:textColor="#F6F7FB" @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="10dp" - android:layout_marginTop="2dp" + android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:layout_marginBottom="15dp" android:text="@string/random_pk_info_desc_4" diff --git a/live/src/main/res/layout/item_random_pk_rv.xml b/live/src/main/res/layout/item_random_pk_rv.xml index 6aa21c4c6..753f1c570 100644 --- a/live/src/main/res/layout/item_random_pk_rv.xml +++ b/live/src/main/res/layout/item_random_pk_rv.xml @@ -51,7 +51,7 @@ android:id="@+id/item_uid" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="1" + android:layout_weight="0.8" android:gravity="center" android:text="ID" android:textColor="#FFFFFF" diff --git a/live/src/main/res/layout/item_random_pk_rv_search.xml b/live/src/main/res/layout/item_random_pk_rv_search.xml index d025fa67d..642dd4fde 100644 --- a/live/src/main/res/layout/item_random_pk_rv_search.xml +++ b/live/src/main/res/layout/item_random_pk_rv_search.xml @@ -1,9 +1,9 @@ + android:textColor="#FFFFFF" + android:textColorHint="#80FFFFFF" + android:textSize="14sp" /> 已超过10秒未识别到录音 身份特權 貴族坐席 - PK主要规则说明: - 1、开始匹配后,系统将会自动给您挑选对手进行PK; - 2、每场PK总时长10分钟,惩罚时间为1分钟; - 3、PK过程中,若出现黑屏、卡顿延迟等技术问题,请检查个人设备及网络后,尝试重新登陆开播软件并开播; - 4、安全部门将会24小时巡查,请文明PK,严格遵守主播守则; - 随机PK开关: - 开始匹配 - 匹配中 %s \n再次点击可取消匹配 - 正在退出匹配 %s \n退出过程中也有可能匹配到对手 - 请输入您要pk的主播昵称或id + PK主要規則說明: + 1、開始匹配後,系統將會自動給您挑選對手進行PK; + 2、每場PK總時長10分鍾,懲罰時間為1分鍾; + 3、PK過程中,若出現黑屏、卡頓延遲等技術問題,請檢查個人設備及網絡後,嘗試重新登陸開播軟件並開播; + 4、安全部門將會24小時巡查,請文明PK,嚴格遵守主播守則; + 隨機PK開關: + 開始匹配 + 匹配中 %s \n再次點擊可取消匹配 + 正在退出匹配 %s \n退出過程中也有可能匹配到對手 + 請輸入您要pk的主播昵稱或id +