Commit 36ddaf9e authored by wanglei's avatar wanglei

...

parent 0e1e181b
......@@ -30,8 +30,8 @@ import com.base.appzxhy.bean.config.AdConfigBean
import com.base.appzxhy.bean.config.ConfigBean
import com.base.appzxhy.bean.config.PopupConfigBean
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.business.push.fcm.FCMManager
import com.base.appzxhy.business.push.notification.MyNotificationManager
import com.base.appzxhy.push.fcm.FCMManager
import com.base.appzxhy.push.receiver.AlarmReceiver.Companion.startAlarm
import com.base.appzxhy.push.receiver.ScreenStatusReceiver
import com.base.appzxhy.push.timer.TimerManager.Companion.changeTimer
......@@ -61,7 +61,6 @@ class MyApplication : Application() {
)
}
override fun onCreate() {
super.onCreate()
appContext = this
......
......@@ -80,5 +80,14 @@ object SpConstObject {
AppPreferences.getInstance().put("mainPageCount", value, true)
}
//fcm token
var fcmToken = ""
get() {
return AppPreferences.getInstance().getString("fcmToken", field)
}
set(value) {
field = value
AppPreferences.getInstance().put("fcmToken", value, true)
}
}
\ No newline at end of file
......@@ -32,14 +32,18 @@ import com.airbnb.lottie.LottieAnimationView
import com.base.appzxhy.SpConstObject.appLanguageCountrySp
import com.base.appzxhy.SpConstObject.appLanguageSp
import com.base.appzxhy.R
import com.base.appzxhy.base.goToAc
import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO
import com.base.appzxhy.bean.FeatureBean.Companion.JUNK_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.LARGE_FILE_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.PHOTO_COMPRESSION
import com.base.appzxhy.bean.FeatureBean.Companion.RECOVERY_AUDIOS
import com.base.appzxhy.bean.FeatureBean.Companion.RECOVERY_DOCUMENTS
import com.base.appzxhy.bean.FeatureBean.Companion.RECOVERY_PHOTOS
import com.base.appzxhy.bean.FeatureBean.Companion.RECOVERY_VIDEOS
import com.base.appzxhy.bean.FeatureBean.Companion.SCREENSHOT_CLEAN
import com.base.appzxhy.bean.FeatureBean.Companion.SIMILAR_PHOTOS
import com.base.appzxhy.bean.FileBean
import com.base.appzxhy.bean.SimilarBean
import com.base.appzxhy.bean.config.AdConfigBean
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.business.ads.AdsShowCallBack
......@@ -51,6 +55,11 @@ import com.base.appzxhy.ui.dialog.FunctionBackDialog
import com.base.appzxhy.ui.largefile.LargeFileCleanActivity
import com.base.appzxhy.ui.main.MainActivity
import com.base.appzxhy.ui.photocompression.PhotoCompressionActivity
import com.base.appzxhy.ui.recovery.FileScanResultActivity
import com.base.appzxhy.ui.recovery.FileScanResultActivity.Companion.SCAN_AUDIOS
import com.base.appzxhy.ui.recovery.FileScanResultActivity.Companion.SCAN_DOCUMENTS
import com.base.appzxhy.ui.recovery.FileScanResultActivity.Companion.SCAN_PHOTOS
import com.base.appzxhy.ui.recovery.FileScanResultActivity.Companion.SCAN_VIDEOS
import com.base.appzxhy.ui.recyclebin.RecycleBinUtils
import com.base.appzxhy.ui.screenshot.ScreenshotCleanActivity
import com.base.appzxhy.ui.similar.SimilarPhotosActivity
......@@ -450,6 +459,30 @@ fun Activity.jumpAction(key: String) {
PHOTO_COMPRESSION -> {
goToAc(PhotoCompressionActivity::class.java)
}
RECOVERY_PHOTOS -> {
goToAc(FileScanResultActivity::class.java, exb = {
putExtra("ScanType", SCAN_PHOTOS)
})
}
RECOVERY_VIDEOS -> {
goToAc(FileScanResultActivity::class.java, exb = {
putExtra("ScanType", SCAN_VIDEOS)
})
}
RECOVERY_DOCUMENTS -> {
goToAc(FileScanResultActivity::class.java, exb = {
putExtra("ScanType", SCAN_DOCUMENTS)
})
}
RECOVERY_AUDIOS -> {
goToAc(FileScanResultActivity::class.java, exb = {
putExtra("ScanType", SCAN_AUDIOS)
})
}
}
}
......
......@@ -15,5 +15,10 @@ class FeatureBean(
const val LARGE_FILE_CLEAN = "large_file_clean"
const val PHOTO_COMPRESSION = "photo_compression"
const val SIMILAR_PHOTOS = "similar_photos"
const val RECOVERY_PHOTOS="recovery_photos"
const val RECOVERY_VIDEOS="recovery_videos"
const val RECOVERY_AUDIOS="recovery_audios"
const val RECOVERY_DOCUMENTS="recovery_documents"
}
}
\ No newline at end of file
......@@ -22,8 +22,8 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfo2Binding>(ActivityBa
BatteryInfoBean(R.drawable.icon_voltage, "3.6V", "Voltage"),
BatteryInfoBean(R.drawable.icon_technology, "Li-Poly", "Technology"),
BatteryInfoBean(R.drawable.icon_battery, "0mAh", "Battery Capacity"),
BatteryInfoBean(R.drawable.icon_electric_current, "0mA", "Electric Current"),
BatteryInfoBean(R.drawable.icon_current_average, "0mA", "Current Average"),
BatteryInfoBean(R.drawable.icon_electric_current, "NA", "Electric Current"),
BatteryInfoBean(R.drawable.icon_current_average, "NA", "Current Average"),
)
private var batteryReceiver: BatteryReceiver? = null
......
......@@ -36,7 +36,7 @@ class RecoveryFragment : BaseFragment<FragmentRecoveryBinding>(FragmentRecoveryB
putExtra("ScanType", SCAN_DOCUMENTS)
}
}
binding.llDocument.setOnClickListener {
binding.llAudio.setOnClickListener {
goToAc(FileScanResultActivity::class.java) {
putExtra("ScanType", SCAN_AUDIOS)
}
......
......@@ -26,6 +26,7 @@ class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>(Activit
@SuppressLint("SetTextI18n")
override fun initView() {
super.initView()
val number = intent.extras?.getInt("Number") ?: 0
val scanType = intent.extras?.getInt("ScanType")
......
......@@ -45,6 +45,7 @@ import kotlinx.coroutines.launch
import java.io.File
import java.util.LinkedList
import androidx.core.net.toUri
import androidx.core.graphics.drawable.toDrawable
class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>(ActivityFileScanResultBinding::inflate) {
......@@ -54,17 +55,12 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>(Activ
private lateinit var fileFolderAdapter: FileFolderAdapter
override fun useDefaultImmersive() {
enableEdgeToEdge(SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT))
ViewCompat.setOnApplyWindowInsetsListener(binding.clTop) { v, insets ->
val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
insets
}
super.useDefaultImmersive()
}
@SuppressLint("SetTextI18n")
override fun initView() {
super.initView()
scanType = intent.extras?.getInt("ScanType") ?: 0
// LogEx.logDebug(TAG, "scanType=$scanType")
......@@ -363,7 +359,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>(Activ
val dialog = Dialog(this)
val binding = DialogExitFunctionBinding.inflate(LayoutInflater.from(this))
dialog.requestWindowFeature(1)
dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
dialog.window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
dialog.window?.setLayout(-1, -1)
dialog.setContentView(binding.root)
dialog.show()
......
......@@ -3,6 +3,7 @@ package com.base.appzxhy.ui.set
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.view.View
import com.base.appzxhy.BuildConfig
import com.base.appzxhy.GlobalConfig.URL_PRIVACY
import com.base.appzxhy.SpConstObject.cleanedSize
......@@ -12,9 +13,12 @@ import com.base.appzxhy.utils.KotlinExt.toFormatSize
import androidx.core.net.toUri
import androidx.core.view.updatePadding
import com.base.appzxhy.R
import com.base.appzxhy.SpConstObject.fcmToken
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.ui.dialog.RateDialog
import com.base.appzxhy.utils.ClipboardUtils.copyText
import com.base.appzxhy.utils.MyAnimationUtils
import com.base.appzxhy.utils.ToastUtils.toast
class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsBinding::inflate) {
......@@ -33,11 +37,18 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsB
override fun initView() {
super.initView()
binding.tvVersion.text = "v${BuildConfig.VERSION_NAME}"
MyAnimationUtils.rotation(binding.ivBlade)
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom)
if (BuildConfig.DEBUG) {
binding.tvToken.visibility = View.VISIBLE
binding.tvToken.text = fcmToken
binding.tvToken.setOnClickListener {
requireContext().copyText("token", fcmToken)
requireContext().toast("copy token")
}
}
}
override fun initListener() {
......
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="28dp"
android:height="28dp"
android:viewportWidth="28"
android:viewportHeight="28">
<!-- <path-->
<!-- android:pathData="M14,14m-14,0a14,14 0,1 1,28 0a14,14 0,1 1,-28 0"-->
<!-- android:fillColor="#ffffff"/>-->
<path
android:pathData="M21.774,12.99V10.738C21.774,10.118 21.267,9.611 20.648,9.611H16.143V6.317C16.143,5.078 15.158,4.037 13.947,4.009C13.327,3.952 12.764,4.177 12.314,4.628C11.892,5.05 11.638,5.613 11.638,6.233V9.611H7.133C6.514,9.611 6.007,10.118 6.007,10.738V12.99C6.007,13.581 6.457,14.06 7.049,14.116L6.007,21.352C5.979,21.521 6.035,21.69 6.148,21.803C6.26,21.916 6.401,22 6.57,22H21.211C21.38,22 21.521,21.916 21.633,21.803C21.746,21.69 21.802,21.521 21.774,21.352L21.38,18.537C21.324,18.227 21.042,18.03 20.732,18.058C20.423,18.115 20.197,18.396 20.254,18.706L20.563,20.874H7.218L8.175,14.116H19.578L19.747,15.271C19.775,15.552 20.028,15.749 20.31,15.749H20.395C20.704,15.693 20.93,15.412 20.873,15.102L20.732,14.116C21.324,14.06 21.774,13.581 21.774,12.99ZM7.133,10.738H12.201C12.511,10.738 12.764,10.484 12.764,10.175V6.233C12.764,5.923 12.877,5.642 13.102,5.416C13.327,5.191 13.609,5.107 13.919,5.107C14.538,5.135 15.017,5.67 15.017,6.317V10.175C15.017,10.484 15.27,10.738 15.58,10.738H20.648V12.99H7.133V10.738Z"
android:fillColor="#262626"/>
<path
android:pathData="M10.512,15.721L9.949,19.1C9.892,19.41 10.118,19.691 10.399,19.748H10.484C10.765,19.748 10.99,19.551 11.047,19.269L11.61,15.89C11.666,15.581 11.441,15.299 11.159,15.243C10.85,15.186 10.568,15.412 10.512,15.721Z"
android:fillColor="#328EF6"/>
</vector>
......@@ -50,7 +50,7 @@
android:layout_width="match_parent"
android:layout_height="123dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="@dimen/dp_10"
app:cardBackgroundColor="#F0F3FA"
app:cardCornerRadius="10dp"
app:cardElevation="0dp">
......
......@@ -37,4 +37,5 @@
<dimen name="dp_55">55dp</dimen>
<dimen name="dp_6">6dp</dimen>
<dimen name="dp_345">345dp</dimen>
<dimen name="sp_15">15sp</dimen>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment