moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.相亲模式昵称点击改为使用正确的uid

Browse Source 
2.塔罗消息 金币->钻石
3.相亲牵手svga场景关闭按钮点击优化
This commit is contained in:
memory
2021-01-31 10:00:18 +08:00
parent 423afc610a
commit f39ad33dc4
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -1364,6 +1364,9 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
@SuppressLint({"SetTextI18n"})
private void showHandAnim(final DatingNotifyInfo datingNotifyInfo) {
if (datingDisposable != null) datingDisposable.dispose();
gameMainBinding.flSvgaDating.setOnClickListener(v -> {
//do noting
});
gameMainBinding.flSvgaDating.post(() -> gameMainBinding.flSvgaDating.setVisibility(View.GONE));
datingDisposable = Single.just(datingNotifyInfo)
.compose(bindToLifecycle())

8
app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
View File

@@ -841,7 +841,7 @@ public class MessageView extends FrameLayout {
@Override
public void onClick(@NonNull View widget) {
if (clickConsumer != null) {
Single.just(String.valueOf(notifyInfo.getTargetUid())).subscribe(clickConsumer);
Single.just(String.valueOf(notifyInfo.getUid())).subscribe(clickConsumer);
}
}
})
@@ -863,7 +863,7 @@ public class MessageView extends FrameLayout {
@Override
public void onClick(@NonNull View widget) {
if (clickConsumer != null) {
Single.just(String.valueOf(notifyInfo.getTargetUid())).subscribe(clickConsumer);
Single.just(String.valueOf(notifyInfo.getUid())).subscribe(clickConsumer);
}
}
})
@@ -878,7 +878,7 @@ public class MessageView extends FrameLayout {
@Override
public void onClick(@NonNull View widget) {
if (clickConsumer != null) {
Single.just(String.valueOf(notifyInfo.getTargetUid())).subscribe(clickConsumer);
Single.just(String.valueOf(notifyInfo.getUid())).subscribe(clickConsumer);
}
}
})
@@ -913,7 +913,7 @@ public class MessageView extends FrameLayout {
.append("恭喜 ", new ForegroundColorSpan(textColor))
.append(nickName, new ForegroundColorSpan(roomTipNickColor))
.append(" 在塔罗占卜中运气爆发，收获", new ForegroundColorSpan(textColor))
.append(tarotMsgBean.getDrawGoldNum() + "金币", new ForegroundColorSpan(roomTipColor));
.append(tarotMsgBean.getDrawGoldNum() + "钻石", new ForegroundColorSpan(roomTipColor));
tvContent.setText(text.build());
}
}

19
app/src/main/res/layout/fragment_chatroom_game_main.xml
View File

@@ -28,17 +28,17 @@
android:layout_height="42dp"
android:layout_alignBottom="@+id/ll_room_info"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginTop="30dp"
android:layout_marginBottom="0dp"
android:padding="10dp"
android:layout_marginTop="30dp"
android:scaleType="fitCenter"
android:src="@drawable/arrow_left_white" />
<LinearLayout
android:layout_marginTop="30dp"
android:id="@+id/ll_room_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_toEndOf="@id/room_back"
android:orientation="vertical">
@@ -234,8 +234,8 @@
android:id="@+id/cl_notify"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="80dp">
android:layout_marginTop="80dp"
android:visibility="gone">
<FrameLayout
android:id="@+id/fl_lucky_gift_notify"
@@ -276,7 +276,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#66000000"
android:visibility="gone">
android:visibility="visible">
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/svga_dating"
@@ -309,14 +309,15 @@
android:layout_width="1px"
android:layout_height="13dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginEnd="5dp"
android:background="@color/white" />
<ImageView
android:id="@+id/iv_dating_svga_close"
android:layout_width="14dp"
android:layout_height="14dp"
android:scaleType="fitXY"
android:layout_width="25dp"
android:layout_height="25dp"
android:scaleX="0.7"
android:scaleY="0.7"
android:src="@drawable/btn_close" />
</LinearLayout>