1.房间相关UI修改

2.分享房间更改
This commit is contained in:
huangjian
2020-04-28 19:07:40 +08:00
parent 542905101a
commit 4dc57789f0
65 changed files with 275 additions and 261 deletions

View File

@@ -214,7 +214,7 @@ dependencies {
api "com.jzxiang.pickerview:TimePickerDialog:1.0.1"
api "com.github.zyyoona7:EasyPopup:1.0.2"
api "com.github.donkingliang:LabelsView:1.2.0"
api "com.github.yyued:SVGAPlayer-Android:2.4.2"
api "com.github.yyued:SVGAPlayer-Android:2.5.3"
api "com.mcxiaoke.packer-ng:helper:2.0.0"
implementation "com.orhanobut:logger:2.2.0"
api "com.ms-square:expandableTextView:0.1.4"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -162,9 +162,9 @@ public class ButtonItemFactory {
// 私聊
buttonItems.add(createPrivateChatItem(context, account, isInRoom));
//装扮
if (!SuperAdminUtil.isSuperAdmin()) {
/* if (!SuperAdminUtil.isSuperAdmin()) {
buttonItems.add(createSendDecorationItem(context, uid));
}
}*/
//关注
buttonItems.add(createAttentItem());
@@ -225,7 +225,7 @@ public class ButtonItemFactory {
// 私聊
buttonItems.add(createPrivateChatItem(context, account, isInRoom));
//装扮和关注目前是都有的操作
buttonItems.add(createSendDecorationItem(context, uid));
//buttonItems.add(createSendDecorationItem(context, uid));
buttonItems.add(createAttentItem());
buttonItems.add(createFindMeItem());
if (PublicChatHallDataManager.get().isRoomAdmin()) {
@@ -536,7 +536,7 @@ public class ButtonItemFactory {
*/
public static ViewItem createSendGiftItem(final Context context, long otherUid, boolean isInRoom,
final GiftDialog.OnGiftDialogBtnClickListener giftDialogBtnClickListener) {
return createSendGiftItem(context, otherUid, isInRoom, false, giftDialogBtnClickListener);
return createSendGiftItem(context, otherUid, isInRoom, true, giftDialogBtnClickListener);
}
/**
@@ -647,7 +647,7 @@ public class ButtonItemFactory {
// 私聊
buttonItems.add(createPrivateChatItem(context, account, isInRoom));
//装扮和关注目前是都有的操作
buttonItems.add(createSendDecorationItem(context, uid));
// buttonItems.add(createSendDecorationItem(context, uid));
buttonItems.add(createAttentItem());
buttonItems.add(createFindMeItem());
return buttonItems;

View File

@@ -1,11 +1,14 @@
package com.yizhuan.erban.avroom.adapter;
import androidx.lifecycle.Observer;
import android.content.Context;
import android.graphics.drawable.BitmapDrawable;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -24,8 +27,10 @@ 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.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
@@ -169,6 +174,12 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
return;
}
tvCharmValue.setText(GiftValueFormat.longToString(longValue));
llCharmClick.setOnClickListener(v -> {
if (info.mChatRoomMember != null) {
CommonWebViewActivity.start(context,
UriProvider.getPersonalCharismaRank() + "?uid=" + info.mChatRoomMember.getAccount());
}
});
llCharmClick.setOnLongClickListener(v -> {
if (longValue < 100 * 10000L) {
//小于100万不需要长按弹框
@@ -378,6 +389,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
class BasicMicroViewHolder extends NormalMicroViewHolder {
TextView tvPkMark;
BasicMicroViewHolder(View itemView) {
super(itemView);
tvPkMark = (TextView) itemView.findViewById(R.id.tv_pk_mark);
@@ -430,7 +442,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
void bind(RoomQueueInfo info, int position) {
super.bind(info, position);
ChatRoomMember chatRoomMember = info.mChatRoomMember;
if (rotateAnimation==null){
if (rotateAnimation == null) {
rotateAnimation = new RotateAnimation(0, 359, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
rotateAnimation.setDuration(3000);
rotateAnimation.setFillAfter(true);
@@ -476,7 +488,7 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
@Override
public void clear() {
super.clear();
if (rotateAnimation!=null) rotateAnimation.cancel();
if (rotateAnimation != null) rotateAnimation.cancel();
}
}

View File

@@ -2,9 +2,11 @@ package com.yizhuan.erban.avroom.adapter;
import android.content.Context;
import android.graphics.Color;
import androidx.core.content.ContextCompat;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -114,22 +116,13 @@ public class OnlineUserAdapter extends BaseMultiItemQuickAdapter<OnlineChatMembe
private void setNormalData(BaseViewHolder baseViewHolder, OnlineChatMember onlineChatMember) {
setSexData(baseViewHolder, onlineChatMember);
ImageView roomOwnnerTag = baseViewHolder.getView(R.id.room_owner_logo);
ImageView roomOnlineTag = baseViewHolder.getView(R.id.room_online_tag);
ImageView managerLogo = baseViewHolder.getView(R.id.manager_logo);
if (onlineChatMember.isOnMic) {
baseViewHolder.setVisible(R.id.manager_logo, onlineChatMember.isAdmin || onlineChatMember.isRoomOwer);
managerLogo.setVisibility(onlineChatMember.isAdmin || onlineChatMember.isRoomOwer ? View.VISIBLE : View.GONE);
managerLogo.setImageResource(onlineChatMember.isAdmin ? R.drawable.icon_admin_logo
: R.drawable.icon_user_list_room_ownner);
roomOwnnerTag.setImageResource(R.drawable.icon_user_list_up_mic);
roomOwnnerTag.setVisibility((!mIsHomeParty && onlineChatMember.isRoomOwer) ? View.GONE : View.VISIBLE);
} else {
baseViewHolder.getView(R.id.manager_logo).setVisibility(View.GONE);
roomOwnnerTag.setVisibility((onlineChatMember.isAdmin || onlineChatMember.isRoomOwer)
? View.VISIBLE : View.GONE);
roomOwnnerTag.setImageResource(onlineChatMember.isAdmin ? R.drawable.icon_admin_logo
: R.drawable.icon_user_list_room_ownner);
}
roomOnlineTag.setVisibility(onlineChatMember.isOnMic ? View.VISIBLE : View.GONE);
managerLogo.setVisibility((onlineChatMember.isAdmin || onlineChatMember.isRoomOwer)
? View.VISIBLE : View.GONE);
managerLogo.setImageResource(onlineChatMember.isAdmin ? R.drawable.icon_admin_logo
: R.drawable.icon_user_list_room_ownner);
Object isEnterHide = NobleUtil.getResource(NobleResourceType.KEY_ENTER_HIDE, onlineChatMember.chatRoomMember);

View File

@@ -76,11 +76,11 @@ public class RoomOperationDialog extends BottomSheetDialog {
Utils.dip2px(getContext(), 10),
Utils.dip2px(getContext(), 20),
true));
rvOPtList.setLayoutManager(new FullyGridLayoutManager(getContext(), 5));
rvOPtList.setLayoutManager(new FullyGridLayoutManager(getContext(), 4));
optAdapter = new OptAdapter(context, null);
addPKAction(optAdapter);
//addPKAction(optAdapter);
addKTVAction(optAdapter);
addGameAction(optAdapter);
//addGameAction(optAdapter);
addRoomLimit(optAdapter);
addGiftEffectAction(optAdapter);
addOpenOrClosePublicScreenAction(optAdapter);

View File

@@ -663,39 +663,6 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
@SuppressLint("CheckResult")
private void showMoreItems() {
List<ButtonItem> buttonItems = new ArrayList<>();
ButtonItem buttonItem0 = new ButtonItem("随机进入嗨聊房", () -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.room_hiparty, "房间内随机进入嗨聊房");
AvRoomModel.get()
.getPartyRoomList(AuthModel.get().getCurrentUid())
.subscribe((partyRoomResult, throuble) -> {
if (throuble != null) {
SingleToastUtil.showToastShort(throuble.getMessage());
} else if (partyRoomResult.getData() != null && partyRoomResult.isSuccess()) {
if (partyRoomResult.getData().size() > 0) {
// 普通房切嗨聊房清屏逻辑;
// cp房清屏逻辑在AVRoomActivity "切换房间后" 弹框监听, 防止用户取消切换房间,但公屏被清空的情况
if (!AvRoomDataManager.get().isCpRoom()) {
clearScreen();
ChatRoomMessage firstMsg = IMNetEaseManager.get().getFirstMessageContent();
addMessage(firstMsg);
}
AvRoomDataManager.get().setRoomUidList(partyRoomResult.getData());
AVRoomActivity.start(getActivity(), true);
} else {
SingleToastUtil.showToastShort("暂无嗨聊房");
}
} else if (partyRoomResult.getData() != null && !partyRoomResult.isSuccess()) {
SingleToastUtil.showToastShort(partyRoomResult.getError());
} else {
SingleToastUtil.showToastShort("未知错误");
}
});
// HomeModel.get().getGuildRoomId()
// .subscribe(s -> AVRoomActivity.start(getActivity(), JavaUtil.str2long(s)));
});
ButtonItem buttonItem1 = new ButtonItem("退出房间", new ButtonItem.OnClickListener() {
@Override
@@ -747,7 +714,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
UIHelper.showReportPage(mContext, roomInfo.getUid(), XChatConstants.REPORT_TYPE_ROOM);
}
});
buttonItems.add(buttonItem0);
//buttonItems.add(buttonItem0);
buttonItems.add(buttonItem1);
buttonItems.add(buttonItem2);
buttonItems.add(buttonItem3);
@@ -770,7 +737,9 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
ShareModel.get().shareRoom(
platform,
currentRoomInfo.getUid(),
currentRoomInfo.getTitle()
currentRoomInfo.getRoomId(),
currentRoomInfo.getTitle(),
currentRoomInfo.getAvatar()
)
.compose(bindUntilEvent(FragmentEvent.DESTROY))
.doAfterTerminate(new Action() {

View File

@@ -36,7 +36,7 @@ public class HomePartyUserListPresenter extends BaseMvpPresenter<IHomePartyUserL
* 填0会使用当前服务器最新时间开始查询即第一页单位毫秒
*/
public void requestChatMemberByPage(final int page, long time, List<OnlineChatMember> oldList) {
mHomePartyUserListMode.getOnLinePageMembers(page, time, oldList, true)
mHomePartyUserListMode.getOnLinePageMembers(page, time, oldList, false)
.subscribe(onlineChatMembers -> {
Logger.i("第%1d页成员人数:%2d", page, onlineChatMembers.size());
if (getMvpView() != null) {

View File

@@ -246,7 +246,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
GiftReceiveInfo giftReceiveInfo = giftReceiveInfos.get(i);
SparseArray<Point> micViewPoint = AvRoomDataManager.get().mMicPointMap;
GiftInfo giftInfo = GiftModel.get().findGiftInfoById(giftReceiveInfo.getGiftId());
if (giftInfo==null || TextUtils.isEmpty(giftInfo.getGiftUrl())){
if (giftInfo == null || TextUtils.isEmpty(giftInfo.getGiftUrl())) {
giftInfo = giftReceiveInfo.getGift();
}
if (giftInfo == null) {
@@ -285,18 +285,18 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
giftReceiver.setNick(giftReceiveInfo.getTargetNick());
targetUsers.add(giftReceiver);
}
if (totalCoin >= 520) {
GiftReceiveInfo giftReceiveInfo = giftReceiveInfos.get(0);
GiftInfo giftInfo = giftReceiveInfo.getGift();
if (totalCoin >= 520 || (giftInfo != null && giftInfo.isHasEffect())) {
Message msg = Message.obtain();
msg.what = 0;
GiftReceiveInfo giftReceiveInfo = giftReceiveInfos.get(0);
GiftEffectInfo giftEffectInfo = new GiftEffectInfo();
giftEffectInfo.setUid(giftReceiveInfo.getUid());
giftEffectInfo.setNick(giftReceiveInfo.getNick());
giftEffectInfo.setAvatar(giftReceiveInfo.getAvatar());
giftEffectInfo.setGiftId(giftReceiveInfo.getGiftId());
giftEffectInfo.setGiftNum(giftReceiveInfo.getGiftNum());
giftEffectInfo.setGift(giftReceiveInfo.getGift());
giftEffectInfo.setGift(giftInfo);
giftEffectInfo.setTargetUsers(targetUsers);
giftEffectInfo.setGiftReceiveType(giftReceiveType);
msg.obj = giftEffectInfo;
@@ -475,6 +475,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
/**
* 打怪兽时使用的动画效果
*
* @param monsterAttackReceiveInfo
* @param monsterView
*/
@@ -540,7 +541,7 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
}
private void drawMagicView(Point senderPoint, Point receivePoint, MagicReceivedInfo magicReceivedInfo) {
if (! AvRoomDataManager.get().mIsNeedGiftEffect) return;
if (!AvRoomDataManager.get().mIsNeedGiftEffect) return;
if (senderPoint == null)
senderPoint = new Point(mScreenWidth - giftWidth, mScreenHeight - UIUtil.dip2px(context, 50));

View File

@@ -196,7 +196,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
}
public GiftDialog(Context context, long OtherUid, boolean isInRoom, boolean isMagic) {
this(context, OtherUid, isInRoom, isMagic, false);
this(context, OtherUid, isInRoom, isMagic, true);
}
/***
@@ -391,7 +391,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
ivFirstRecharge = root.findViewById(R.id.iv_first_recharge);
ivFirstRecharge.setOnClickListener(this);
//首充逻辑
updateFirstRechargeStatus();
//updateFirstRechargeStatus();
View descLayout = root.findViewById(R.id.desc_layout);
@@ -1352,7 +1352,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
@Subscribe(threadMode = ThreadMode.MAIN)
public void onFirstRechargeEvent(FirstRechargeEvent event) {
updateFirstRechargeStatus();
//updateFirstRechargeStatus();
}
private void onGiftOutOfDate(String message) {

View File

@@ -3,10 +3,12 @@ package com.yizhuan.erban.ui.widget;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatDialog;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -121,6 +123,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
private AppCompatImageView ivNewUser;
private AppCompatImageView mIvGoodNumber;
private AppCompatImageView mIvUserLevel;
private AppCompatImageView mIvUserNameplate;
private AppCompatImageView mIvUserCharm;
private LinearLayout llFamily;
private TextView tvFamilyNameLabel;
@@ -193,6 +196,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
mIvGoodNumber = findViewById(R.id.iv_good_number);
mIvUserLevel = findViewById(R.id.iv_user_level);
mIvUserCharm = findViewById(R.id.iv_user_charm);
mIvUserNameplate = findViewById(R.id.iv_user_nameplate);
llFamily = (LinearLayout) findViewById(R.id.ll_family);
tvFamilyNameLabel = (TextView) findViewById(R.id.tv_family_name_label);
@@ -284,6 +288,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
int dialogWidth = context.getResources().getDimensionPixelOffset(
R.dimen.dp_room_user_dialog_width);
int itemWidth = dialogWidth / 4;
if (buttons.size() < 4) itemWidth = dialogWidth / 3;
flexbox.removeAllViews();
//底部item不添加到网格
List<ViewItem> bottomList = new ArrayList<>();
@@ -439,7 +444,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
// 这个方法能让图片不失真
ImageLoadUtils.laodUsrInfoAvatar(context, userInfo.getAvatar(), avatar);
nick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
erbanId.setText("ID" + userInfo.getErbanNo());
erbanId.setText("66号" + userInfo.getErbanNo());
ivGender.setImageResource(
userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
@@ -468,6 +473,10 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
ImageLoadUtils.loadImage(context, userLevelVo.getCharmUrl(), mIvUserCharm);
}
}
if (!TextUtils.isEmpty(userInfo.getNameplatePic())){
mIvUserNameplate.setVisibility(View.VISIBLE);
ImageLoadUtils.loadImage(context, userInfo.getNameplatePic(), mIvUserNameplate);
}
// 改变贵族
updateNobleView();
@@ -639,7 +648,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
break;
case R.id.fl_avatar_layout:
case R.id.user_info_page_btn:
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.data_dard_homepage_click,"资料卡片-主页");
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.data_dard_homepage_click, "资料卡片-主页");
UserInfoActivity.Companion.start(context, uid);
dismiss();
break;
@@ -962,12 +971,9 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
if (AvRoomDataManager.get().mCurrentRoomInfo.isOpenKTV()) {
new DialogManager(context).showOkCancelDialog("KTV模式下下麦会移除您已点的所有歌曲,确定进行此操作?", false,
() ->
{
() -> {
handleDownMicro();
KtvMusicManager.INSTANCE.deleteUserAllChooseMusic()
.subscribe(s -> {
});
KtvMusicManager.INSTANCE.deleteUserAllChooseMusic().subscribe();
}
);
} else if (AvRoomDataManager.get().haveStartDragon) {
@@ -1200,6 +1206,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
return textView;
}
@SuppressLint("CheckResult")
private TextView createKickMicItem() {
TextView textView = getTextView("抱Ta下麦");
textView.setOnClickListener(v -> {
@@ -1233,15 +1240,12 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
IMNetEaseManager.get().downMicroPhoneBySdk(micPosition, null);
RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (roomInfo != null) {
UserModel.get().getUserInfo(uid).subscribe(new Consumer<UserInfo>() {
@Override
public void accept(UserInfo userInfo) throws Exception {
String nick = userInfo != null ? RegexUtil.getPrintableString(userInfo.getNick()) : "";
IMNetEaseManager.get().kickMicroPhoneBySdk(uid, nick,
roomInfo.getRoomId()).subscribe(chatRoomMessage ->
KickModel.get().onSendRoomMessageSuccess(chatRoomMessage)
, Throwable::printStackTrace);
}
UserModel.get().getUserInfo(uid).subscribe(userInfo -> {
String nick = userInfo != null ? RegexUtil.getPrintableString(userInfo.getNick()) : "";
IMNetEaseManager.get().kickMicroPhoneBySdk(uid, nick,
roomInfo.getRoomId()).subscribe(chatRoomMessage ->
KickModel.get().onSendRoomMessageSuccess(chatRoomMessage)
, Throwable::printStackTrace);
});
}
dismiss();

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 536 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 956 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 482 B

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 994 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 928 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 632 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -3,9 +3,9 @@
<solid android:color="@color/black_transparent_20"/>
<corners android:bottomRightRadius="13dp"
android:topRightRadius="13dp"
android:bottomLeftRadius="0dp"
android:topLeftRadius="0dp"/>
<corners android:bottomRightRadius="0dp"
android:topRightRadius="0dp"
android:bottomLeftRadius="13dp"
android:topLeftRadius="13dp"/>
</shape>

View File

@@ -82,6 +82,7 @@
<ImageView
android:id="@+id/iv_open_noble"
android:layout_width="88dp"
android:visibility="gone"
android:layout_height="31dp"
android:layout_gravity="center_vertical|end"
android:scaleType="fitCenter"
@@ -95,7 +96,7 @@
android:scaleType="fitCenter"
android:src="@drawable/icon_oneyuan_gift"
android:visibility="gone"
tools:visibility="visible" />
/>
</LinearLayout>

View File

@@ -4,8 +4,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_room_operation"
android:paddingBottom="18dp"
android:paddingTop="14dp"
android:orientation="horizontal">
<androidx.recyclerview.widget.RecyclerView

View File

@@ -87,9 +87,9 @@
android:layout_height="wrap_content"
android:layout_marginEnd="3dp"
android:ellipsize="end"
android:maxWidth="111dp"
android:maxLength="10"
android:maxLines="1"
android:maxWidth="111dp"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
tools:text="南方菇凉男男女男男女" />
@@ -121,18 +121,19 @@
<include
android:id="@+id/in_official_mask"
layout="@layout/layout_official_mask"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="5.5dp"
android:layout_gravity="center"
android:visibility="visible"
layout="@layout/layout_official_mask" />
android:layout_marginEnd="5.5dp"
android:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="38dp"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_5"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
@@ -140,21 +141,33 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="38dp"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="3dp"
android:layout_marginEnd="5dp"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_nameplate"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="3dp"
android:adjustViewBounds="true"
android:scaleType="fitXY"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_official"
@@ -194,10 +207,11 @@
<LinearLayout
android:id="@+id/ll_family"
android:layout_marginTop="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_marginTop="5dp"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/tv_family_name_label"

View File

@@ -166,6 +166,7 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_room_tag"
android:gravity="center"
android:visibility="gone"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"

View File

@@ -2,131 +2,132 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:background="#000">
android:layout_height="60dp">
<RelativeLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="60dp">
<com.yizhuan.erban.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
tools:layout_width="60dp" />
<include
android:id="@+id/in_official_mask"
layout="@layout/layout_official_mask"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:layout_marginEnd="5.5dp"
android:layout_toEndOf="@id/noble_avatar_view"
android:visibility="gone"
tools:visibility="visible" />
<com.yizhuan.erban.ui.widget.NobleAvatarView
android:id="@+id/noble_avatar_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_toEndOf="@id/in_official_mask"
android:ellipsize="end"
android:maxWidth="80dp"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="13sp"
tools:text="难返风格as打算kj阿达是可敬的阿萨德看见爱上阿萨德" />
<include
android:id="@+id/in_official_mask"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/nick"
android:layout_alignBottom="@+id/nick"
android:layout_marginStart="3dp"
android:layout_toStartOf="@+id/iv_more"
android:layout_toEndOf="@+id/nick"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/sex"
android:layout_width="13dp"
android:layout_height="13dp"
android:layout_marginEnd="5dp"
android:src="@drawable/icon_mic_female" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_official"
android:layout_width="@dimen/dp_13"
android:layout_height="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_5"
android:src="@mipmap/ic_user_official_13dp"
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginEnd="5dp"
android:visibility="visible"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/nick"
android:layout_marginTop="4dp"
android:layout_toRightOf="@id/noble_avatar_view"
android:orientation="horizontal">
<ImageView
android:id="@+id/manager_logo"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginTop="10dp"
android:layout_marginEnd="5.5dp"
android:layout_gravity="center"
android:visibility="gone"
tools:visibility="visible"
android:layout_toEndOf="@id/noble_avatar_view"
layout="@layout/layout_official_mask" />
android:layout_marginEnd="@dimen/dp_5"
android:src="@drawable/icon_admin_logo" />
<TextView
android:id="@+id/nick"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_exper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_toEndOf="@id/in_official_mask"
android:ellipsize="end"
android:maxLines="1"
android:maxWidth="80dp"
android:textColor="@color/white"
android:textSize="13sp"
tools:text="难返风格as打算kj阿达是可敬的阿萨德看见爱上阿萨德" />
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_5"
android:adjustViewBounds="true"
android:visibility="visible"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<LinearLayout
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/nick"
android:layout_alignTop="@+id/nick"
android:layout_marginStart="3dp"
android:layout_toEndOf="@+id/nick"
android:layout_toStartOf="@+id/iv_more"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_height="@dimen/dp_17"
android:adjustViewBounds="true"
android:visibility="visible"
tools:visibility="visible" />
<ImageView
android:id="@+id/sex"
android:layout_width="13dp"
android:layout_height="13dp"
android:layout_marginEnd="5dp"
android:src="@drawable/icon_mic_female" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_official"
android:layout_width="@dimen/dp_13"
android:layout_height="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_5"
android:visibility="gone"
android:src="@mipmap/ic_user_official_13dp"
tools:visibility="visible" />
<ImageView
android:id="@+id/room_online_tag"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="15dp"
android:adjustViewBounds="true"
android:src="@drawable/icon_user_list_up_mic" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginEnd="5dp"
android:visibility="visible"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/nick"
android:layout_marginTop="4dp"
android:layout_toRightOf="@id/noble_avatar_view"
android:orientation="horizontal">
<ImageView
android:id="@+id/room_owner_logo"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="5dp"
android:src="@drawable/icon_user_list_room_ownner" />
<ImageView
android:id="@+id/manager_logo"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_5"
android:src="@drawable/icon_admin_logo" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_exper"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_17"
android:layout_marginEnd="@dimen/dp_5"
android:visibility="visible"
tools:src="@mipmap/ic_user_level"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_17"
android:visibility="visible"
tools:visibility="visible" />
</LinearLayout>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@id/container"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_15"
android:layout_toRightOf="@id/noble_avatar_view"
android:background="@color/white_tran_10" />
</RelativeLayout>
</RelativeLayout>

View File

@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:visibility="visible"
tools:src="@mipmap/ic_user_avatar_level_king" />
/>
<ImageView
android:id="@+id/iv_user_noble_level"
@@ -25,5 +25,5 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/iv_avatar"
android:layout_alignEnd="@+id/iv_avatar"
tools:src="@mipmap/ic_user_level_king" />
/>
</merge>

View File

@@ -23,8 +23,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<!-- ktv模式下的房间排行榜入口 -->
<LinearLayout
@@ -161,10 +160,11 @@
android:layout_width="65dp"
android:layout_height="75dp"
android:layout_below="@id/activity_img"
android:layout_marginTop="@dimen/dp_30"
android:layout_alignEnd="@+id/activity_img"
android:layout_marginTop="@dimen/dp_30"
android:visibility="gone"
tools:visibility="visible">
<com.jude.rollviewpager.RollPagerView
android:id="@+id/activity_img_left_cp"
android:layout_width="match_parent"
@@ -191,6 +191,7 @@
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_alignTop="@id/micro_view"
android:layout_alignParentEnd="true"
android:layout_marginTop="6dp"
android:background="@drawable/bg_contribute_entrance"
android:gravity="center"
@@ -235,6 +236,7 @@
android:layout_marginTop="@dimen/dp_8"
android:visibility="gone"
tools:visibility="visible">
<com.jude.rollviewpager.RollPagerView
android:id="@+id/activity_img_left"
android:layout_width="match_parent"

View File

@@ -117,7 +117,7 @@ public class MusicPlayerView extends FrameLayout implements View.OnClickListener
ObjectAnimator objectAnimatorFlag = ObjectAnimator.ofFloat(
musicFlagLayout,
"translationX",
UIUtil.dip2px(getContext(), 59 + 20),
UIUtil.dip2px(getContext(), -59 - 20),
0)
.setDuration(150);
objectAnimatorFlag.setInterpolator(new AccelerateDecelerateInterpolator());
@@ -137,7 +137,7 @@ public class MusicPlayerView extends FrameLayout implements View.OnClickListener
musicFlagLayout,
"translationX",
0,
UIUtil.dip2px(getContext(), 59 + 20))
UIUtil.dip2px(getContext(), -59-20))
.setDuration(150);
objectAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
objectAnimator.start();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 1014 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 614 B

View File

@@ -4,6 +4,6 @@
<solid android:color="@color/black_transparent_20" />
<corners
android:topLeftRadius="12dp"
android:bottomLeftRadius="12dp" />
android:topRightRadius="12dp"
android:bottomRightRadius="12dp" />
</shape>

View File

@@ -6,30 +6,31 @@
<FrameLayout
android:id="@+id/music_flag_layout"
android:layout_width="65dp"
android:layout_width="70dp"
android:layout_height="25dp"
android:layout_gravity="end"
android:layout_marginTop="6dp"
android:background="@drawable/bg_room_music_player"
tools:visibility="visible">
<ImageView
android:id="@+id/music_flag"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="3dp"
android:src="@drawable/icon_music_flag" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:layout_marginEnd="14dp"
android:lines="1"
android:text="音乐"
android:text="播放音乐"
android:textColor="@color/white"
android:textSize="12dp" />
android:textSize="10sp" />
<ImageView
android:id="@+id/music_flag"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="2dp"
android:src="@drawable/icon_music_flag" />
</FrameLayout>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -156,7 +156,7 @@ public class XChatConstants {
/**
* 分享房间 URL
*/
public static final String SHARE_ROOM_URL = "/modules/share/share_room.html?shareUid=";
public static final String SHARE_ROOM_URL = "/accompany/index.html#/share?shareUid=";
/**
* 分享家族文本

View File

@@ -285,5 +285,12 @@ public class UriProvider {
return JAVA_WEB_URL.concat("/modules/certification/index.html");
}
/**
* 个人魅力榜
*
*/
public static String getPersonalCharismaRank() {
return JAVA_WEB_URL.concat("/accompany/modules/charm/index.html");
}
}

View File

@@ -17,9 +17,7 @@ public interface IShareModel extends IBaseCore {
Single<String> shareH5(WebJsBeanInfo.DataBean webViewInfo, Platform platform, boolean httpsUrl);
Single<String> shareRoom(Platform platform, long roomUid, String title);
Single<String> shareRoom(Platform platform, long roomUid, String title, boolean httpsAvatar);
Single<String> shareRoom(Platform platform, long roomUid, long roomId, String title, String roomAvatar);
Single<String> shareFamily(Platform platform,
String familyId,
@@ -32,6 +30,9 @@ public interface IShareModel extends IBaseCore {
String title);
Single<String> shareText(Platform platform, String text);
/**写一个通用的分享方法*/
/**
* 写一个通用的分享方法
*/
Single<String> shareCommon(Platform platform, ShareCommonInfo info, boolean toast);
}

View File

@@ -1,7 +1,10 @@
package com.yizhuan.xchat_android_core.share;
import android.annotation.SuppressLint;
import android.net.Uri;
import android.text.Html;
import android.text.TextUtils;
import android.util.Log;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -22,6 +25,8 @@ import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.net.URL;
import java.net.URLEncoder;
import java.util.HashMap;
import cn.sharesdk.framework.Platform;
@@ -79,7 +84,7 @@ public class ShareModel extends BaseModel implements IShareModel {
sp.setText(webViewInfo.getDesc());
sp.setTitle(webViewInfo.getTitle());
if (httpsUrl) {
sp.setImageUrl(webViewInfo.getImgUrl().replace("http:","https:"));
sp.setImageUrl(webViewInfo.getImgUrl().replace("http:", "https:"));
} else {
sp.setImageUrl(webViewInfo.getImgUrl());
}
@@ -140,14 +145,8 @@ public class ShareModel extends BaseModel implements IShareModel {
@Override
public Single<String> shareRoom(Platform platform,
final long roomUid,
String title) {
return shareRoom(platform, roomUid, title, false);
}
@Override
public Single<String> shareRoom(Platform platform,
final long roomUid,
String title, boolean httpsAvatar) {
long roomId,
String title, String room_avatar) {
return Single.create(new SingleOnSubscribe<String>() {
@SuppressLint("CheckResult")
@Override
@@ -158,15 +157,14 @@ public class ShareModel extends BaseModel implements IShareModel {
Platform.ShareParams sp = new Platform.ShareParams();
sp.setText(userInfo.getNick() + XChatConstants.SHARE_ROOM_TEXT + title);
sp.setTitle(XChatConstants.SHARE_ROOM_TITLE);
if (httpsAvatar) {
sp.setImageUrl(userInfo.getAvatar().replace("http:", "https:"));
} else {
sp.setImageUrl(userInfo.getAvatar());
}
final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL + String.valueOf(AuthModel.get().getCurrentUid()) + "&uid=" + String.valueOf(roomUid);
sp.setImageUrl(userInfo.getAvatar());
final String siteUrl = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_ROOM_URL +
AuthModel.get().getCurrentUid() + "&uid=" + roomUid + "&room_name=" +
URLEncoder.encode(title, "utf8") + "&room_id=" + roomId + "&room_avatar=" +
URLEncoder.encode(room_avatar, "utf8") + "&share_name=" +
URLEncoder.encode( UserModel.get().getCacheLoginUserInfo().getNick(), "utf8");
//QQ空间分享
sp.setSite(userInfo.getNick() + XChatConstants.SHARE_ROOM_TEXT + title);
sp.setSiteUrl(siteUrl);
//QQ分享
@@ -204,6 +202,7 @@ public class ShareModel extends BaseModel implements IShareModel {
/**
* 向我们服务器报告分享
*
* @param roomUid
* @param sharePageId
* @param platform
@@ -508,8 +507,9 @@ public class ShareModel extends BaseModel implements IShareModel {
/**
* 报告服务器分享
*
* @param uid
* @param targetUid //分享房间的时候传房主uid
* @param targetUid //分享房间的时候传房主uid
* @param shareType
* @param sharePageId
* @param shareUrl

View File

@@ -89,6 +89,15 @@ public class UserInfo implements Serializable {
* 等级信息
*/
private UserLevelVo userLevelVo;
/**
* 铭牌地址
*/
@Getter
@Setter
private String nameplatePic;
private String nameplateWord;
/**
* 头饰信息
*/