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-11-23 13:42:55 +08:00
parent 0d219e4b6d
commit 011322dd8e
12 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
common/src/main/assets/icon_noble_chaohuang.svga
View File

Binary file not shown.

BIN
common/src/main/assets/icon_noble_gongjue.svga
View File

Binary file not shown.

BIN
common/src/main/assets/icon_noble_guowang.svga
View File

Binary file not shown.

BIN
common/src/main/assets/icon_noble_houjue.svga
View File

Binary file not shown.

BIN
common/src/main/assets/icon_noble_huangdi.svga
View File

Binary file not shown.

BIN
common/src/main/assets/icon_noble_nanjue.svga
View File

Binary file not shown.

BIN
common/src/main/assets/icon_noble_zijue.svga
View File

Binary file not shown.

7
common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java
View File

@@ -80,7 +80,7 @@ public class NobleNoticeView extends FrameLayout {
rootView = LayoutInflater.from(mContext).inflate(R.layout.view_noble_notice, this, true);
svagaBc = rootView.findViewById(R.id.svaga_bc);
rootLayout = rootView.findViewById(R.id.root_layout);
gotoRoomView = rootView.findViewById(R.id.goto_room_view);
gotoRoomView = rootView.findViewById(R.id.got_room_view);
contextLayout = rootView.findViewById(R.id.context_layout);
scrollLayout = rootView.findViewById(R.id.scroll_layout);
nobleIcon = rootView.findViewById(R.id.noble_icon);
@@ -111,7 +111,6 @@ public class NobleNoticeView extends FrameLayout {
findViewById(R.id.anchor_nickname).setVisibility(GONE);
openNoble.setText(mContext.getString(R.string.open_noble2));
}else {
gotoRoomView.setVisibility(VISIBLE);
findViewById(R.id.in).setVisibility(VISIBLE);
findViewById(R.id.anchor_nickname).setVisibility(VISIBLE);
openNoble.setText(mContext.getString(R.string.open_noble));
@@ -254,7 +253,7 @@ public class NobleNoticeView extends FrameLayout {
@Override
public void onStep(int frame, double v) {
System.out.println("frame = " + frame);
if (frame == 10) {
if (frame == 20) {
setButtonPosition(roleType);
observable.observeOn(AndroidSchedulers.mainThread())
.subscribe(bitmap -> {
@@ -270,7 +269,7 @@ public class NobleNoticeView extends FrameLayout {
}).isDisposed();
}
if (frame == 150) {
if (frame == 135) {
contextLayout.setVisibility(GONE);
gotoRoomView.setVisibility(GONE);
scrollLayout.clearAnimation();

4
common/src/main/res/layout/view_noble_notice.xml
View File

@@ -12,7 +12,7 @@
<TextView
android:id="@+id/goto_room_view"
android:id="@+id/got_room_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="42dp"
android:layout_marginEnd="10dp"
android:layout_toStartOf="@id/goto_room_view"
android:layout_toStartOf="@id/got_room_view"
android:scrollbars="none">
<RelativeLayout

4
config.gradle
View File

@@ -10,9 +10,9 @@ ext {
manifestPlaceholders = [
//正式
serverHost : "https://napi.yaoulive.com",
// serverHost : "https://napi.yaoulive.com",
//測試
// serverHost : "https://ceshi.yaoulive.com",
serverHost : "https://ceshi.yaoulive.com",
//腾讯地图
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",

20
live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
View File

@@ -230,28 +230,28 @@ public class LiveTextRender {
int index = 0;
if (levelDrawable != null) {
builder.append(" ");
builder.append(" ");
levelDrawable.setBounds(0, 0, DpUtil.dp2px(32), DpUtil.dp2px(14));
builder.setSpan(new VerticalImageSpan(levelDrawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
index = builder.length();
}
if (gzDrawablesMap.containsKey(bean)) {//贵族
builder.append(" ");
builder.append(" ");
gzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(32), DpUtil.dp2px(18));
builder.setSpan(new VerticalImageSpan(gzDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
index = builder.length();
}
if (ryxzDrawablesMap.containsKey(bean)) {//荣誉勋章
builder.append(" ");
builder.append(" ");
ryxzDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(18), DpUtil.dp2px(18));
builder.setSpan(new VerticalImageSpan(ryxzDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
index = builder.length();
}
if (nhDrawablesMap.containsKey(bean)) {//靓号
builder.append(" ");
builder.append(" ");
nhDrawablesMap.get(bean).setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(17));
builder.setSpan(new VerticalImageSpan(nhDrawablesMap.get(bean)), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
index = builder.length();
@@ -268,7 +268,7 @@ public class LiveTextRender {
}
if (drawable != null) {
builder.append(" ");
builder.append(" ");
drawable.setBounds(0, 0, DpUtil.dp2px(18), DpUtil.dp2px(16));
builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
index = builder.length();
@@ -280,7 +280,7 @@ public class LiveTextRender {
&& !bean.getMedalNmae().equals("null") && !bean.getMedalNmae().equals("(null)") && !bean.getMedalNmae().equals("<null>")) {//粉丝徽章图标
Drawable drawable = getMedalImage(bean);
if (drawable != null) {
builder.append(" ");
builder.append(" ");
drawable.setBounds(0, 0, DpUtil.dp2px(44), DpUtil.dp2px(17));
builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
index = builder.length();
@@ -291,7 +291,7 @@ public class LiveTextRender {
if (bean.isManager()) {//直播间管理员图标
Drawable drawable = ContextCompat.getDrawable(CommonAppContext.sInstance, R.mipmap.icon_live_chat_m);
if (drawable != null) {
builder.append(" ");
builder.append(" ");
drawable.setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(14));
builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
index = builder.length();
@@ -301,7 +301,7 @@ public class LiveTextRender {
if (!TextUtils.isEmpty(bean.getLiangName())) {//靓号图标
Drawable drawable = ContextCompat.getDrawable(CommonAppContext.sInstance, R.mipmap.icon_live_chat_liang);
if (drawable != null) {
builder.append(" ");
builder.append(" ");
drawable.setBounds(0, 0, DpUtil.dp2px(17), DpUtil.dp2px(14));
builder.setSpan(new VerticalImageSpan(drawable), index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
// new add
@@ -528,9 +528,9 @@ public class LiveTextRender {
int indexX = 80;
//水印的位置坐标
if (level.length() > 2) {
indexX = 75;
indexX = 87;
} else {
indexX = 84;
indexX = 95;
}
mCanvas.drawText(level, indexX, 53, mPaint);
mCanvas.save();

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

@@ -9,6 +9,11 @@
android:paddingTop="15dp">
<com.yunbao.common.views.weight.NobleNoticeView
android:id="@+id/noble"
android:layout_width="match_parent"
android:layout_marginTop="60dp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/lin"
@@ -2089,13 +2094,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/live_video" />
<com.yunbao.common.views.weight.NobleNoticeView
android:id="@+id/noble"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/live_wks_layout"
android:layout_marginTop="10dp" />
<LinearLayout
android:id="@+id/bannerLayout"