klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

쿠폰등록 페이지 추가

Browse Source
This commit is contained in:
klaus
2024-01-03 05:37:21 +09:00
parent 4bd6a766f5
commit 315e0627d1
11 changed files with 317 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt
View File

@@ -72,6 +72,7 @@ import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
import kr.co.vividnext.sodalive.mypage.can.CanApi
import kr.co.vividnext.sodalive.mypage.can.CanRepository
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeViewModel
import kr.co.vividnext.sodalive.mypage.can.coupon.CanCouponViewModel
import kr.co.vividnext.sodalive.mypage.can.payment.CanPaymentViewModel
import kr.co.vividnext.sodalive.mypage.can.status.CanStatusViewModel
import kr.co.vividnext.sodalive.mypage.profile.ProfileUpdateViewModel
@@ -223,6 +224,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
viewModel { CreatorCommunityCommentListViewModel(get()) }
viewModel { CreatorCommunityWriteViewModel(get()) }
viewModel { CreatorCommunityModifyViewModel(get()) }
viewModel { CanCouponViewModel(get()) }
}
private val repositoryModule = module {

12
app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt
View File

@@ -31,6 +31,7 @@ import kr.co.vividnext.sodalive.mypage.auth.Auth
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
import kr.co.vividnext.sodalive.mypage.auth.BootpayResponse
import kr.co.vividnext.sodalive.mypage.can.charge.CanChargeActivity
import kr.co.vividnext.sodalive.mypage.can.coupon.CanCouponActivity
import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity
import kr.co.vividnext.sodalive.mypage.profile.ProfileUpdateActivity
import kr.co.vividnext.sodalive.mypage.service_center.ServiceCenterActivity
@@ -131,6 +132,15 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
)
}
binding.rlCoupon.setOnClickListener {
startActivity(
Intent(
requireActivity(),
CanCouponActivity::class.java
)
)
}
binding.llReservationLive.setOnClickListener {
startActivity(
Intent(
@@ -207,8 +217,10 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
viewModel.myPageLiveData.observe(viewLifecycleOwner) {
if (it.isAuth) {
binding.tvAuth.visibility = View.GONE
binding.rlCoupon.visibility = View.VISIBLE
} else {
binding.tvAuth.visibility = View.VISIBLE
binding.rlCoupon.visibility = View.GONE
}
binding.ivProfile.load(it.profileUrl) {

7
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/CanApi.kt
View File

@@ -6,6 +6,7 @@ import kr.co.vividnext.sodalive.mypage.can.charge.CanResponse
import kr.co.vividnext.sodalive.mypage.can.charge.ChargeRequest
import kr.co.vividnext.sodalive.mypage.can.charge.ChargeResponse
import kr.co.vividnext.sodalive.mypage.can.charge.VerifyRequest
import kr.co.vividnext.sodalive.mypage.can.coupon.UseCanCouponRequest
import kr.co.vividnext.sodalive.mypage.can.status.GetCanStatusResponse
import kr.co.vividnext.sodalive.mypage.can.status.charge.GetCanChargeStatusResponseItem
import kr.co.vividnext.sodalive.mypage.can.status.use.GetCanUseStatusResponseItem
@@ -56,4 +57,10 @@ interface CanApi {
@Query("container") container: String = "aos",
@Header("Authorization") authHeader: String
): Single<ApiResponse<List<GetCanChargeStatusResponseItem>>>
@POST("/can/coupon/use")
fun useCanCoupon(
@Body request: UseCanCouponRequest,
@Header("Authorization") authHeader: String
): Single<ApiResponse<Any>>
}

6
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/CanRepository.kt
View File

@@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.mypage.can
import kr.co.vividnext.sodalive.mypage.can.charge.ChargeRequest
import kr.co.vividnext.sodalive.mypage.can.charge.VerifyRequest
import kr.co.vividnext.sodalive.mypage.can.coupon.UseCanCouponRequest
import java.util.TimeZone
class CanRepository(private val api: CanApi) {
@@ -40,4 +41,9 @@ class CanRepository(private val api: CanApi) {
size = pageSize,
authHeader = token
)
fun useCanCoupon(couponNumber: String, token: String) = api.useCanCoupon(
request = UseCanCouponRequest(couponNumber),
authHeader = token
)
}

66
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponActivity.kt Normal file
View File

@@ -0,0 +1,66 @@
package kr.co.vividnext.sodalive.mypage.can.coupon
import android.content.Intent
import android.os.Bundle
import android.text.InputFilter
import android.text.SpannableStringBuilder
import android.text.Spanned
import android.widget.Toast
import kr.co.vividnext.sodalive.base.BaseActivity
import kr.co.vividnext.sodalive.common.LoadingDialog
import kr.co.vividnext.sodalive.databinding.ActivityCanCouponBinding
import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity
import org.koin.android.ext.android.inject
class CanCouponActivity : BaseActivity<ActivityCanCouponBinding>(
ActivityCanCouponBinding::inflate
) {
private val viewModel: CanCouponViewModel by inject()
private lateinit var loadingDialog: LoadingDialog
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
bindData()
}
override fun setupView() {
loadingDialog = LoadingDialog(this, layoutInflater)
binding.toolbar.tvBack.text = "쿠폰등록"
binding.toolbar.tvBack.setOnClickListener { finish() }
val uppercaseAndDigitsFilter = InputFilter { source, _, _, _, _, _ ->
val filtered = source.filter { it.isUpperCase() || it.isDigit() }
if (source is Spanned) {
return@InputFilter SpannableStringBuilder(filtered)
} else {
return@InputFilter filtered
}
}
binding.etCouponNumber.filters = arrayOf(uppercaseAndDigitsFilter)
binding.tvRegistration.setOnClickListener {
val couponNumber = binding.etCouponNumber.text.toString()
viewModel.useCoupon(couponNumber) {
finish()
startActivity(Intent(applicationContext, CanStatusActivity::class.java))
}
}
}
private fun bindData() {
viewModel.toastLiveData.observe(this) {
it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
}
viewModel.isLoading.observe(this) {
if (it) {
loadingDialog.show(screenWidth)
} else {
loadingDialog.dismiss()
}
}
}
}

59
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponViewModel.kt Normal file
View File

@@ -0,0 +1,59 @@
package kr.co.vividnext.sodalive.mypage.can.coupon
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import com.orhanobut.logger.Logger
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import kr.co.vividnext.sodalive.base.BaseViewModel
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.mypage.can.CanRepository
class CanCouponViewModel(private val repository: CanRepository) : BaseViewModel() {
private var _isLoading = MutableLiveData(false)
val isLoading: LiveData<Boolean>
get() = _isLoading
private val _toastLiveData = MutableLiveData<String?>()
val toastLiveData: LiveData<String?>
get() = _toastLiveData
fun useCoupon(couponNumber: String, onSuccess: () -> Unit) {
_isLoading.value = true
compositeDisposable.add(
repository.useCanCoupon(
couponNumber = couponNumber,
token = "Bearer ${SharedPreferenceManager.token}"
)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{
_isLoading.value = false
if (it.success && it.data != null) {
_toastLiveData.postValue("해당 쿠폰의 캔이 충전되었습니다.")
onSuccess()
} else {
if (it.message != null) {
_toastLiveData.postValue(it.message)
} else {
_toastLiveData.postValue(
"알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
)
}
}
},
{
_isLoading.value = false
if (it.message != null) {
_toastLiveData.postValue(it.message)
Logger.e(it.message!!)
} else {
_toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
}
}
)
)
}
}

7
app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/UseCanCouponRequest.kt Normal file
View File

@@ -0,0 +1,7 @@
package kr.co.vividnext.sodalive.mypage.can.coupon
import com.google.gson.annotations.SerializedName
data class UseCanCouponRequest(
@SerializedName("couponNumber") val couponNumber: String
)