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

房间主体ui修改完成

Browse Source
This commit is contained in:
wushaocheng
2022-10-13 17:56:30 +08:00
parent 9e301ac08d
commit a65b450026
43 changed files with 224 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
View File

@@ -11,6 +11,7 @@ import android.graphics.drawable.BitmapDrawable;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
@@ -338,8 +339,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
onMicroItemClickListener.onLockBtnClick(position);
} else if (v.getId() == R.id.avatar) {
onMicroItemClickListener.onAvatarBtnClick(position);
} else if (v.getId() == R.id.tv_room_desc || v.getId() == R.id.tv_room_type
|| v.getId() == R.id.iv_room_can_edit) {
} else if (v.getId() == R.id.tv_room_desc || v.getId() == R.id.fr_title) {
onMicroItemClickListener.onRoomSettingsClick();
}
}
@@ -525,9 +525,8 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
/**
* 主席位特有
*/
TextView tvRoomType;
FrameLayout frTitle;
TextView tvRoomDesc;
View ivRoomCanEdit;
ImageView ivTag;
TextView tvLabelLeaveMode;
CircleImageView ivLeaveMode;
@@ -535,16 +534,13 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
BossMicroViewHolder(View itemView) {
super(itemView);
tvRoomType = itemView.findViewById(R.id.tv_room_type);
frTitle = itemView.findViewById(R.id.fr_title);
tvRoomDesc = itemView.findViewById(R.id.tv_room_desc);
ivRoomCanEdit = itemView.findViewById(R.id.iv_room_can_edit);
ivTag = itemView.findViewById(R.id.iv_tag);
tvLabelLeaveMode = itemView.findViewById(R.id.tv_label_leave_mode);
ivLeaveMode = itemView.findViewById(R.id.iv_bg_leave_mode);
frTitle.setOnClickListener(this);
tvRoomDesc.setOnClickListener(this);
tvRoomType.setOnClickListener(this);
ivRoomCanEdit.setOnClickListener(this);
}
@Override
@@ -583,11 +579,6 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
}
tvNick.setBackgroundColor(context.getResources().getColor(R.color.transparent));
if (AvRoomDataManager.get().isManager()) {
ivRoomCanEdit.setVisibility(View.VISIBLE);
} else {
ivRoomCanEdit.setVisibility(View.GONE);
}
}
@Override
@@ -628,14 +619,12 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
tvRoomDesc.setText(BasicConfig.INSTANCE.getAppContext().getString(R.string.room_no_desc));
}
}
tvRoomType.setText(roomInfo.getRoomTag());
}
@Override
public void clear() {
super.clear();
tvRoomDesc.setText(BasicConfig.INSTANCE.getAppContext().getString(R.string.room_no_desc));
tvRoomType.setText("聊天");
ivTag.setVisibility(View.GONE);
}

1
app/src/main/java/com/yizhuan/erban/avroom/adapter/MicQueueAdapter.java
View File

@@ -4,7 +4,6 @@ import android.graphics.drawable.GradientDrawable;
import androidx.appcompat.widget.AppCompatImageView;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;

1
app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java
View File

@@ -14,7 +14,6 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.widget.dialog.BaseDialog;

18
app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
View File

