Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ android {
buildConfigField("String", "BACKEND_BASE_URL", "\"$backendBaseUrl\"")
val aiBaseUrl = localProperties.getProperty("AI_BASE_URL")
buildConfigField("String", "AI_BASE_URL", "\"$aiBaseUrl\"")

val admobAppId = localProperties.getProperty("ADMOB_APP_ID") ?: "ca-app-pub-xxxxxxxxxxxxxxxx~yyyyyyyyyy"
manifestPlaceholders["ADMOB_APP_ID"] = admobAppId
}

buildTypes {
Expand Down Expand Up @@ -162,6 +165,8 @@ dependencies {

//Timber
implementation("com.jakewharton.timber:timber:5.0.1")

implementation("com.google.android.gms:play-services-ads:23.6.0")
}

ksp {
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
android:supportsRtl="true"
android:theme="@style/Theme.Egobook"
android:usesCleartextTraffic="true">

<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="${ADMOB_APP_ID}" />
<activity
android:name=".ui.login.view.IntroActivity"
android:exported="true"
Expand Down Expand Up @@ -44,4 +48,4 @@
tools:ignore="LockedOrientationActivity" />
</application>

</manifest>
</manifest>
52 changes: 52 additions & 0 deletions app/src/main/java/com/egobook/app/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.egobook.app

import android.os.Bundle
import android.util.Log
import android.view.View
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
Expand All @@ -10,6 +11,12 @@ import androidx.drawerlayout.widget.DrawerLayout
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.setupWithNavController
import com.egobook.app.databinding.ActivityMainBinding
import com.google.android.gms.ads.AdRequest
import com.google.android.gms.ads.LoadAdError
import com.google.android.gms.ads.MobileAds
import com.google.android.gms.ads.rewarded.RewardedAd
import com.google.android.gms.ads.rewarded.RewardedAdLoadCallback
import com.google.android.gms.ads.rewarded.ServerSideVerificationOptions
import dagger.hilt.android.AndroidEntryPoint


Expand All @@ -19,9 +26,17 @@ class MainActivity : AppCompatActivity(), BlurController, NotificationController
ActivityMainBinding.inflate(layoutInflater)
}

private var rewardedAd: RewardedAd? = null
private val adUnitId = "ca-app-pub-3940256099942544/5224354917"

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()

MobileAds.initialize(this) {}

loadAd()

applyDefaultInsets(binding.main)
applyDefaultInsets(binding.fcvNotificationDrawer)
setContentView(binding.root)
Expand Down Expand Up @@ -75,6 +90,42 @@ class MainActivity : AppCompatActivity(), BlurController, NotificationController
}
}

private fun loadAd() {
val adRequest = AdRequest.Builder().build()
RewardedAd.load(this, adUnitId, adRequest, object : RewardedAdLoadCallback() {
override fun onAdFailedToLoad(adError: LoadAdError) {
rewardedAd = null
Log.d("AdMob", "광고 로드 실패")
}

override fun onAdLoaded(ad: RewardedAd) {
rewardedAd = ad
Log.d("AdMob", "광고 로드 성공!")
}
})
}

fun showAd(userId: String, onAdClosed: () -> Unit) {
if (rewardedAd != null) {

val ssvOptions = ServerSideVerificationOptions.Builder()
.setUserId(userId)

rewardedAd?.setServerSideVerificationOptions(ssvOptions.build())

rewardedAd?.show(this) { rewardItem ->
val rewardAmount = rewardItem.amount
val rewardType = rewardItem.type
Log.d("jang", "보상 지급! (서버로 콜백 날아감), $rewardType, rewardAmout: $rewardAmount")
}
onAdClosed()
rewardedAd = null
loadAd()
} else {
Log.d("jang", "아직 광고가 준비 안 됐어요. 잠시 후 다시 시도해주세요.")
}
}

