Merge remote-tracking branch 'origin/master'

This commit is contained in:
2022-11-23 14:14:34 +08:00
23 changed files with 273 additions and 197 deletions

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();