diff --git a/app/src/main/java/com/nnbc123/app/MainActivity.java b/app/src/main/java/com/nnbc123/app/MainActivity.java index 5bbc47d09..fa893b264 100644 --- a/app/src/main/java/com/nnbc123/app/MainActivity.java +++ b/app/src/main/java/com/nnbc123/app/MainActivity.java @@ -17,6 +17,7 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; import android.view.animation.LinearInterpolator; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -153,17 +154,14 @@ public class MainActivity extends BaseMvpActivity private DragLayout avatarLayout; private TextView tvName;//最小化窗口名称 private TextView tvId;//最小化窗口ID - private CircleImageView avatarImage; + private ImageView avatarImage; private LinearLayout llDragInfo; private LivingIconView userLivingView; private View viewClose; private MainTabLayout mMainTabLayout; private AnchorCardView anchorCardView; private int mCurrentTabType = MainTabType.TAB_TYPE_HOME; - /** - * 房间最小化动画,换成属性动画,原先的补间动画影响了activity的生命周期 - */ - private ObjectAnimator roomMinAnim; + /** * 管理限制进房 */ @@ -293,7 +291,6 @@ public class MainActivity extends BaseMvpActivity } private void closeOpenRoomAnimation() { - stopRoomMinAnim(); avatarLayout.setVisibility(View.GONE); } @@ -425,7 +422,6 @@ public class MainActivity extends BaseMvpActivity super.onDestroy(); ImInitHelper.get().unInit(); EventBus.getDefault().unregister(this); - stopRoomMinAnim(); if (limitEnterRoomHelper != null) { limitEnterRoomHelper.release(); } @@ -584,21 +580,6 @@ public class MainActivity extends BaseMvpActivity } } - private void startRoomMinAnim() { - roomMinAnim = ObjectAnimator.ofFloat(avatarImage, "rotation", 0f, 360f); - roomMinAnim.setDuration(10000); - roomMinAnim.setRepeatCount(-1); - roomMinAnim.setInterpolator(new LinearInterpolator()); - roomMinAnim.start(); - } - - private void stopRoomMinAnim() { - if (roomMinAnim != null) { - roomMinAnim.cancel(); - roomMinAnim = null; - } - } - @SuppressLint("SetTextI18n") private void displayAvatarLayout(String avatar, String nickName, long uid) { avatarLayout.clearAnimation(); @@ -606,8 +587,6 @@ public class MainActivity extends BaseMvpActivity tvName.setText(nickName); tvId.setText("ID:" + uid); userLivingView.start(); - stopRoomMinAnim(); - startRoomMinAnim(); ImageLoadUtils.loadAvatar(MainActivity.this, avatar, avatarImage); } diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java b/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java index a62fba03f..6ea4b7851 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java +++ b/app/src/main/java/com/nnbc123/app/avroom/widget/MessageView.java @@ -2017,6 +2017,11 @@ public class MessageView extends FrameLayout { return true; }); } + viewHolder.ivAvatar.setOnClickListener(v -> { + if (clickConsumer != null) { + Single.just(chatRoomMessage.getFromAccount()).subscribe(clickConsumer); + } + }); } diff --git a/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java b/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java index 97015165b..f120d5c2b 100644 --- a/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java @@ -176,8 +176,7 @@ public class BindCodeActivity extends BaseLoginAct { public void onSuccess(String s) { tvDesc.setText(getString(R.string.str_send_code_success) + mPhone); startCountDownTimer(); - toast(s); - + toast(getString(R.string.str_send_code_success) + mPhone); } @Override diff --git a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java index 0ab19c4c6..75350507c 100644 --- a/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/nnbc123/app/ui/user/UserInfoActivity.java @@ -342,7 +342,8 @@ public class UserInfoActivity extends BaseBindingActivity startActivity(Intent(mContext, UserGiftActivity::class.java)) + R.id.iv_more_gift -> startActivity(Intent(mContext, UserGiftActivity::class.java)) } } @@ -141,7 +141,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment - + diff --git a/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.png b/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.png new file mode 100644 index 000000000..d1066c04a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.webp b/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.webp deleted file mode 100644 index 6b7e6373e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_room_main_entrance.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_send_all_gift.png b/app/src/main/res/drawable-xhdpi/bg_send_all_gift.png new file mode 100644 index 000000000..e1e0ab250 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_send_all_gift.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_gift_dialog_top_indicator.png b/app/src/main/res/drawable-xhdpi/ic_gift_dialog_top_indicator.png index e3e97f56d..e432a0a6a 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_gift_dialog_top_indicator.png and b/app/src/main/res/drawable-xhdpi/ic_gift_dialog_top_indicator.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_send_magic.png b/app/src/main/res/drawable-xhdpi/icon_send_magic.png index 2e1b226b4..63732633a 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_send_magic.png and b/app/src/main/res/drawable-xhdpi/icon_send_magic.png differ diff --git a/app/src/main/res/drawable/bg_dialog_room_operation.xml b/app/src/main/res/drawable/bg_dialog_room_operation.xml index 4347b517f..aa2320bcb 100644 --- a/app/src/main/res/drawable/bg_dialog_room_operation.xml +++ b/app/src/main/res/drawable/bg_dialog_room_operation.xml @@ -1,7 +1,7 @@ - + - + diff --git a/app/src/main/res/layout/activity_login_code.xml b/app/src/main/res/layout/activity_login_code.xml index 8c87f1538..101310507 100644 --- a/app/src/main/res/layout/activity_login_code.xml +++ b/app/src/main/res/layout/activity_login_code.xml @@ -44,6 +44,7 @@ android:text="验证码已发送\n+86 15565758987" android:textColor="@color/white" android:textSize="@dimen/sp_20" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/iv_logo" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ad7a5787b..748899ec4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -26,8 +26,9 @@ app:layout_constraintStart_toStartOf="parent" /> @@ -36,7 +37,6 @@ android:layout_width="@dimen/dp_drag_layout_bg_width" android:layout_height="@dimen/dp_drag_layout_bg_height" android:layout_gravity="bottom|end" - android:layout_marginEnd="@dimen/dp_15" android:layout_marginBottom="50dp" android:background="@drawable/bg_room_main_entrance" android:visibility="visible"> @@ -45,20 +45,24 @@ android:id="@+id/fl_avatar" android:layout_width="@dimen/dp_drag_layout_avatar_size" android:layout_height="@dimen/dp_drag_layout_avatar_size" - android:layout_centerVertical="true" - android:layout_marginStart="12.5dp"> + android:layout_marginStart="15dp" + android:layout_marginTop="13dp"> - + app:borderRadius="7dp" + app:type="round" + tools:src="@drawable/default_cover" /> - + /> + android:orientation="vertical" + android:visibility="gone"> diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index ed367c3e7..e8b05b3c2 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -255,7 +255,7 @@ android:padding="10dp" android:textColor="@color/text_secondary_878b9c" android:textSize="@dimen/dp_12" - tools:text="关注我喜欢我就关注我喜欢我就关注我我就关注我" /> + tools:text="关注我喜欢关注我喜欢我就关注我喜欢我就关注我我就关注我我就关注我喜欢我就关注我我就关注我" /> @@ -301,10 +301,19 @@ android:layout_marginTop="189dp" android:gravity="center"> + + diff --git a/app/src/main/res/layout/dialog_bottom_gift.xml b/app/src/main/res/layout/dialog_bottom_gift.xml index 00f0e17ba..0ddec2c2e 100644 --- a/app/src/main/res/layout/dialog_bottom_gift.xml +++ b/app/src/main/res/layout/dialog_bottom_gift.xml @@ -141,15 +141,34 @@ + + + + + + + app:layout_constraintStart_toStartOf="parent" + tools:background="@drawable/bg_dialog_room_operation"> + + + + + android:orientation="horizontal" + android:visibility="gone"> + android:background="@drawable/bg_send_all_gift"> - - + + - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f0da3b454..ed960c464 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -204,9 +204,9 @@ 55dp 12dp 15dp - 190dp - 63dp - 38dp + 96dp + 78dp + 45dp 50dp 70.5dp diff --git a/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java b/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java index dd6b52956..c67576303 100644 --- a/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/nnbc123/app/community/square/SquareFragment.java @@ -93,7 +93,7 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd @BindView(R.id.fl_contact_list) FrameLayout flContactList; @BindView(R.id.msg_number) - TextView tvCommunityUnread; + View tvCommunityUnread; @BindView(R.id.roll_view) RollPagerView rollView; @@ -192,8 +192,6 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd View flRoot = LayoutInflater.from(container.getContext()).inflate(R.layout.item_square_topic_banner, container, false); ImageView imgBanner = flRoot.findViewById(R.id.iv_cover); ImageLoadKt.load(imgBanner, worldInfo.getIcon(), 12); - TextView tvTopic = flRoot.findViewById(R.id.tv_topic); - tvTopic.setText("#" + worldInfo.getName()); flRoot.setOnClickListener(v -> TopicMainActivity.start(mContext, String.valueOf(worldInfo.getId()))); return flRoot; } @@ -261,18 +259,9 @@ public class SquareFragment extends BaseFragment implements MainMagicIndicatorAd @SuppressLint("SetTextI18n") public void setNumber(int number) { - if (tvCommunityUnread instanceof BubbleView) { - ((BubbleView) tvCommunityUnread).setNumText(number); - return; - } tvCommunityUnread.setVisibility(number <= 0 ? GONE : VISIBLE); - if (number > 99) { - tvCommunityUnread.setText("99+"); - } else - tvCommunityUnread.setText(String.valueOf(number)); } - @Subscribe(threadMode = ThreadMode.MAIN) public void onLoginUserInfoUpdateEvent(LoadLoginUserInfoEvent event) { getUnReadCount(); diff --git a/app/src/module_community/res/layout/fragment_square.xml b/app/src/module_community/res/layout/fragment_square.xml index 532e932c7..bb06dba0c 100644 --- a/app/src/module_community/res/layout/fragment_square.xml +++ b/app/src/module_community/res/layout/fragment_square.xml @@ -71,11 +71,12 @@ android:scaleType="center" android:src="@drawable/ic_community_notice_rink" /> - - + - + android:layout_gravity="bottom|end" + android:layout_marginEnd="@dimen/dp_15" + android:layout_marginBottom="90dp"> + + + + + + + - \ No newline at end of file diff --git a/app/src/module_community/res/layout/head_dynamic_detail.xml b/app/src/module_community/res/layout/head_dynamic_detail.xml index 05898f2b1..cb2445a0d 100644 --- a/app/src/module_community/res/layout/head_dynamic_detail.xml +++ b/app/src/module_community/res/layout/head_dynamic_detail.xml @@ -150,30 +150,30 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - + + app:layout_constraintTop_toBottomOf="@id/tv_time_detail"> diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index 362336f58..541a5fa95 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -250,7 +250,7 @@ android:layout_marginBottom="6dp" android:src="@drawable/icon_room_treasure_box" android:visibility="gone" - tools:contentDescription="许愿池" /> + tools:contentDescription="魔法帽" /> + tools:contentDescription="魔法帽" /> diff --git a/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java b/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java index d0af71cb9..4023dd193 100644 --- a/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java +++ b/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java @@ -47,7 +47,7 @@ public class InitInfo implements Serializable { */ private int openBoxSwitchLevelNo; /** - * 梦幻许愿池开关 + * 梦幻魔法帽开关 */ private boolean diamondBoxSwitch; /** @@ -55,7 +55,7 @@ public class InitInfo implements Serializable { */ private int defaultHomeTab; /** - * 许愿池图标 + * 魔法帽图标 */ private String openBoxIcon; /** @@ -291,7 +291,7 @@ public class InitInfo implements Serializable { } /** - * 梦幻许愿池开关 + * 梦幻魔法帽开关 */ @SuppressWarnings("all") public boolean isDiamondBoxSwitch() { @@ -307,7 +307,7 @@ public class InitInfo implements Serializable { } /** - * 许愿池图标 + * 魔法帽图标 */ @SuppressWarnings("all") public String getOpenBoxIcon() { @@ -574,7 +574,7 @@ public class InitInfo implements Serializable { } /** - * 梦幻许愿池开关 + * 梦幻魔法帽开关 */ @SuppressWarnings("all") public void setDiamondBoxSwitch(final boolean diamondBoxSwitch) { @@ -590,7 +590,7 @@ public class InitInfo implements Serializable { } /** - * 许愿池图标 + * 魔法帽图标 */ @SuppressWarnings("all") public void setOpenBoxIcon(final String openBoxIcon) { diff --git a/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java b/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java index 1b17ab556..da61ace12 100644 --- a/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java +++ b/core/src/main/java/com/nnbc123/core/room/bean/BoxSwitchVo.java @@ -8,11 +8,11 @@ import java.io.Serializable; public class BoxSwitchVo implements Parcelable, Serializable { /**宝箱开关*/ private boolean openBoxSwitch; - /**梦幻许愿池开关*/ + /**梦幻魔法帽开关*/ private boolean diamondBoxSwitch; - /**许愿池图标*/ + /**魔法帽图标*/ private String openBoxIcon; - /**梦幻许愿池开启时间*/ + /**梦幻魔法帽开启时间*/ private String diamondBoxOpenTime; public boolean isOpenBoxSwitch() {