override fun activateBlur(blurLevel: BlurLevel) {
binding.blurView.apply {
setBlurEnabled(true)
Expand All @@ -93,4 +144,5 @@ class MainActivity : AppCompatActivity(), BlurController, NotificationController
override fun closerDrawer() {
binding.root.closeDrawer(binding.fcvNotificationDrawer)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.egobook.app.ui.home.repository.NetworkHomeNotificationRepository
import com.egobook.app.ui.home.repository.NetworkTendencyLevelService
import com.egobook.app.ui.home.repository.NetworkUserRepository
import com.egobook.app.ui.home.repository.UserActivityRepository
import com.egobook.app.ui.home.repository.UserAdRepository
import com.egobook.app.ui.home.repository.UserPsychologyRepository
import com.egobook.app.ui.home.repository.UserRepository
import com.egobook.app.ui.home.repository.UserTendencyRepository
Expand Down Expand Up @@ -84,6 +85,10 @@ abstract class RepositoryModule {
@Singleton
abstract fun bindActivityRecordRepository(impl: NetworkUserRepository): UserActivityRepository

@Binds
@Singleton
abstract fun bindAdRepository(impl: NetworkUserRepository): UserAdRepository

@Binds
@Singleton
abstract fun bindPsychologyRepository(impl: NetworkUserRepository): UserPsychologyRepository
Expand Down
37 changes: 31 additions & 6 deletions app/src/main/java/com/egobook/app/ui/home/HomeViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package com.egobook.app.ui.home
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.egobook.app.ui.home.repository.AdInfoDto
import com.egobook.app.ui.home.repository.UserAdRepository
import com.egobook.app.ui.home.repository.UserPsychologyRepository
import com.egobook.app.ui.home.repository.UserRepository
import com.egobook.app.ui.home.user.Ink
Expand All @@ -11,8 +13,10 @@ import com.egobook.app.ui.home.user.User
import com.egobook.app.ui.shop.CustomItem
import com.egobook.app.ui.shop.StoreRepository
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import javax.inject.Inject
Expand All @@ -21,20 +25,26 @@ import javax.inject.Inject
class HomeViewModel @Inject constructor(
private val userRepository: UserRepository,
private val storeRepository: StoreRepository,
private val userAdRepository: UserAdRepository,
private val psychologyRepository: UserPsychologyRepository
) : ViewModel() {
private val _uiState = MutableStateFlow(User(id=-1, Level(1), Ink(0)))
val uiState: StateFlow<User> = _uiState.asStateFlow()

private val _adState = MutableStateFlow(AdInfoDto(0, 0, false, 0, ""))
val adState: StateFlow<AdInfoDto> = _adState.asStateFlow()

private val _equippedItems = MutableStateFlow<List<CustomItem>>(emptyList())
val equippedItems: StateFlow<List<CustomItem>> = _equippedItems

private val _dailyPhycologyReadState = MutableStateFlow(false)
val dailyPhycologyReadState = _dailyPhycologyReadState.asStateFlow()

init {
fetchUser()
fetchEquipItems()
fetchDailyPhycologyReadState()
}
private val _uiState = MutableStateFlow(User(Level(1), Ink(0)))
val uiState: StateFlow<User> = _uiState.asStateFlow()
private val _dailyPhycologyReadState = MutableStateFlow(false)
val dailyPhycologyReadState = _dailyPhycologyReadState.asStateFlow()
private val _equippedItems = MutableStateFlow<List<CustomItem>>(emptyList())
val equippedItems: StateFlow<List<CustomItem>> = _equippedItems

fun fetchEquipItems() {
viewModelScope.launch {
Expand All @@ -58,4 +68,19 @@ class HomeViewModel @Inject constructor(
}
}
}

fun loadCurrentAdInfo() {
viewModelScope.launch {
val adInfo = userAdRepository.loadAdInfo()
_adState.value = adInfo
}
}

fun watchAd() {
viewModelScope.launch {
val message = userAdRepository.watchAd()
fetchUser()
Log.d("HomeViewModel", "Ad watched: $message")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.egobook.app.ui.home.user.Level
import com.egobook.app.ui.home.user.User

data class UserDto(
val userId: Int,
val nickname: String,
val level: Int,
val ink: Int,
Expand All @@ -13,5 +14,5 @@ data class UserDto(
val isFirstAttendanceToday: Boolean,
val attendanceRewardInk: Int
) {
fun toDomain(): User = User(Level(level), Ink(ink))
fun toDomain(): User = User(id = userId, Level(level), Ink(ink))
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,22 @@ import com.egobook.app.di.qualifier.BackendApi
import com.egobook.app.ui.home.user.Tendency
import com.egobook.app.ui.home.user.User
import retrofit2.Retrofit
import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.POST
import javax.inject.Inject
import javax.inject.Singleton

interface UserRepository {
suspend fun load(): User
}

interface UserAdRepository {
suspend fun loadAdInfo(): AdInfoDto

suspend fun watchAd(): String
}

interface UserTendencyRepository {
suspend fun loadTendencies(): List<Tendency>
}
Expand All @@ -32,6 +40,36 @@ interface NetworkTendencyLevelService {
suspend fun loadTendencyLevels(): BaseResponse<TendencyLevels>
}

data class AdRequestDto(
val rewardType: String,
val targetId: Int?,
val adUnitId: String = "ca-app-pub-test/12345"
)

data class AdResponseDto(
val code: String,
val message: String,
val status: Int
)

interface NetworkAdService {
@GET("/ads/info")
suspend fun loadAdInfo(): BaseResponse<AdInfoDto>

@POST("/ads/testReward")
suspend fun watchAd(
@Body adRequest: AdRequestDto
): AdResponseDto
}

data class AdInfoDto(
val currentViewCount: Int,
val maxLimit: Int,
val isAvailable: Boolean,
val rewardPerAd: Int,
val message: String
)

data class PsychologyStateDto(
val isBottleVisible: Boolean
)
Expand Down Expand Up @@ -68,11 +106,13 @@ interface NetworkPsychologyService {
@Singleton
class NetworkUserRepository @Inject constructor(
@BackendApi private val retrofit: Retrofit
) : UserRepository, UserTendencyRepository, UserActivityRepository, UserPsychologyRepository {
) : UserRepository, UserTendencyRepository, UserActivityRepository, UserPsychologyRepository, UserAdRepository {
private val userService by lazy { retrofit.create(NetworkUserService::class.java) }
private val tendencyLevelService by lazy { retrofit.create(NetworkTendencyLevelService::class.java) }
private val activityRecordService by lazy { retrofit.create(NetworkActivityRecordService::class.java) }

private val networkAdService by lazy { retrofit.create(NetworkAdService::class.java) }

private val psychologyService by lazy { retrofit.create(NetworkPsychologyService::class.java) }

override suspend fun load(): User {
Expand All @@ -92,6 +132,20 @@ class NetworkUserRepository @Inject constructor(
return activityRecordResponse.data.toDomain()
}

override suspend fun loadAdInfo(): AdInfoDto {
val adInfoResponse: BaseResponse<AdInfoDto> = networkAdService.loadAdInfo()
return adInfoResponse.data
}

override suspend fun watchAd(): String {
val watchingAdResponse = networkAdService.watchAd(
AdRequestDto(
"INK", null
)
)
return watchingAdResponse.message
}

override suspend fun isReadDailyPsychology(): Boolean {
val psychologyResponse: BaseResponse<PsychologyStateDto> =
psychologyService.isReadDailyPsychology()
Expand All @@ -104,4 +158,5 @@ class NetworkUserRepository @Inject constructor(
psychologyService.loadDailyPsychology()
return psychologyResponse.data
}

}
Loading