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

Merge remote-tracking branch 'origin/develop' into yinyou_dating

Browse Source
This commit is contained in:
huangjian
2021-03-05 18:55:59 +08:00
parent fc5eb8c237 3bbc27560b
commit 39f1d1e57d
8 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/yizhuan/erban/avroom/adapter/DatingMicroViewAdapter.kt
View File

@@ -107,16 +107,6 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
}
}
if (tvNumber != null) {
var micPosition = 0
when (position) {
0, 2 -> micPosition = 1
1, 3 -> micPosition = 2
4, 6 -> micPosition = 3
5, 7 -> micPosition = 4
}
tvNumber.text = micPosition.toString()
}
}
}

5
app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
View File

@@ -43,6 +43,7 @@ import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListIn
import com.yizhuan.xchat_android_core.user.bean.BaseInfo;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
import com.yizhuan.xchat_android_library.utils.CommonUtils;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
@@ -132,6 +133,10 @@ public class MicQueueDialog extends BaseDialog implements
adapter = new MicQueueAdapter(dataList);
adapter.setOnUpMicListener((member, itemPos) -> {
if (CommonUtils.isFastDoubleClick(1000)){
toast("操作太快,66星球忙不过来哦~");
return;
}
long targetUid = member.getUid();
if (AvRoomDataManager.get().isOnMic(member.getUid())) {
toast("TA已经在麦上了");

5
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java
View File

@@ -28,14 +28,11 @@ public class RoomCharmListFragment extends BaseBindingFragment<FragmentRoomCharm
ArrayList<Fragment> fragments = new ArrayList<>(2);
fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_DAY_RANKING));
fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_WEEK_RANKING));
if (AvRoomDataManager.get().isDatingMode()) {
fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_MONTH_RANKING));
}
mBinding.vpCharmRankings.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragments));
CommonNavigator commonNavigator = new CommonNavigator(getActivity());
commonNavigator.setAdjustMode(false);
RankNavigatorAdapter indicator = new RankNavigatorAdapter();
RankNavigatorAdapter indicator = new RankNavigatorAdapter(false);
indicator.setOnItemSelectListener(position -> mBinding.vpCharmRankings.setCurrentItem(position));
commonNavigator.setAdapter(indicator);
mBinding.viewIndicator.setNavigator(commonNavigator);

2
app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java
View File

@@ -46,7 +46,7 @@ public class RoomContributeListFragment extends BaseMvpFragment implements IMvpB
viewPager.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragments));
CommonNavigator commonNavigator = new CommonNavigator(getActivity());
commonNavigator.setAdjustMode(false);
RankNavigatorAdapter indicator = new RankNavigatorAdapter();
RankNavigatorAdapter indicator = new RankNavigatorAdapter(AvRoomDataManager.get().isDatingMode());
indicator.setOnItemSelectListener(position -> viewPager.setCurrentItem(position));
commonNavigator.setAdapter(indicator);
viewIndicator.setNavigator(commonNavigator);

4
app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java
View File

@@ -29,10 +29,10 @@ public class RankNavigatorAdapter extends CommonNavigatorAdapter {
private List<String> mTitleList = new ArrayList<>();
public RankNavigatorAdapter() {
public RankNavigatorAdapter(boolean showMonth) {
mTitleList.add("日榜");
mTitleList.add("周榜");
if (AvRoomDataManager.get().isDatingMode()) {
if (showMonth) {
mTitleList.add("月榜");
}
}

4
app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java
View File

@@ -76,7 +76,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
public static final String IS_BY_MATCH = "isByMatch";
private boolean isResume = false;
private ImageView ivAddBlackList;
private TextView ivAddBlackList;
private View tipsLayout;
private ImageView closeIcon;
@@ -204,7 +204,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
if (sessionId.equals(String.valueOf(XChatConstants.SECRETARY_UID))) return;
// 系统消息
if (Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID))) return;
ivAddBlackList = findViewById(com.yizhuan.erban.R.id.iv_add_black_list);
ivAddBlackList = findViewById(R.id.iv_add_black_list);
ivAddBlackList.setVisibility(View.VISIBLE);
ivAddBlackList.setOnClickListener((view) -> {
// 跳转到加入黑名单

7
app/src/main/res/layout/activity_p2p_message.xml
View File

@@ -77,12 +77,15 @@
android:textSize="12dp" />
</LinearLayout>
<ImageView
<TextView
android:id="@+id/iv_add_black_list"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="right"
android:padding="17dp"
android:textSize="@dimen/dp_13"
android:text="举报"
android:textColor="@color/color_333333"
android:gravity="center"
android:src="@drawable/icon_add_black_list"
android:visibility="gone"
tools:visibility="visible" />

1
core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java
View File

@@ -472,6 +472,7 @@ public class AvRoomModel extends RoomBaseModel implements IAvRoomModel {
}
AvRoomDataManager.get().mRoomFixedMemberList.addAll(chatRoomMemberList);
AvRoomDataManager.get().mRoomAllMemberList.addAll(chatRoomMemberList);
IMNetEaseManager.get().noticeManagerChange();
int size = chatRoomMemberList.size();
Logger.i("进入房间获取固定成员成功,人数:" + size);
if (size == 200) {