From f2657327417372de5f02cddb79a6f02cc7fd26c3 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 23 Apr 2025 21:27:18 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20-=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/mypage/MyPageFragment.kt | 8 +++- .../sodalive/mypage/MyPageResponse.kt | 2 +- app/src/main/res/drawable-xxhdpi/ic_point.png | Bin 0 -> 2927 bytes app/src/main/res/layout/fragment_my.xml | 41 +++++++++++++++++- 4 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_point.png diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt index 1f77b19..de9c52d 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt @@ -113,9 +113,11 @@ class MyPageFragment : BaseFragment(FragmentMyBinding::inflat } if (SharedPreferenceManager.userId == 17958L) { - binding.llCan.visibility = View.GONE + binding.rlCan.visibility = View.GONE + binding.rlPoint.visibility = View.GONE } else { - binding.llCan.visibility = View.VISIBLE + binding.rlCan.visibility = View.VISIBLE + binding.rlPoint.visibility = View.VISIBLE binding.llTotalCan.setOnClickListener { startActivity( Intent( @@ -233,6 +235,7 @@ class MyPageFragment : BaseFragment(FragmentMyBinding::inflat binding.llFollowingMemberListContainer.visibility = View.GONE binding.rlAlarm.visibility = View.GONE + binding.rlPoint.visibility = View.GONE binding.rlCoupon.visibility = View.GONE binding.llLockerContainer.visibility = View.GONE binding.llReservationStatusContainer.visibility = View.GONE @@ -318,6 +321,7 @@ class MyPageFragment : BaseFragment(FragmentMyBinding::inflat } binding.tvTotalCan.text = (it.chargeCan + it.rewardCan).moneyFormat() + binding.tvTotalPoint.text = it.point.moneyFormat() binding.tvReservationLive.text = "${it.liveReservationCount}" } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt index d48a5af..18778fb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageResponse.kt @@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.mypage import androidx.annotation.Keep import com.google.gson.annotations.SerializedName -import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListResponse @Keep data class MyPageResponse( @@ -10,6 +9,7 @@ data class MyPageResponse( @SerializedName("profileUrl") val profileUrl: String, @SerializedName("chargeCan") val chargeCan: Int, @SerializedName("rewardCan") val rewardCan: Int, + @SerializedName("point") val point: Int, @SerializedName("youtubeUrl") val youtubeUrl: String?, @SerializedName("instagramUrl") val instagramUrl: String?, @SerializedName("websiteUrl") val websiteUrl: String?, diff --git a/app/src/main/res/drawable-xxhdpi/ic_point.png b/app/src/main/res/drawable-xxhdpi/ic_point.png new file mode 100644 index 0000000000000000000000000000000000000000..d41e9a9fd75984648f512c1e816f7fad1a99bcec GIT binary patch literal 2927 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 Z^M74D_v9SVu4n)N002ovPDHLkV1g6QkWByp literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index 1bdca28..7456228 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/app/src/main/res/layout/fragment_my.xml @@ -222,7 +222,7 @@ + + + + + + + + + +