From 720df22df5c0147da81f91f273f53a9478dca651 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 21 Nov 2023 00:23:40 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B4=EB=A3=8C=20=EC=B6=A9=EC=A0=84=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 -- .../detail/AudioContentDetailActivity.kt | 6 ++- .../main/AudioContentMainFragment.kt | 5 --- .../vividnext/sodalive/main/MainActivity.kt | 37 +++--------------- .../mypage/can/status/CanStatusActivity.kt | 5 --- .../main/res/drawable-xxhdpi/ic_ads_can.png | Bin 6088 -> 0 bytes .../main/res/layout/activity_can_status.xml | 15 ------- .../layout/fragment_audio_content_main.xml | 31 ++++----------- 8 files changed, 18 insertions(+), 84 deletions(-) delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_ads_can.png 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 e4fe09ad2012232c8615ef49435f8e9a6364b752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6088 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 F{6E^_t2Y1u 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" />