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 74ced7cb3..684391ecf 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 @@ -46,6 +46,8 @@ import com.nnbc123.app.ui.im.avtivity.NimP2PMessageActivity; import com.nnbc123.app.ui.user.adapter.SelfPhotoAdapter; import com.nnbc123.app.ui.user.adapter.UserInfoPagerAdapter; import com.nnbc123.app.ui.user.adapter.UserInfoPhotoAdapter; +import com.nnbc123.app.ui.user.dialog.CreateGangUpDialog; +import com.nnbc123.app.ui.user.view.UserGameBlackFragment; import com.nnbc123.app.ui.user.view.UserInfoDynamicFragment; import com.nnbc123.app.ui.user.view.UserInfoInfoFragment; import com.nnbc123.app.ui.user.viewmodel.UserInfoViewModel; @@ -63,7 +65,6 @@ import com.nnbc123.app.vip.VipHelper; import com.nnbc123.core.auth.AuthModel; import com.nnbc123.core.im.friend.IMFriendModel; import com.nnbc123.core.level.UserLevelVo; -import com.nnbc123.core.module_hall.hall.bean.ClanInfo; import com.nnbc123.core.praise.PraiseModel; import com.nnbc123.core.praise.event.IsLikedEvent; import com.nnbc123.core.praise.event.PraiseEvent; @@ -168,6 +169,7 @@ public class UserInfoActivity extends BaseBindingActivity fragmentList = new ArrayList<>(2); + List fragmentList = new ArrayList<>(3); fragmentList.add(new UserInfoInfoFragment()); fragmentList.add(new UserInfoDynamicFragment()); + fragmentList.add(new UserGameBlackFragment()); pagerAdapter = new UserInfoPagerAdapter(getSupportFragmentManager(), fragmentList); - final List tagList = new ArrayList<>(2); + final List tagList = new ArrayList<>(3); tagList.add("资料"); tagList.add("动态"); + tagList.add("游戏开黑"); CommonNavigator commonNavigator = new CommonNavigator(context); commonNavigator.setTitleMargin(ScreenUtil.dip2px(6.0F)); MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(context, tagList); @@ -526,8 +532,7 @@ public class UserInfoActivity extends BaseBindingActivity { + + public UserGameBlackAdapter(Context context) { + super(R.layout.item_user_game_black); + } + + @Override + protected void convert(BaseViewHolder helper, String item) { + + } + +} diff --git a/app/src/main/java/com/nnbc123/app/ui/user/dialog/CreateGangUpDialog.kt b/app/src/main/java/com/nnbc123/app/ui/user/dialog/CreateGangUpDialog.kt new file mode 100644 index 000000000..90798c9f5 --- /dev/null +++ b/app/src/main/java/com/nnbc123/app/ui/user/dialog/CreateGangUpDialog.kt @@ -0,0 +1,24 @@ +package com.nnbc123.app.ui.user.dialog + +import android.annotation.SuppressLint +import android.view.Gravity +import android.view.WindowManager +import com.nnbc123.app.base.BaseDialog +import com.nnbc123.app.databinding.DialogCreateGangUpInviteBinding + +/** + * @author wushaocheng + * @Description 开黑邀请 + * @Date 2023/08/22 + */ +class CreateGangUpDialog : BaseDialog() { + + override var width = WindowManager.LayoutParams.MATCH_PARENT + override var gravity = Gravity.BOTTOM + + @SuppressLint("CheckResult") + override fun init() { + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/nnbc123/app/ui/user/view/UserGameBlackFragment.kt b/app/src/main/java/com/nnbc123/app/ui/user/view/UserGameBlackFragment.kt new file mode 100644 index 000000000..de9e98612 --- /dev/null +++ b/app/src/main/java/com/nnbc123/app/ui/user/view/UserGameBlackFragment.kt @@ -0,0 +1,42 @@ +package com.nnbc123.app.ui.user.view + +import android.view.View +import androidx.fragment.app.activityViewModels +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import com.nnbc123.app.base.BaseViewBindingFragment +import com.nnbc123.app.databinding.FragmentUserGameBlackBinding +import com.nnbc123.app.ui.user.adapter.UserGameBlackAdapter +import com.nnbc123.app.ui.user.viewmodel.UserInfoViewModel +import com.nnbc123.core.community.bean.WorldDynamicBean +import com.nnbc123.core.user.bean.UserDetailInfo + +class UserGameBlackFragment : BaseViewBindingFragment() { + private val vm by activityViewModels() + private var userGameBlackAdapter: UserGameBlackAdapter? = null + override fun init() { + vm.userInfoDetailData.observe(this, Observer { dataBean: UserDetailInfo.DataBean -> + initDynamicList(dataBean.dynamicInfo) + }) + } + + /** + * 动态列表 + * + * @param list + */ + private fun initDynamicList(list: List) { + if (userGameBlackAdapter == null) { + binding.rvDynamic.layoutManager = LinearLayoutManager(mContext) + userGameBlackAdapter = UserGameBlackAdapter(mContext) + userGameBlackAdapter?.setEnableLoadMore(false) + userGameBlackAdapter?.setOnItemChildClickListener { _, view: View, pos: Int -> +// val bean: WorldDynamicBean = +// dynamicAdapter?.getItem(pos) ?: return@setOnItemChildClickListener + } + binding.rvDynamic.adapter = userGameBlackAdapter + } +// userGameBlackAdapter?.setNewData(list) + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_chat.png b/app/src/main/res/drawable-xhdpi/ic_chat.png new file mode 100644 index 000000000..17ce23bbd Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_chat.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_gang_up.png b/app/src/main/res/drawable-xhdpi/ic_gang_up.png new file mode 100644 index 000000000..0a42cba96 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_gang_up.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_green.png b/app/src/main/res/drawable-xhdpi/ic_green.png new file mode 100644 index 000000000..e05564cf4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_green.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_king.png b/app/src/main/res/drawable-xhdpi/ic_king.png new file mode 100644 index 000000000..2fafbbdbb Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_king.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_sparring_partner.png b/app/src/main/res/drawable-xhdpi/ic_sparring_partner.png new file mode 100644 index 000000000..fecdce21f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_sparring_partner.png differ diff --git a/app/src/main/res/drawable/bg_attention.xml b/app/src/main/res/drawable/bg_attention.xml new file mode 100644 index 000000000..864f15e97 --- /dev/null +++ b/app/src/main/res/drawable/bg_attention.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_cancel_attention.xml b/app/src/main/res/drawable/bg_cancel_attention.xml new file mode 100644 index 000000000..c280c431f --- /dev/null +++ b/app/src/main/res/drawable/bg_cancel_attention.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_gang_up.xml b/app/src/main/res/drawable/bg_gang_up.xml new file mode 100644 index 000000000..6d87499e6 --- /dev/null +++ b/app/src/main/res/drawable/bg_gang_up.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_gang_up_tip_left.xml b/app/src/main/res/drawable/bg_gang_up_tip_left.xml new file mode 100644 index 000000000..ff0601982 --- /dev/null +++ b/app/src/main/res/drawable/bg_gang_up_tip_left.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/bg_gang_up_tip_right.xml b/app/src/main/res/drawable/bg_gang_up_tip_right.xml new file mode 100644 index 000000000..ff0601982 --- /dev/null +++ b/app/src/main/res/drawable/bg_gang_up_tip_right.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 5ebf28a99..91735e5d4 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -96,7 +96,6 @@ - + + android:layout_marginTop="5dp" + android:gravity="center" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_nick"> @@ -217,8 +217,8 @@ android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/dp_4" android:visibility="gone" - tools:visibility="visible" - app:drawableStartCompat="@drawable/ic_userinfo_hall" /> + app:drawableStartCompat="@drawable/ic_userinfo_hall" + tools:visibility="visible" /> - + @@ -406,7 +424,6 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_user_game_black.xml b/app/src/main/res/layout/fragment_user_game_black.xml new file mode 100644 index 000000000..9f31d1ca7 --- /dev/null +++ b/app/src/main/res/layout/fragment_user_game_black.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_room_new_friends.xml b/app/src/main/res/layout/item_room_new_friends.xml index f5f996a53..4aca79196 100644 --- a/app/src/main/res/layout/item_room_new_friends.xml +++ b/app/src/main/res/layout/item_room_new_friends.xml @@ -22,22 +22,30 @@ + + + tools:text="余生点唱歌曲交友房间萨达萨达萨达" /> @@ -106,7 +115,7 @@ android:background="@drawable/shape_f6f7f9_corner" android:gravity="center" android:textColor="#ffb3b5c4" - android:textSize="10dp" + android:textSize="@dimen/sp_10" app:layout_constraintBottom_toBottomOf="@id/ll_gender_age" app:layout_constraintStart_toEndOf="@id/ll_gender_age" app:layout_constraintTop_toTopOf="@id/ll_gender_age" @@ -128,15 +137,36 @@ app:layout_constraintStart_toEndOf="@id/iv_avatar" app:layout_constraintTop_toBottomOf="@id/ll_gender_age" /> + + + app:layout_constraintEnd_toEndOf="@id/view_bg"> + android:textColor="@color/color_2B2D33" + android:textSize="@dimen/sp_14" /> - + android:text="@string/gang_up" + android:textColor="@color/color_2B2D33" + android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 47f06a35b..9458ccac6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -609,6 +609,7 @@ #161958 #BDBFD0 #2B2D33 + #662B2D33 #FFDA24 #696D7A #A2A7B8 @@ -618,5 +619,9 @@ #FA940A #167FE0 #BA43E0 + #FFECD2 + #683F0B + #FCFCFC + #FFA024 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6672ccd49..e4daee359 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -981,5 +981,8 @@ 按日统计 每周统计 每月统计 + 找ta开黑 + 开黑邀请 + 开黑时长(局): diff --git a/app/src/module_community/res/drawable-xhdpi/bg_game_black.png b/app/src/module_community/res/drawable-xhdpi/bg_game_black.png new file mode 100644 index 000000000..8706bd0d2 Binary files /dev/null and b/app/src/module_community/res/drawable-xhdpi/bg_game_black.png differ diff --git a/app/src/module_community/res/drawable-xhdpi/bg_order.png b/app/src/module_community/res/drawable-xhdpi/bg_order.png new file mode 100644 index 000000000..d5dc89b8f Binary files /dev/null and b/app/src/module_community/res/drawable-xhdpi/bg_order.png differ diff --git a/app/src/module_community/res/drawable-xhdpi/ic_king_mark.png b/app/src/module_community/res/drawable-xhdpi/ic_king_mark.png new file mode 100644 index 000000000..c547a6c10 Binary files /dev/null and b/app/src/module_community/res/drawable-xhdpi/ic_king_mark.png differ diff --git a/app/src/module_community/res/layout/item_user_game_black.xml b/app/src/module_community/res/layout/item_user_game_black.xml new file mode 100644 index 000000000..788ce335e --- /dev/null +++ b/app/src/module_community/res/layout/item_user_game_black.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file