From cecdb8d187032faff851d143470bab1d3f1018cc Mon Sep 17 00:00:00 2001 From: ocean <503259349@qq.com> Date: Thu, 20 Nov 2025 18:17:51 +0800 Subject: [PATCH] update --- .../pdf/reader/ui/act/MainActivity.kt | 19 +----------------- .../pdf/reader/ui/act/MergePdfActivity.kt | 20 +++---------------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt index 84421e4..8464007 100644 --- a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt @@ -60,7 +60,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback super.onCreate(savedInstanceState) binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_ACTIVITY_VISIBLE) setupDoubleBackExit() initObserve() setupImmersionBar { @@ -162,7 +161,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback event.deleteResult?.let { if (event.deleteResult.success) { showToast(getString(R.string.delete_successfully)) - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_DEL_SUC) } else { showToast(event.deleteResult.errorMessage.toString()) } @@ -184,7 +182,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback binding.switchScreenOn.setChecked(appStore.keepScreenOn) binding.homeLlBtn.setOnSingleClickListener { - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_CK) switchFragment(homeFragment) } binding.recentlyLlBtn.setOnSingleClickListener { switchFragment(recentlyFragment) } @@ -212,7 +209,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback binding.multiSelectBtn.setOnClickListener { when (activeFragment) { is HomeFrag -> { - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL) (activeFragment as HomeFrag).setupMultiSelect() } @@ -245,7 +241,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback } binding.multiSelectDeleteBtn.setOnSingleClickListener { - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SELL_CK) val selectedItems = homeFragment.adapter.getSelectedItems() if (selectedItems.isNotEmpty()) { val filesToDelete = selectedItems.map { File(it.filePath) } @@ -257,11 +252,9 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback } PromptDialogFragment( title, desc, onOkClick = { - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_DEL_CONF) viewModel.deleteFiles(filesToDelete) exitAllMultiSelect() }, onCancelClick = { - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_DEL_CANC) }).show(supportFragmentManager, "deleteFiles") } } @@ -273,17 +266,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback else -> emptyList() } if (selectedItems.isNotEmpty()) { - var from = "" - when (activeFragment) { - is HomeFrag -> { - from = HomeFrag.FRAG_TAG - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_CK) - } - - is FavoriteFrag -> {} - is RecentlyFrag -> {} - } - val intent = MergePdfActivity.createIntent(this, ArrayList(selectedItems), from) + val intent = MergePdfActivity.createIntent(this, ArrayList(selectedItems)) startActivity(intent) exitAllMultiSelect() } diff --git a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MergePdfActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MergePdfActivity.kt index 1890261..7eb5a89 100644 --- a/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MergePdfActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MergePdfActivity.kt @@ -17,7 +17,9 @@ import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment +import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag +import com.all.pdfreader.pdf.reader.ui.fragment.RecentlyFrag import com.all.pdfreader.pdf.reader.util.AnalyticsUtils import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener @@ -166,30 +168,14 @@ class MergePdfActivity : BaseActivity() { override fun shouldInterceptBackPress(): Boolean = true override fun onInterceptBackPressed() { - when(from){ - HomeFrag.FRAG_TAG->{ - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_EDIT_BACK_CK) - } - } - PromptDialogFragment( getString(R.string.exit_merge), getString(R.string.confirm_discard_changes), getString(R.string.discard), onOkClick = { - when(from){ - HomeFrag.FRAG_TAG->{ - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_EDIT_LEA_CONF) - } - } backPressedCallback?.isEnabled = false onBackPressedDispatcher.onBackPressed() }, onCancelClick = { - when(from){ - HomeFrag.FRAG_TAG->{ - AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_EDIT_LEA_CANC) - } - } }).show(supportFragmentManager, getString(R.string.exit_merge)) } @@ -203,7 +189,7 @@ class MergePdfActivity : BaseActivity() { fun createIntent( context: Context, list: ArrayList, - from: String + from: String? = null ): Intent { return Intent(context, MergePdfActivity::class.java).apply { putParcelableArrayListExtra(EXTRA_PDF_LIST, list)