diff --git a/app/build.gradle b/app/build.gradle index 396d3e6..9b52bff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -149,7 +149,4 @@ dependencies { annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' implementation "com.michalsvec:single-row-calednar:1.0.0" - - // PointClick Maven Remote Repo - implementation 'kr.co.pointclick.sdk.offerwall:pointclick-sdk-offerwall:1.0.17' } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index 4460139..0b47aae 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -97,7 +97,11 @@ class AudioContentDetailActivity : BaseActivity= Build.VERSION_CODES.TIRAMISU) { + registerReceiver(audioContentReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED) + } else { + registerReceiver(audioContentReceiver, intentFilter) + } if (refresh) { viewModel.getAudioContentDetail(audioContentId = audioContentId) { finish() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt index 85500b9..f6afef0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/AudioContentMainFragment.kt @@ -17,7 +17,6 @@ import androidx.recyclerview.widget.RecyclerView import com.zhpan.bannerview.BaseBannerAdapter import com.zhpan.indicator.enums.IndicatorSlideMode import com.zhpan.indicator.enums.IndicatorStyle -import kr.co.pointclick.sdk.offerwall.core.PointClickAd import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.all.AudioContentNewAllActivity import kr.co.vividnext.sodalive.audio_content.all.AudioContentRankingAllActivity @@ -96,10 +95,6 @@ class AudioContentMainFragment : BaseFragment( binding.swipeRefreshLayout.isRefreshing = false viewModel.getMain() } - - binding.ivCanFree.setOnClickListener { - PointClickAd.showOfferwall(requireActivity(), "무료충전") - } } private fun setupNewContentCreator() { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt index d0d795b..cc16b9d 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/main/MainActivity.kt @@ -19,8 +19,6 @@ import com.google.firebase.messaging.FirebaseMessaging import com.gun0912.tedpermission.PermissionListener import com.gun0912.tedpermission.normal.TedPermission import com.orhanobut.logger.Logger -import kr.co.pointclick.sdk.offerwall.core.PointClickAd -import kr.co.pointclick.sdk.offerwall.core.events.PackageReceiver import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity @@ -52,8 +50,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl private val handler = Handler(Looper.getMainLooper()) private val audioContentReceiver = AudioContentReceiver() - private var packageReceiver: PackageReceiver? = null - override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) executeDeeplink() @@ -67,14 +63,17 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl getMemberInfo() getEventPopup() - initPointClick() handler.postDelayed({ executeDeeplink() }, 500) } override fun onResume() { super.onResume() val intentFilter = IntentFilter(Constants.ACTION_MAIN_AUDIO_CONTENT_RECEIVER) - registerReceiver(audioContentReceiver, intentFilter) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + registerReceiver(audioContentReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED) + } else { + registerReceiver(audioContentReceiver, intentFilter) + } startService( Intent(this, AudioContentPlayService::class.java).apply { @@ -88,13 +87,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl super.onPause() } - override fun onDestroy() { - if (packageReceiver != null) { - applicationContext.unregisterReceiver(packageReceiver) - } - super.onDestroy() - } - override fun setupView() { loadingDialog = LoadingDialog(this, layoutInflater) liveFragment = LiveFragment() @@ -374,25 +366,6 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl } } - private fun initPointClick() { - try { - val intentFilter = IntentFilter() - intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED); - intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); - intentFilter.addDataScheme("package"); - - packageReceiver = PackageReceiver() - applicationContext.registerReceiver(packageReceiver, intentFilter) - } catch (e: Exception) { - e.printStackTrace() - } - - PointClickAd.init( - "fc07cfb1-ef16-455c-bdad-22aa9e8fd78c", - SharedPreferenceManager.userId.toString() - ) - } - inner class AudioContentReceiver : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { val contentId = intent?.getLongExtra(Constants.EXTRA_AUDIO_CONTENT_ID, 0) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt index 17a8cc8..3f05b57 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/status/CanStatusActivity.kt @@ -6,7 +6,6 @@ import android.os.Bundle import android.widget.Toast import androidx.activity.OnBackPressedCallback import com.google.android.material.tabs.TabLayout -import kr.co.pointclick.sdk.offerwall.core.PointClickAd import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.LoadingDialog @@ -50,10 +49,6 @@ class CanStatusActivity : BaseActivity( ) ) } - binding.tvFreeChargeCan.setOnClickListener { - PointClickAd.showOfferwall(this, "무료충전") - } - loadingDialog = LoadingDialog(this, layoutInflater) val tabs = binding.tabs diff --git a/app/src/main/res/drawable-xxhdpi/ic_ads_can.png b/app/src/main/res/drawable-xxhdpi/ic_ads_can.png deleted file mode 100644 index e4fe09a..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_ads_can.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_can_status.xml b/app/src/main/res/layout/activity_can_status.xml index df62828..272d121 100644 --- a/app/src/main/res/layout/activity_can_status.xml +++ b/app/src/main/res/layout/activity_can_status.xml @@ -173,21 +173,6 @@ android:background="@drawable/bg_top_round_corner_16_7_222222" android:paddingHorizontal="13.3dp"> - - - - - - - - + android:layout_marginHorizontal="13.3dp" + android:layout_marginStart="13.3dp" + android:layout_marginBottom="26.7dp" + android:fontFamily="@font/gmarket_sans_bold" + android:text="콘텐츠 마켓" + android:textColor="@color/color_9970ff" + android:textSize="21.3sp" />