diff --git a/app/src/main/java/com/chwl/app/ui/game_team/invite/GameTeamInviteDialog.kt b/app/src/main/java/com/chwl/app/ui/game_team/invite/GameTeamInviteDialog.kt new file mode 100644 index 000000000..c3e9bcaab --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/game_team/invite/GameTeamInviteDialog.kt @@ -0,0 +1,16 @@ +package com.chwl.app.ui.game_team.invite + +import android.view.Gravity +import android.view.WindowManager +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.GameTeamInviteDialogBinding + + +class GameTeamInviteDialog : BaseDialog() { + + override var width = WindowManager.LayoutParams.MATCH_PARENT + override var gravity = Gravity.CENTER + + override fun init() { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordActivity.kt b/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordActivity.kt new file mode 100644 index 000000000..d9661f9f7 --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordActivity.kt @@ -0,0 +1,53 @@ +package com.chwl.app.ui.game_team.record + +import android.widget.TextView +import androidx.fragment.app.Fragment +import com.chwl.app.R +import com.chwl.app.avroom.adapter.CommonVPAdapter +import com.chwl.app.base.BaseViewBindingActivity +import com.chwl.app.databinding.GameTeamRecordActivityBinding +import com.chwl.app.home.adapter.HomeIndicatorAdapter +import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper +import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator +import com.netease.nim.uikit.StatusBarUtil + +class GameTeamRecordActivity : BaseViewBindingActivity() { + override fun init() { + initTab() + } + + private fun initTab() { + val fragmentList = ArrayList() + fragmentList.add(GameTeamRecordFragment.newInstance(GameTeamRecordFragment.TYPE_INITIATOR)) + fragmentList.add(GameTeamRecordFragment.newInstance(GameTeamRecordFragment.TYPE_RECEIVER)) + val titleList = ArrayList() + titleList.add(getString(R.string.game_team_10)) + titleList.add(getString(R.string.game_team_11)) + val commonNavigator = CommonNavigator(context) + commonNavigator.setTitleWrapContent(false) + val magicIndicatorAdapter = HomeIndicatorAdapter(context, titleList) + magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? -> + binding.viewPager.currentItem = position + } + commonNavigator.adapter = magicIndicatorAdapter + binding.magicIndicator.navigator = commonNavigator + binding.viewPager.offscreenPageLimit = 2 + binding.viewPager.adapter = CommonVPAdapter( + supportFragmentManager, + lifecycle, + fragmentList + ) + ViewPagerHelper.bind(binding.magicIndicator, binding.viewPager) + binding.viewPager.isUserInputEnabled = false + } + + override fun needSteepStateBar(): Boolean { + return true + } + + override fun setStatusBar() { + super.setStatusBar() + StatusBarUtil.transparencyBar(this) + StatusBarUtil.StatusBarLightMode(this) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordAdapter.kt b/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordAdapter.kt new file mode 100644 index 000000000..1a33b9d1e --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordAdapter.kt @@ -0,0 +1,20 @@ +package com.chwl.app.ui.game_team.record + +import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter.base.BaseViewHolder +import com.chwl.app.R + +class GameTeamRecordAdapter : + BaseQuickAdapter(R.layout.game_team_record_item) { + + var showRepurchase: Boolean = true + + override fun convert(helper: BaseViewHolder, item: String?) { + helper.setText(R.id.tv_name, "NAME") + helper.setText(R.id.tv_id, "299393") + helper.setText(R.id.tv_game_name, "AAAAAA") + helper.setText(R.id.tv_order_money, "10002") + helper.setText(R.id.tv_order_time, "2013-11-20 12:00:20") + helper.setText(R.id.tv_order_id, "12123212312131231233123131231123129") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordFragment.kt b/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordFragment.kt new file mode 100644 index 000000000..14efcb646 --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/game_team/record/GameTeamRecordFragment.kt @@ -0,0 +1,42 @@ +package com.chwl.app.ui.game_team.record + +import android.os.Bundle +import com.chwl.app.R +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.GameTemaRecordFragmentBinding +import com.netease.nim.uikit.common.ui.recyclerview.decoration.SpacingDecoration + +class GameTeamRecordFragment : BaseViewBindingFragment() { + + companion object { + const val TYPE_INITIATOR = 0 + const val TYPE_RECEIVER = 1 + fun newInstance(type: Int): GameTeamRecordFragment { + return GameTeamRecordFragment().apply { + arguments = Bundle().apply { + putInt("type", type) + } + } + } + } + + private val adapter = GameTeamRecordAdapter() + + private var type: Int = TYPE_INITIATOR + + override fun init() { + type = arguments?.getInt("type", TYPE_INITIATOR) ?: TYPE_INITIATOR + adapter.showRepurchase = (type == TYPE_INITIATOR) + binding.recyclerView.addItemDecoration( + SpacingDecoration( + 0, resources.getDimensionPixelOffset( + R.dimen.dp_16 + ), false + ) + ) + binding.recyclerView.adapter = adapter + repeat(20) { + adapter.addData(it.toString()) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoGameTeamAdapter.kt b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoGameTeamAdapter.kt new file mode 100644 index 000000000..2b0969a98 --- /dev/null +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserInfoGameTeamAdapter.kt @@ -0,0 +1,12 @@ +package com.chwl.app.ui.user.adapter + +import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter.base.BaseViewHolder +import com.chwl.app.R +import com.chwl.core.game_team.GameTeamBean + +class UserInfoGameTeamAdapter : + BaseQuickAdapter(R.layout.user_info_item_game_team) { + override fun convert(helper: BaseViewHolder, item: GameTeamBean) { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt index 24783de9a..ca02ed6a0 100644 --- a/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt +++ b/app/src/main/java/com/chwl/app/ui/user/fragment/UserInfoDataFragment.kt @@ -9,22 +9,26 @@ import com.chwl.app.R import com.chwl.app.base.BaseViewBindingFragment import com.chwl.app.databinding.UserInfoDataFragmentBinding import com.chwl.app.support.FragmentVisibleStateHelper +import com.chwl.app.ui.game_team.invite.GameTeamInviteDialog import com.chwl.app.ui.user.activity.ShowPhotoActivity import com.chwl.app.ui.user.activity.UserInfoModifyActivity import com.chwl.app.ui.user.activity.UserModifyPhotosActivity import com.chwl.app.ui.user.adapter.UserInfoAlbumAdapter +import com.chwl.app.ui.user.adapter.UserInfoGameTeamAdapter import com.chwl.app.ui.user.adapter.UserInfoGiftAdapter import com.chwl.app.ui.user.adapter.UserInfoMedalAdapter import com.chwl.app.ui.user.viewmodel.UserInfoViewModel import com.chwl.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.chwl.app.ui.widget.recyclerview.decoration.SpacingDecoration +import com.chwl.core.game_team.GameTeamBean import com.chwl.core.user.bean.UserPhoto -import com.example.lib_utils.UiUtils class UserInfoDataFragment : BaseViewBindingFragment() { private val viewModel: UserInfoViewModel by activityViewModels() override fun init() { + initGameTeam() initAlbum() initMedal() initGift() @@ -36,6 +40,29 @@ class UserInfoDataFragment : BaseViewBindingFragment + activity?.let { + GameTeamInviteDialog().safeShow(it.supportFragmentManager, it) + } + } + viewModel.userInfoDetailData.observe(this) { + repeat(2) { + adapter.addData(GameTeamBean()) + } + binding.layoutGameTeam.isVisible = true + } + } + private fun initAlbum() { val albumAdapter = UserInfoAlbumAdapter() binding.ivAlbumMore.isVisible = viewModel.isMe diff --git a/app/src/main/res/drawable-xxhdpi/game_team_invite_bg.webp b/app/src/main/res/drawable-xxhdpi/game_team_invite_bg.webp new file mode 100644 index 000000000..1344e7e83 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/game_team_invite_bg.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_add.webp b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_add.webp new file mode 100644 index 000000000..b4627e384 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_add.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_close.webp b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_close.webp new file mode 100644 index 000000000..144ad93e8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_close.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_recharge_arrow.webp b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_recharge_arrow.webp new file mode 100644 index 000000000..6f1e58636 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_recharge_arrow.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_subtract.webp b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_subtract.webp new file mode 100644 index 000000000..7ca1efe52 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/game_team_invite_ic_subtract.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/game_team_record_ic_copy.webp b/app/src/main/res/drawable-xxhdpi/game_team_record_ic_copy.webp new file mode 100644 index 000000000..fdeac3b64 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/game_team_record_ic_copy.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/user_info_game_team_ic_play.webp b/app/src/main/res/drawable-xxhdpi/user_info_game_team_ic_play.webp new file mode 100644 index 000000000..a7529529b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/user_info_game_team_ic_play.webp differ diff --git a/app/src/main/res/drawable/shape_g_70e9e7_41d4f6_13_lr.xml b/app/src/main/res/drawable/shape_g_70e9e7_41d4f6_13_lr.xml new file mode 100644 index 000000000..179f1d8bf --- /dev/null +++ b/app/src/main/res/drawable/shape_g_70e9e7_41d4f6_13_lr.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_g_fed118_fdb719_13_lr.xml b/app/src/main/res/drawable/shape_g_fed118_fdb719_13_lr.xml new file mode 100644 index 000000000..6c3cd9c5a --- /dev/null +++ b/app/src/main/res/drawable/shape_g_fed118_fdb719_13_lr.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_team_invite_dialog.xml b/app/src/main/res/layout/game_team_invite_dialog.xml new file mode 100644 index 000000000..5c803bc59 --- /dev/null +++ b/app/src/main/res/layout/game_team_invite_dialog.xml @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_team_record_activity.xml b/app/src/main/res/layout/game_team_record_activity.xml new file mode 100644 index 000000000..5afdd6da5 --- /dev/null +++ b/app/src/main/res/layout/game_team_record_activity.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_team_record_item.xml b/app/src/main/res/layout/game_team_record_item.xml new file mode 100644 index 000000000..1219d1529 --- /dev/null +++ b/app/src/main/res/layout/game_team_record_item.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_tema_record_fragment.xml b/app/src/main/res/layout/game_tema_record_fragment.xml new file mode 100644 index 000000000..2b8f7c718 --- /dev/null +++ b/app/src/main/res/layout/game_tema_record_fragment.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/user_info_data_fragment.xml b/app/src/main/res/layout/user_info_data_fragment.xml index 4ca522272..e97bf3ccd 100644 --- a/app/src/main/res/layout/user_info_data_fragment.xml +++ b/app/src/main/res/layout/user_info_data_fragment.xml @@ -12,11 +12,48 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + + + + + + + android:layout_marginTop="@dimen/dp_20"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d97461476..5b18afed5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -5322,5 +5322,22 @@ وسيلة تواصل من فضلك ادخل رقم الهاتف او البريد الالكتروني - + 組隊開黑 + 遊戲名稱 + 熟練度 + 下單價格 + 下單 + 開黑邀請 + 開黑局數: + 合計: + 點單記錄 + 我發起的 + 我接收的 + 遊戲名稱: + 消費金額: + 下單時間: + 訂單編號: + 再次支付 + 和我一起玩遊戲吧~ + %s局 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 618707459..678da6148 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -5262,4 +5262,24 @@ 聯係方式 請輸入… 手機號或郵箱 + + + 組隊開黑 + 遊戲名稱 + 熟練度 + 下單價格 + 下單 + 開黑邀請 + 開黑局數: + 合計: + 點單記錄 + 我發起的 + 我接收的 + 遊戲名稱: + 消費金額: + 下單時間: + 訂單編號: + 再次支付 + 和我一起玩遊戲吧~ + %s局 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc3a9abab..4b043936c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5303,7 +5303,24 @@ You cannot join again within 24 hours after leaving Please enter... Mobile phone number or email - + 組隊開黑 + 遊戲名稱 + 熟練度 + 下單價格 + 下單 + 開黑邀請 + 開黑局數: + 合計: + 點單記錄 + 我發起的 + 我接收的 + 遊戲名稱: + 消費金額: + 下單時間: + 訂單編號: + 再次支付 + 和我一起玩遊戲吧~ + %s局 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4142be193..809385faf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -624,8 +624,18 @@ @dimen/dp_8 + + + + diff --git a/core/src/main/java/com/chwl/core/game_team/GameTeamBean.kt b/core/src/main/java/com/chwl/core/game_team/GameTeamBean.kt new file mode 100644 index 000000000..1a9b4c0c0 --- /dev/null +++ b/core/src/main/java/com/chwl/core/game_team/GameTeamBean.kt @@ -0,0 +1,7 @@ +package com.chwl.core.game_team + +import androidx.annotation.Keep + +@Keep +class GameTeamBean { +} \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_66ffffff_13o5dp.xml b/modules/module_base/src/main/res/drawable/base_shape_66ffffff_13o5dp.xml new file mode 100644 index 000000000..b43da3615 --- /dev/null +++ b/modules/module_base/src/main/res/drawable/base_shape_66ffffff_13o5dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_13dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_13dp.xml new file mode 100644 index 000000000..c30a91fee --- /dev/null +++ b/modules/module_base/src/main/res/drawable/base_shape_theme_13dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file