Commit cb689ca2 authored by wanglei's avatar wanglei

同步问题

parent cf5195b1
......@@ -3,6 +3,7 @@ plugins {
id 'org.jetbrains.kotlin.android'
id 'com.google.gms.google-services'
id 'kotlin-kapt'
id 'com.google.firebase.crashlytics'
}
android {
......
......@@ -8,7 +8,6 @@
"Uninstall": "\u0783\u07a1\u0799\u0780\u079b_D",
"Scan app\\n...": "\u0791\u0791\u0780\u0784\u078e_D",
"Analyzing battery status": "\u078a\u0791\u078e\u0791\u078f_D",
"Optimization completed": "\u078a\u0786\u07a4\u0789\u0783_D",
"Battery Info": "\u0788\u0786\u0789\u0782\u079a_D",
"85%": "\u0797\u078d\u0788\u0798\u0795_D",
"25\u00b0C": "\u078b\u0783\u0795\u078f\u0794_D",
......@@ -275,7 +274,6 @@
"Battery scan completed.": "\u079a\u0786\u079e\u0783\u079f_D",
"last_use_battery_info": "\u079f\u0793\u0797\u079b\u0793_D",
"Compress %s photo, %s space freed": "\u07a4\u0783\u0780\u0797\u078f_D",
"Optimization completed": "\u078d\u0782\u07a0\u07a1\u079b_D",
"onecle_sao_miao/images/": "\u0784\u079b\u0780\u0799\u07a2_D",
"onecle_sao_miao/data.json": "\u0796\u079c\u0799\u0792\u0790_D",
"one_speak_clean/images/": "\u0787\u0783\u079f\u0792\u07a2_D",
......@@ -814,7 +812,6 @@
"Last Used": "iNreQQfrnbJBbHCYIQPeL8aQS6iCRd4TTgjrqjQonn+Qwwp0bg==",
"Scan app\\n...": "35PKMIpnEso+AdOdJYNXClh/W3tKNA8tkKnWk8bTPGBNyGeAT9qBQqo=",
"Analyzing battery status": "np81yCkw9P2zWl+qgnNn1rrTBQdZJKba3DaaHtYVeJv64P9vLTuwjhac0HzhgcrHHXm5wQ==",
"Optimization completed": "D7CgDfB5iEg5XbVI9YkEnZJNuOzQEZLow2rmNP9srp2gixmHDfJ0VM0D8Sd0bJtGdBo=",
"85%": "8n+RZsmX8DlyncaIvzLwyFvt+e6W4XnMtAf30d9tsA==",
"25\u00b0C": "VlsikoTiKeUb6P3qlXP8DZBBXlVfcWXwZrx3dCpNJDVb",
"2500mAh": "Y8L9BuboNORBxK8BvI7ifyP3hzs8CWxJ1uSTYdYQRT8F4dg=",
......
......@@ -124,8 +124,8 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>() {
private inner class BatteryReceiver : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
val current = intent?.extras!!.getInt("level")
val total = intent.extras!!.getInt("scale")
val current = intent?.extras?.getInt("level") ?: 0
val total = intent?.extras?.getInt("scale") ?: 0
val percent = current * 100 / total
if (percent >= 30) {
binding.imagePower.setImageResource(R.drawable.batteryl)
......@@ -263,4 +263,8 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>() {
result1.launch(intent2)
}
override fun onDestroy() {
super.onDestroy()
unregisterReceiver(receiver);
}
}
\ No newline at end of file
......@@ -54,7 +54,7 @@ import java.io.File
* 大文件清理
*/
class LargeFileCleanActivity : BaseActivity<ActivityLayoutLargeFileBinding>() {
override val isLightMode =true
override val isLightMode = true
private val TAG = "LargeFileCleanActivity"
private val listTypes = listOf(
Filter(KEY_ALL_TYPES, true),
......@@ -164,7 +164,6 @@ class LargeFileCleanActivity : BaseActivity<ActivityLayoutLargeFileBinding>() {
binding.tvType.text = fileType
binding.tvSize.text = filterSize
binding.tvTime.text = filterTime
checkPermission()
val flag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
Environment.isExternalStorageManager()
......@@ -175,7 +174,9 @@ class LargeFileCleanActivity : BaseActivity<ActivityLayoutLargeFileBinding>() {
isplay += 1
playLottie()
}
checkPermission()
}
var isplay = 0
override fun onPermissionsResult(isGranted: Boolean) {
super.onPermissionsResult(isGranted)
......
package com.base.superfilemanager.activity
import android.annotation.SuppressLint
import android.content.Intent
import android.graphics.Color
import androidx.activity.OnBackPressedCallback
......@@ -32,6 +33,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
}
private lateinit var adapter: AppFunctionAdapter
@SuppressLint("SetTextI18n", "NotifyDataSetChanged")
override fun initView() {
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.clTop.updatePadding(top = BarUtils.getStatusBarHeight())
......@@ -149,20 +151,17 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
PHOTO_COMPRESS -> {
binding.tvInfo.text =
"Compress ${intent.getIntExtra("num", 0)} photo, ${
intent.getLongExtra(
"size",
0L
).toFormatSize(1)
} space freed"
"Compress ${intent.getIntExtra("num", 0)} photo, " +
"${intent.getLongExtra("size", 0L).toFormatSize(1)} " +
"space freed"
}
BATTERY_OPTIMIZER -> {
binding.tvInfo.text = "Optimization completed"
binding.tvInfo.text = "Completed"
}
APP_SPEED -> {
binding.tvInfo.text = "Optimization completed"
binding.tvInfo.text = "Completed"
}
......
......@@ -25,7 +25,7 @@ class ProgressManager {
private fun initView() {
val loadTime = SPUtils.getInstance().getInt("loading_page_time", 9)
val loadTime = SPUtils.getInstance().getInt("loading_page_time", 15)
binding.pb.max = loadTime
binding.pb.progress = 0
......
......@@ -15,7 +15,6 @@ import com.base.superfilemanager.activity.ScanJunkActivity
import com.base.superfilemanager.activity.SpeakerCleanerActivity
import com.base.superfilemanager.activity.photocompress.photo.StartCompressionPhotoActivity
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_APP_MANAGER
//import com.base.superfilemanager.bean.ConfigBean.Companion.ID_BATTERY_OPTIMIZATION
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_CHARGE
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_CLEAN_NOTIFICATION
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_CLEAN_SPEAKER
......@@ -24,12 +23,10 @@ import com.base.superfilemanager.bean.ConfigBean.Companion.ID_JUNK_CLEAN_PUSH
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_LARGE_FILE_PUSH
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_LOW_BATTERY_PUSH
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_NETWORK_TRAFFIC
//import com.base.superfilemanager.bean.ConfigBean.Companion.ID_PHONE_ACCELERATE
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_PHOTO_COMPRESS
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_RECENT_USE_APP
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_UNINSTALL_PACKAGE_PUSH
//import com.base.superfilemanager.bean.ConfigBean.Companion.ID_VIRUS_PUSH
import com.base.superfilemanager.helps.ConfigHelper
import com.base.superfilemanager.helps.EventHelper
import com.base.superfilemanager.notificationclean.NotificationCleanActivity
......@@ -95,10 +92,6 @@ object SplashJumpUtils {
context.startActivity(Intent(context, SpeakerCleanerActivity::class.java))
}
// ID_BATTERY_OPTIMIZATION -> {
// context.startActivity(Intent(context, BatteryOptimizerActivity::class.java))
// }
//================================被动广播=========================================
ID_INSTALL_PACKAGE_PUSH -> {
......
......@@ -40,7 +40,6 @@ data class ConfigBean(
const val ID_JUNK_CLEAN_PUSH = 11001 //清理垃圾
const val ID_BOOST_PUSH = 11002 //性能优化
// const val ID_VIRUS_PUSH = 11003//扫描病毒,trustlook目前不加
const val ID_BATTERY_PUSH = 11004// 电量信息
const val ID_COOL_PUSH = 11005//手机降温
const val ID_LARGE_FILE_PUSH = 11006// 大文件清理
......@@ -54,7 +53,6 @@ data class ConfigBean(
const val ID_RECENT_USE_APP = 11014//最近使用APP
const val ID_SIMILAR_IMAGE = 11015//清理相似图片
const val ID_CLEAN_SPEAKER = 11016//清理扬声器
// const val ID_BATTERY_OPTIMIZATION = 11017//电池优化,目前是虚假功能
//场景触发push actionId 被动发送
const val ID_WIFI_PUSH = 22001//连接wifi时
......@@ -63,7 +61,6 @@ data class ConfigBean(
const val ID_CHARGE = 22004//充电
const val ID_LOW_BATTERY_PUSH = 22005//电量低于阈值时
const val ID_LOW_RAM_PUSH = 22007//内存低于阈值
// const val ID_PHONE_ACCELERATE = 22011//手机加速,目前是虚假功能
fun ConfigBean.getActionPushInterval(actionId: Int): Int {
val interval = when (actionId) {
......@@ -83,14 +80,12 @@ data class ConfigBean(
ID_RECENT_USE_APP -> push_interval_11014
ID_SIMILAR_IMAGE -> push_interval_11015
ID_CLEAN_SPEAKER -> push_interval_11016
// ID_BATTERY_OPTIMIZATION -> push_interval_11017
ID_WIFI_PUSH -> push_interval_22001
ID_INSTALL_PACKAGE_PUSH -> push_interval_22002
ID_UNINSTALL_PACKAGE_PUSH -> push_interval_22003
ID_CHARGE -> push_interval_22004
ID_LOW_BATTERY_PUSH -> push_interval_22005
ID_LOW_RAM_PUSH -> push_interval_22007
// ID_PHONE_ACCELERATE -> push_interval_22011
else -> 0
}
return interval
......
......@@ -17,7 +17,6 @@ import com.google.gson.reflect.TypeToken
import com.base.superfilemanager.R
import com.base.superfilemanager.activity.splash.NewSplashActivity
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_APP_MANAGER
//import com.base.superfilemanager.bean.ConfigBean.Companion.ID_BATTERY_OPTIMIZATION
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_BATTERY_PUSH
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_CHARGE
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_CLEAN_NOTIFICATION
......@@ -27,12 +26,10 @@ import com.base.superfilemanager.bean.ConfigBean.Companion.ID_JUNK_CLEAN_PUSH
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_LARGE_FILE_PUSH
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_LOW_BATTERY_PUSH
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_NETWORK_TRAFFIC
//import com.base.superfilemanager.bean.ConfigBean.Companion.ID_PHONE_ACCELERATE
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_PHOTO_COMPRESS
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_RECENT_USE_APP
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
import com.base.superfilemanager.bean.ConfigBean.Companion.ID_UNINSTALL_PACKAGE_PUSH
//import com.base.superfilemanager.bean.ConfigBean.Companion.ID_VIRUS_PUSH
import com.base.superfilemanager.helps.BaseApplication
import com.base.superfilemanager.helps.ComUtils
import com.base.superfilemanager.helps.EventHelper
......
......@@ -8,15 +8,12 @@ import android.os.StatFs
import android.util.Log
import android.view.animation.LinearInterpolator
import android.widget.ScrollView
import androidx.core.view.isVisible
import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope
import com.blankj.utilcode.util.BarUtils
import com.blankj.utilcode.util.SPUtils
import com.base.superfilemanager.activity.AppManagerActivity
import com.base.superfilemanager.activity.BatteryInfoActivity
import com.base.superfilemanager.activity.LargeFileCleanActivity
import com.base.superfilemanager.activity.MainActivity
import com.base.superfilemanager.activity.NetWorkActivity
import com.base.superfilemanager.activity.RecentAppActivity
import com.base.superfilemanager.activity.RepeaterdPhotoActivity
......@@ -32,9 +29,7 @@ import com.base.superfilemanager.notificationclean.NotificationCleanActivity
import com.base.superfilemanager.notificationclean.NotificationGuestActivity
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlin.random.Random
class HomeFragment : BaseFragment<FragmentLayoutHomeBinding>() {
......
......@@ -90,4 +90,5 @@ class ToolsFragment : BaseFragment<FragmentLayoutToolsBinding>() {
override fun onResume() {
super.onResume()
}
}
\ No newline at end of file
......@@ -5,10 +5,11 @@ import android.content.Context
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.view.LayoutInflater
import com.blankj.utilcode.util.ClickUtils
import com.blankj.utilcode.util.SpanUtils
import com.base.superfilemanager.R
import com.base.superfilemanager.databinding.DialogLayoutFlowTypeBinding
import com.base.superfilemanager.databinding.DialogPermissonOpenBinding
import com.blankj.utilcode.util.ClickUtils
import com.blankj.utilcode.util.SpanUtils
object DialogViews {
......@@ -21,8 +22,9 @@ object DialogViews {
dialog.setCanceledOnTouchOutside(false)
dialog.setCancelable(false)
dialog.setContentView(binding.root)
val str=context.resources.getString(R.string.app_name)
SpanUtils.with(binding.idTvTt)
.append("Allow File Manager Select to access ")
.append("Allow $str to access ")
.setFontSize(13, true)
.setForegroundColor(0xFF999999.toInt())
.append("All Files Access ")
......
......@@ -85,7 +85,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="296dp"
android:text="Optimization completed"
android:text="Completed"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold"
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0ec897">
......@@ -17,13 +18,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="296dp"
android:text="Optimization completed"
android:text="Completed"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -8,7 +8,6 @@
"Uninstall": "\u0783\u07a1\u0799\u0780\u079b_D",
"Scan app\\n...": "\u0791\u0791\u0780\u0784\u078e_D",
"Analyzing battery status": "\u078a\u0791\u078e\u0791\u078f_D",
"Optimization completed": "\u078a\u0786\u07a4\u0789\u0783_D",
"Battery Info": "\u0788\u0786\u0789\u0782\u079a_D",
"85%": "\u0797\u078d\u0788\u0798\u0795_D",
"25\u00b0C": "\u078b\u0783\u0795\u078f\u0794_D",
......@@ -275,7 +274,6 @@
"Battery scan completed.": "\u079a\u0786\u079e\u0783\u079f_D",
"last_use_battery_info": "\u079f\u0793\u0797\u079b\u0793_D",
"Compress %s photo, %s space freed": "\u07a4\u0783\u0780\u0797\u078f_D",
"Optimization completed": "\u078d\u0782\u07a0\u07a1\u079b_D",
"onecle_sao_miao/images/": "\u0784\u079b\u0780\u0799\u07a2_D",
"onecle_sao_miao/data.json": "\u0796\u079c\u0799\u0792\u0790_D",
"one_speak_clean/images/": "\u0787\u0783\u079f\u0792\u07a2_D",
......@@ -814,7 +812,6 @@
"Last Used": "iNreQQfrnbJBbHCYIQPeL8aQS6iCRd4TTgjrqjQonn+Qwwp0bg==",
"Scan app\\n...": "35PKMIpnEso+AdOdJYNXClh/W3tKNA8tkKnWk8bTPGBNyGeAT9qBQqo=",
"Analyzing battery status": "np81yCkw9P2zWl+qgnNn1rrTBQdZJKba3DaaHtYVeJv64P9vLTuwjhac0HzhgcrHHXm5wQ==",
"Optimization completed": "D7CgDfB5iEg5XbVI9YkEnZJNuOzQEZLow2rmNP9srp2gixmHDfJ0VM0D8Sd0bJtGdBo=",
"85%": "8n+RZsmX8DlyncaIvzLwyFvt+e6W4XnMtAf30d9tsA==",
"25\u00b0C": "VlsikoTiKeUb6P3qlXP8DZBBXlVfcWXwZrx3dCpNJDVb",
"2500mAh": "Y8L9BuboNORBxK8BvI7ifyP3hzs8CWxJ1uSTYdYQRT8F4dg=",
......
buildscript {
dependencies {
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
}
}
plugins {
......
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