@@ -1126,15 +1126,15 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
}
override fun updateRoomRanks(data: List<RoomContributeUserInfo>) {
val avatarList = arrayListOf<ImageView?>(
mView.findViewById(R.id.iv_rank_0),
mView.findViewById(R.id.iv_rank_1),
mView.findViewById(R.id.iv_rank_2)
)
for (i in 0 until avatarList.size) {
avatarList[i]?.loadAvatar(data.getOrNull(i)?.avatar)
}
// val avatarList = arrayListOf<ImageView?>(
// mView.findViewById(R.id.iv_rank_0),
// mView.findViewById(R.id.iv_rank_1),
// mView.findViewById(R.id.iv_rank_2)
// )
//
// for (i in 0 until avatarList.size) {
// avatarList[i]?.loadAvatar(data.getOrNull(i)?.avatar)
// }
}
private fun onSendGiftBtnClick(giftId: Int = 0) {

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

@@ -87,7 +87,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
private TextView roomTitle;
private TextView roomId;
private ImageView ivFollowRoom;
private TextView ivFollowRoom;
private AppCompatImageView mIvGoodNumber;
private ImageView roomMore;
@@ -424,7 +424,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
ivFollowRoom.setVisibility(AvRoomDataManager.get().isRoomOwner() ? View.GONE : View.VISIBLE);
FOLLOW_ROOM_TYPE = AvRoomDataManager.get().isRoomFans ? "2" : "1";
ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
// ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
setIdOnlineData();
if (isShowChangeGame()) {
@@ -521,7 +521,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
.subscribe(s -> {
AvRoomDataManager.get().isRoomFans = !AvRoomDataManager.get().isRoomFans;
FOLLOW_ROOM_TYPE = AvRoomDataManager.get().isRoomFans ? "2" : "1";
ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
// ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
if (AvRoomDataManager.get().isRoomFans) {
SingleToastUtil.showToast("收藏成功!");
PraiseModel.get().setFollowRoomSuccessRoomTip(currentRoomInfo.getUid());
@@ -533,7 +533,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
@Subscribe(threadMode = ThreadMode.MAIN)
public void onFollowRoomEvent(FollowRoomEvent event) {
ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
// ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
}
@Subscribe(threadMode = ThreadMode.MAIN)

1
app/src/main/java/com/yizhuan/erban/avroom/helper/AnimHelper.java
View File

@@ -14,7 +14,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import androidx.annotation.Nullable;

1
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKRankListView.kt
View File

@@ -4,7 +4,6 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.FrameLayout
import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import com.yizhuan.erban.R

2
app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
View File

@@ -17,8 +17,6 @@ import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import java.util.List;
/**
* <p> 首页热门adapter </p>
*

2
app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt
View File

@@ -1,7 +1,6 @@
package com.yizhuan.erban.home.adapter
import android.widget.ImageView
import androidx.core.view.isGone
import androidx.core.view.isVisible
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
@@ -9,7 +8,6 @@ import com.opensource.svgaplayer.SVGAImageView
import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.activity.AVRoomActivity
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.erban.ui.utils.loadFromAssets
import com.yizhuan.xchat_android_core.statistic.StatisticManager

16
app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtils.java
View File

@@ -2,10 +2,6 @@ package com.yizhuan.erban.ui.utils;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.NinePatch;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import androidx.annotation.DrawableRes;
@@ -14,7 +10,6 @@ import androidx.annotation.Nullable;
import android.graphics.drawable.NinePatchDrawable;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
@@ -27,31 +22,20 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.target.CustomViewTarget;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.bumptech.glide.request.target.ViewTarget;
import com.bumptech.glide.request.transition.Transition;
import com.netease.nim.uikit.common.util.string.StringUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.tencent.qgame.animplayer.AnimConfig;
import com.tencent.qgame.animplayer.AnimView;
import com.tencent.qgame.animplayer.inter.IAnimListener;
import com.tencent.qgame.animplayer.util.ScaleType;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.utils.BlurTransformation;
import com.yizhuan.xchat_android_core.utils.LogUtils;
import com.yizhuan.xchat_android_core.utils.SystemUtils;
import com.yizhuan.xchat_android_library.utils.codec.MD5Utils;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
import io.reactivex.Single;

1
app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtilsV2.java
View File

@@ -12,7 +12,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nim.uikit.support.glide.GlideRequest;
import com.netease.nim.uikit.support.glide.GlideRequests;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;

2
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

@@ -4,8 +4,6 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
import android.graphics.LinearGradient;
import android.graphics.Shader;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;

BIN
app/src/main/res/drawable-xhdpi/bg_room_normal_default_pic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 158 KiB

BIN
app/src/main/res/drawable-xhdpi/bg_room_normal_default_pic.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 91 KiB

BIN
app/src/main/res/drawable-xhdpi/default_avatar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/drawable-xhdpi/default_avatar.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
app/src/main/res/drawable-xhdpi/default_banner.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
app/src/main/res/drawable-xhdpi/default_banner.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
app/src/main/res/drawable-xhdpi/default_cover.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_share_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_share_white.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_sing_room_contribute_list.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 975 B

BIN
app/src/main/res/drawable-xhdpi/ic_single_room_rank.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_single_room_rank.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_more.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_room_more.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

6
app/src/main/res/drawable/bg_micro_title.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_10" />
<solid android:color="@color/color_141B3B" />
</shape>

14
app/src/main/res/drawable/bg_room_collect_button.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="180"
android:endColor="#0D183F"
android:startColor="#32687A"
android:type="linear"
android:useLevel="true" />
<corners android:radius="@dimen/dp_12" />
</shape>

11
app/src/main/res/drawable/bg_single_room_rank_entrance.xml
View File

@@ -2,12 +2,17 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white_transparent_20" />
<gradient
android:angle="180"
android:endColor="#663CC8ED"
android:startColor="#0FFFFFFF"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="100dp"
android:bottomLeftRadius="10dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="100dp"
android:topLeftRadius="10dp"
android:topRightRadius="0dp" />
</shape>

13
app/src/main/res/layout/activity_login.xml
View File

@@ -84,26 +84,27 @@
android:layout_height="63dp"
android:layout_marginTop="25dp"
android:background="@drawable/shape_login_btn_bg"
android:drawableStart="@drawable/ic_login_google"
android:drawablePadding="35dp"
android:gravity="center_vertical"
android:paddingStart="25dp"
android:paddingEnd="0dp"
android:text="@string/login_google"
android:textColor="@color/text_title_color"
android:textSize="16sp" />
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_login_google" />
<TextView
android:id="@+id/tv_others"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:drawableEnd="@drawable/ic_login_arrow_right"
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/login_select_other_login_type"
android:textColor="@color/text_title_color"
android:layout_marginBottom="50dp"
android:textSize="12sp" />
android:textSize="12sp"
app:drawableEndCompat="@drawable/ic_login_arrow_right" />
<TextView
android:id="@+id/tv_protocol_hint"
@@ -111,11 +112,11 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:background="@drawable/bg_login_protocol_hint"
android:gravity="center_horizontal|bottom"
android:gravity="center"
android:paddingBottom="6dp"
android:text="@string/login_agree_with_the_protocol"
android:textColor="@color/white"
android:textSize="10dp"
android:textSize="@dimen/sp_10"
android:visibility="gone"
/>

2
app/src/main/res/layout/activity_user_info.xml
View File

@@ -304,7 +304,7 @@
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:textColor="@color/white"
android:textSize="10dp"
android:textSize="@dimen/sp_10"
tools:text="金牛座" />
<View

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

@@ -140,6 +140,21 @@
</LinearLayout>
<TextView
android:id="@+id/iv_follow_room"
android:text="@string/room_collect"
android:textSize="@dimen/sp_12"
android:textColor="@color/white"
android:background="@drawable/bg_room_collect_button"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:includeFontPadding="false"
android:layout_marginTop="@dimen/dp_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
@@ -195,14 +210,6 @@
</LinearLayout>
<ImageView
android:id="@+id/iv_follow_room"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="2dp"
android:scaleType="center"
android:src="@drawable/icon_room_like" />
<ImageView
android:id="@+id/iv_room_share"
android:layout_width="30dp"

65
app/src/main/res/layout/item_boss_micro.xml
View File

@@ -11,9 +11,9 @@
<FrameLayout
android:id="@+id/micro_layout"
android:layout_marginStart="@dimen/dp_10"
android:layout_width="@dimen/dp_room_boss_mic_header_wear_radius"
android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius"
android:layout_centerHorizontal="true">
android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius">
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_halo"
@@ -129,8 +129,8 @@
android:id="@+id/ll_nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_below="@+id/micro_layout"
android:layout_centerHorizontal="true"
android:gravity="center_vertical">
<ImageView
@@ -186,55 +186,25 @@
</LinearLayout>
<LinearLayout
android:id="@+id/desc_layout"
<FrameLayout
android:id="@+id/fr_title"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="80dp"
android:layout_marginStart="@dimen/dp_25"
android:background="@drawable/bg_micro_title"
android:layout_toEndOf="@+id/micro_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_nick"
android:layout_marginTop="7dp"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_room_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_room_tag"
android:gravity="center"
android:paddingStart="6dp"
android:paddingTop="2dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"
android:textColor="@color/appColor"
android:textSize="@dimen/sp_9"
android:visibility="gone"
tools:text="交友" />
android:layout_height="76dp">
<TextView
android:id="@+id/tv_room_desc"
android:textColor="@color/color_75FBE2"
android:textSize="@dimen/sp_10"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginBottom="1px"
android:ellipsize="end"
android:gravity="center"
android:maxLength="15"
android:maxLines="1"
android:text="@string/room_manager_edit_desc"
android:textColor="#7FFFFFFF"
android:textSize="@dimen/sp_11"
tools:text="请点击设置编辑房间话题设置编辑房间话题设置编辑房间话题设置编辑房间话题" />
<ImageView
android:id="@+id/iv_room_can_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="4.5dp"
android:src="@drawable/icon_room_desc_edit" />
</LinearLayout>
android:layout_height="wrap_content"/>
</FrameLayout>
<ImageView
android:id="@+id/iv_red_package"
@@ -244,7 +214,6 @@
android:layout_marginStart="15dp"
android:scaleType="centerInside"
android:src="@drawable/room_red_package_in"
android:visibility="gone"
tools:visibility="visible" />
android:visibility="gone" />
</RelativeLayout>

3
app/src/main/res/values/colors.xml
View File

@@ -617,5 +617,8 @@
<color name="color_CC66FF">#CC66FF</color>
<color name="color_9168FA">#9168FA</color>
<color name="color_0D344D">#0D344D</color>
<color name="color_75FBE2">#75FBE2</color>
<color name="color_A8041D">#A8041D</color>
<color name="color_141B3B">#141B3B</color>
</resources>

156
app/src/main/res/values/strings.xml
View File

@@ -7,9 +7,9 @@
<string name="click_screen_reload">點擊刷新</string>
<string name="loading">加載中&#8230;</string>
<string name="click_or_pull_refresh">點擊或者下拉嘗試刷新</string>
<string name="sure">确定</string>
<string name="sure">確定</string>
<string name="cancel">取消</string>
<string name="network_is_abnormal">网络异常，请重试</string>
<string name="network_is_abnormal">網絡異常，請重試</string>
<string name="gift_action">禮物</string>
@@ -892,7 +892,7 @@
<string name="ranking">榜單</string>
<string name="str_send_code_success">驗證碼已發送至</string>
<string name="str_nick_title">昵稱：</string>
<string name="recommend_topic">热门话题</string>
<string name="recommend_topic">熱門話題</string>
<string name="join_topic">參與話題</string>
<string name="collect">收藏</string>
<string name="diamond">鉆石</string>
@@ -970,83 +970,91 @@
<string name="login_is_logining">正在登錄…</string>
<!--vip-->
<string name="vip_center">贵族中心</string>
<string name="vip_center">貴族中心</string>
<!--个人中心-->
<string name="me_Individual_center_banner_click">个人中心banner模块点击</string>
<string name="me_personal_center_quick_access_room">个人中心快捷进房点击成功匹配</string>
<string name="me_personal_center_fast_into">个人中心快捷进房点击成功匹配</string>
<string name="me_short">还差</string>
<string name="me_power_value_escalation">权力值升级</string>
<string name="me_noble_my_entry_click_event">贵族我的入口点击事件</string>
<string name="me_Individual_center_noble_card_card_click">个人中心贵族卡片片点击</string>
<string name="me_personal_center_recharge_card_click">个人中心充值卡片点击</string>
<string name="me_click_my_center">个人中心功能板块点击</string>
<!--個人中心-->
<string name="me_Individual_center_banner_click">個人中心banner模塊點擊</string>
<string name="me_personal_center_quick_access_room">個人中心快捷進房點擊成功匹配</string>
<string name="me_personal_center_fast_into">個人中心快捷進房點擊成功匹配</string>
<string name="me_short">還差</string>
<string name="me_power_value_escalation">權力值升級</string>
<string name="me_noble_my_entry_click_event">貴族我的入口點擊事件</string>
<string name="me_Individual_center_noble_card_card_click">個人中心貴族卡片片點擊</string>
<string name="me_personal_center_recharge_card_click">個人中心充值卡片點擊</string>
<string name="me_click_my_center">個人中心功能板塊點擊</string>
<string name="me_in_live">直播中</string>
<string name="me_data">资料</string>
<string name="me_dynamic">动态</string>
<string name="me_gift_wall">礼物墙</string>
<string name="me_report">举报</string>
<string name="me_report_the_dynamic">举报动态-区分-动态广场</string>
<string name="me_delete">删除</string>
<string name="me_data">資料</string>
<string name="me_dynamic">動態</string>
<string name="me_gift_wall">禮物墻</string>
<string name="me_report">舉報</string>
<string name="me_report_the_dynamic">舉報動態-區分-動態廣場</string>
<string name="me_delete">刪除</string>
<string name="me_cancel">取消</string>
<string name="me_share_dynamic">分享动态-区分-动态广场</string>
<string name="me_delete_the_dynamic">删除动态-区分-动态广场</string>
<string name="me_cannot_be_restored">删除后不可恢复，确定删除该动态吗?</string>
<string name="me_successfully_delete">删除成功</string>
<string name="me_call_the_like_interface_to_complete">调用点赞接口完成…</string>
<string name="me_click_the_list_comment_button">点击列表评论按钮-区分-话题客态页</string>
<string name="me_number_of_times">点击评论按钮进入详情页的次数，区分话题-</string>
<string name="me_main_state">主态</string>
<string name="me_guest_state">客态</string>
<string name="me_personal_home_page_dynamic_tab">个人主页动态tab-</string>
<string name="me_personal_homepage_Information">个人主页资料tab-</string>
<string name="me_personal_home_gifts_tab">个人主页礼物tab-</string>
<string name="me_user_information_is_empty">用户信息为空。</string>
<string name="me_unfollow_is_no_longer_a_friend">取消关注将不再是好友关系，确定取消关注？</string>
<string name="me_decide_to_unfollow">确定取消关注？</string>
<string name="me_guest_page_focus">客态页-关注</string>
<string name="me_error_playing">播放出错，请重试</string>
<string name="me_roomid">房间ID:</string>
<string name="me_room_number_people">房间人数:</string>
<string name="me_peko_number">Peko号:</string>
<string name="me_association">公会</string>
<string name="me_association_id">公会ID:</string>
<string name="me_association_number">公会人数:</string>
<string name="me_room_number">房间数量:</string>
<string name="me_association_room">公会·房间</string>
<string name="me_room">房间</string>
<string name="me_ordinary_gift">普通礼物</string>
<string name="me_lucky_gift">幸运礼物</string>
<string name="me_no_skill_card_added_yet">还未添加技能卡喔</string>
<string name="me_share_dynamic">分享動態-區分-動態廣場</string>
<string name="me_delete_the_dynamic">刪除動態-區分-動態廣場</string>
<string name="me_cannot_be_restored">刪除後不可恢復，確定刪除該動態嗎?</string>
<string name="me_successfully_delete">刪除成功</string>
<string name="me_call_the_like_interface_to_complete">調用點贊接口完成…</string>
<string name="me_click_the_list_comment_button">點擊列表評論按鈕-區分-話題客態頁</string>
<string name="me_number_of_times">點擊評論按鈕進入詳情頁的次數，區分話題-</string>
<string name="me_main_state">主態</string>
<string name="me_guest_state">客態</string>
<string name="me_personal_home_page_dynamic_tab">個人主頁動態tab-</string>
<string name="me_personal_homepage_Information">個人主頁資料tab-</string>
<string name="me_personal_home_gifts_tab">個人主頁禮物tab-</string>
<string name="me_user_information_is_empty">用戶信息為空。</string>
<string name="me_unfollow_is_no_longer_a_friend">取消關註將不再是好友關系，確定取消關註？</string>
<string name="me_decide_to_unfollow">確定取消關註？</string>
<string name="me_guest_page_focus">客態頁-關註</string>
<string name="me_error_playing">播放出錯，請重試</string>
<string name="me_roomid">房間ID:</string>
<string name="me_room_number_people">房間人數:</string>
<string name="me_peko_number">Peko號:</string>
<string name="me_association">公會</string>
<string name="me_association_id">公會ID:</string>
<string name="me_association_number">公會人數:</string>
<string name="me_room_number">房間數量:</string>
<string name="me_association_room">公會·房間</string>
<string name="me_room">房間</string>
<string name="me_ordinary_gift">普通禮物</string>
<string name="me_lucky_gift">幸運禮物</string>
<string name="me_no_skill_card_added_yet">還未添加技能卡喔</string>
<string name="me_skill_card">技能卡</string>
<string name="me_not_joining_the_room">没有加入房间</string>
<string name="me_apply_to_join">申请加入</string>
<string name="room_down_to_the_bottom">已经到底啦~自动为您返回当前房间</string>
<string name="room_say_something">说点什么…</string>
<string name="room_leave">离开</string>
<string name="me_not_joining_the_room">沒有加入房間</string>
<string name="me_apply_to_join">申請加入</string>
<string name="room_down_to_the_bottom">已經到底啦~自動為您返回當前房間</string>
<string name="room_say_something">說點什麽…</string>
<string name="room_leave">離開</string>
<string name="share_line">Line</string>
<string name="share_facebook">Facebook</string>
<string name="me_open_nobleman_click_event">开通贵族点击事件</string>
<string name="me_immediately_become_a_Peko_nobleman">立刻成为Peko贵族</string>
<string name="me_opening_of_the_aristocracy_successful">恭喜开通贵族成功!</string>
<string name="me_failed_to_get_aristocrat_data">获取贵族数据失败,请重试</string>
<string name="me_no_aristocracy_yet">尚未开通贵族</string>
<string name="me_no_search_results">没有搜索结果</string>
<string name="me_current_power_value">当前权力值:</string>
<string name="me_current">当前</string>
<string name="me_grading">保级</string>
<string name="me_upgrade">升级</string>
<string name="user_is_kicked">用户被踢</string>
<string name="enjoy_the_popup_exposure">新人专享礼物弹窗曝光</string>
<string name="you_have_been_kicked_offline">您已被踢下线，若非正常行为，请及时修改密码</string>
<string name="clicked_the_splash_screen">点击了闪屏</string>
<string name="room_information_is_empty">-房间信息为空-</string>
<string name="room_minimization_close_button">房间最小化关闭按钮</string>
<string name="me_open_nobleman_click_event">開通貴族點擊事件</string>
<string name="me_immediately_become_a_Peko_nobleman">立刻成為Peko貴族</string>
<string name="me_opening_of_the_aristocracy_successful">恭喜開通貴族成功!</string>
<string name="me_failed_to_get_aristocrat_data">獲取貴族數據失敗,請重試</string>
<string name="me_no_aristocracy_yet">尚未開通貴族</string>
<string name="me_no_search_results">沒有搜索結果</string>
<string name="me_current_power_value">當前權力值:</string>
<string name="me_current">當前</string>
<string name="me_grading">保級</string>
<string name="me_upgrade">升級</string>
<string name="user_is_kicked">用戶被踢</string>
<string name="enjoy_the_popup_exposure">新人專享禮物彈窗曝光</string>
<string name="you_have_been_kicked_offline">您已被踢下線，若非正常行為，請及時修改密碼</string>
<string name="clicked_the_splash_screen">點擊了閃屏</string>
<string name="room_information_is_empty">-房間信息為空-</string>
<string name="room_minimization_close_button">房間最小化關閉按鈕</string>
<string name="room_in_live">直播中</string>
<string name="no_dynamic">暂无动态~</string>
<string name="recommend_to_have_a_look">暂无动态，去推荐看看吧~</string>
<string name="square_dynamic_page">广场动态页_推荐_点击话题</string>
<string name="topic_page_is_displayed">进入话题客态页:动态广场</string>
<string name="no_dynamic">暫無動態~</string>
<string name="recommend_to_have_a_look">暫無動態，去推薦看看吧~</string>
<string name="square_dynamic_page">廣場動態頁_推薦_點擊話題</string>
<string name="topic_page_is_displayed">進入話題客態頁:動態廣場</string>
<string name="room_contribute_list">房间榜</string>
<string name="room_list_hour">小时榜</string>
<string name="room_guest_to_communicate">嘉宾交流</string>
<string name="room_move_the_candidates">心动选人</string>
<string name="room_say_here">在此输入你要说的话!</string>
<string name="room_next_pk_starts">距离下一场PK开始</string>
<string name="room_play_music">播放音乐</string>
<string name="room_collect">收藏</string>
</resources>

1
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java
View File

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import androidx.annotation.Nullable;

4
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
View File

@@ -5,7 +5,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.TextUtils;
import android.view.View;
import androidx.annotation.Nullable;
@@ -24,14 +23,11 @@ import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter;
import com.yizhuan.erban.module_hall.hall.presenter.ModuleHallPresenter;
import com.yizhuan.erban.module_hall.hall.view.IModuleHallView;
import com.yizhuan.erban.module_hall.hall.view.dialog.HallMenuDialog;
import com.yizhuan.erban.module_hall.income.presenter.IncomeStatisticsPresenter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType;

1
app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java
View File

@@ -9,7 +9,6 @@ import androidx.annotation.NonNull;
import com.google.android.material.appbar.AppBarLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.core.content.ContextCompat;
import androidx.viewpager.widget.ViewPager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

104
app/src/module_mini_world/res/layout/fragment_av_room_game.xml
View File

@@ -33,57 +33,11 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp" />
<LinearLayout
android:id="@+id/contribute_list"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignTop="@id/micro_view"
android:background="@drawable/bg_contribute_entrance"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_rank_0"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_1"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/default_avatar" />
<ImageView
android:id="@+id/iv_rank_2"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/default_avatar" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="房间榜"
android:textColor="@color/white"
android:textSize="12dp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="5dp"
android:scaleType="center"
android:src="@drawable/arrow_right_white" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_room_pk_order"
android:layout_width="130dp"
android:layout_height="34dp"
android:layout_below="@id/contribute_list"
android:layout_marginTop="5dp"
android:layout_alignTop="@id/micro_view"
android:background="@drawable/bg_room_pk_order"
android:orientation="vertical"
android:visibility="gone">
@@ -94,7 +48,7 @@
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:includeFontPadding="false"
android:text="距离下一场PK开始"
android:text="@string/room_next_pk_starts"
android:textColor="@color/white"
android:textSize="10sp" />
@@ -111,23 +65,42 @@
</LinearLayout>
<TextView
android:id="@+id/tv_hour_rank"
android:layout_width="76dp"
android:layout_height="24dp"
android:layout_alignTop="@id/contribute_list"
android:id="@+id/contribute_list"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_alignTop="@id/micro_view"
android:layout_alignParentEnd="true"
android:background="@drawable/bg_single_room_rank_entrance"
android:drawableStart="@drawable/ic_single_room_rank"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:drawablePadding="@dimen/dp_2"
android:gravity="center"
android:onClick="@{click}"
android:paddingStart="1dp"
android:text="小时榜"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_22"
android:layout_marginBottom="@dimen/dp_8"
android:text="@string/room_contribute_list"
android:textColor="@color/white"
android:textSize="12dp"
android:visibility="visible" />
android:textSize="@dimen/sp_10"
android:visibility="visible"
app:drawableStartCompat="@drawable/ic_sing_room_contribute_list" />
<TextView
android:id="@+id/tv_hour_rank"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_below="@+id/contribute_list"
android:layout_alignParentEnd="true"
android:background="@drawable/bg_single_room_rank_entrance"
android:drawablePadding="@dimen/dp_2"
android:gravity="center"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_4"
android:text="@string/room_list_hour"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
android:visibility="visible"
app:drawableStartCompat="@drawable/ic_single_room_rank" />
<LinearLayout
android:id="@+id/ll_dating_step"
@@ -152,7 +125,7 @@
android:layout_marginTop="8dp"
android:background="@drawable/bg_dating_step"
android:gravity="center"
android:text="嘉宾交流"
android:text="@string/room_guest_to_communicate"
android:textColor="#ffffe1e8"
android:textSize="13sp" />
</LinearLayout>
@@ -213,7 +186,7 @@
android:includeFontPadding="false"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:text="心动选人"
android:text="@string/room_move_the_candidates"
android:textColor="@color/white"
android:textSize="@dimen/sp_13"
android:visibility="gone"
@@ -394,8 +367,9 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@android:color/white"
android:hint="在此输入你要说的话!"
android:paddingLeft="10dp"
android:hint="@string/room_say_here"
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textColor="#888889"
@@ -406,7 +380,7 @@
android:id="@+id/input_send"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:background="@drawable/click_white_gray_selector"
android:scaleType="center"
android:src="@android:drawable/ic_menu_send" />

3
app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java
View File

@@ -13,6 +13,7 @@ import android.view.animation.AnimationUtils;
import android.view.animation.LinearInterpolator;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.SeekBar;
import android.widget.TextView;
@@ -46,7 +47,7 @@ import java.util.List;
*/
public class MusicPlayerView extends FrameLayout implements View.OnClickListener, SeekBar.OnSeekBarChangeListener {
private FrameLayout musicFlagLayout;
private LinearLayout musicFlagLayout;
private RelativeLayout musicBoxLayout;
private ImageView musicFlag;
private ImageView musicListMore;

BIN
app/src/module_music/res/drawable-xhdpi/icon_music_flag.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/module_music/res/drawable-xhdpi/icon_music_flag.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

26
app/src/module_music/res/layout/layout_music_player_view.xml
View File

@@ -4,35 +4,33 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
<LinearLayout
android:id="@+id/music_flag_layout"
android:layout_width="76dp"
android:layout_height="24dp"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_gravity="end"
android:background="@drawable/bg_room_music_player"
android:gravity="center"
android:background="@drawable/bg_single_room_rank_entrance"
tools:visibility="visible">
<ImageView
android:id="@+id/music_flag"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="1dp"
android:layout_gravity="start|center_vertical"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="2dp"
android:src="@drawable/icon_music_flag" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="25dp"
android:lines="1"
android:text="播放音乐"
android:layout_marginEnd="@dimen/dp_4"
android:text="@string/room_play_music"
android:textColor="@color/white"
android:textSize="12dp" />
android:textSize="@dimen/sp_10" />
</FrameLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/layout_music_bg_click"