Commit f54d085d authored by wanglei's avatar wanglei

==========合并前一天打包发现的bug=========

parent 8dd838b9
......@@ -4,6 +4,14 @@ plugins {
}
android {
signingConfigs {
realse {
storeFile file('../smartcl.jks')
storePassword '123456'
keyAlias 'key0'
keyPassword '123456'
}
}
namespace 'com.base.superfilemanager'
compileSdk 34
......@@ -13,6 +21,9 @@ android {
targetSdk 34
versionCode 1
versionName "1.0"
ndk {
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
}
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
setProperty("archivesBaseName", "superfilemanager-v${versionName}")
......@@ -20,8 +31,9 @@ android {
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.realse
}
}
compileOptions {
......@@ -33,6 +45,7 @@ android {
}
buildFeatures {
viewBinding true
buildConfig true
aidl true
}
}
......
......@@ -18,4 +18,14 @@
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
\ No newline at end of file
#-renamesourcefileattribute SourceFile
-keep class com.base.superfilemanager.bean.** {*;}
-dontoptimize
-keepattributes Signature
-keep class com.squareup.okhttp.** { *; }
-keep class com.google.gson.stream.** { *; }
-keep class com.google.gson.** { *; }
-keep class com.alibaba.idst.** { *; }
#-keep class * extends com.google.gson.reflect.TypeToken
-keepattributes AnnotationDefault, RuntimeVisibleAnnotations
-keep class com.bytedance.sdk.** { *; }
\ No newline at end of file
......@@ -10,6 +10,7 @@
tools:ignore="ScopedStorage" />
<application
android:name=".MyApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
......@@ -18,7 +19,7 @@
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/logo"
android:supportsRtl="true"
android:theme="@style/Theme.Smartfilemanager"
android:theme="@style/Theme.Superfilemanager"
tools:targetApi="31">
<activity
android:name=".activity.splash.SplashActivity"
......
......@@ -81,6 +81,8 @@ class FileCategoryActivity : BaseActivity<ActivityFileCategoryBinding>() {
override fun onPermissionsResult(isGranted: Boolean) {
if (isGranted) {
initData()
}else{
finishToMain()
}
}
......@@ -90,19 +92,21 @@ class FileCategoryActivity : BaseActivity<ActivityFileCategoryBinding>() {
binding.progressbar.visibility = View.VISIBLE
FileHelps.getFileList(
onUpdate = {
if (FileHelps.fileList.isNotEmpty()){
val temp = arrayListOf<FileBean>()
temp.addAll(FileHelps.fileList)
if (temp.isNotEmpty()) {
when (type) {
FileCategoryBean.ALL -> showList.addAll(FileHelps.fileList.filter { it.isDoc() })
XLS -> showList.addAll(FileHelps.fileList.filter { it.isXls() })
DOC -> showList.addAll(FileHelps.fileList.filter { it.isDocx() })
PDF -> showList.addAll(FileHelps.fileList.filter { it.isPdf() })
ZIP -> showList.addAll(FileHelps.fileList.filter { it.isZip() })
TXT -> showList.addAll(FileHelps.fileList.filter { it.isTxt() })
PPT -> showList.addAll(FileHelps.fileList.filter { it.isPpt() })
Video -> showList.addAll(FileHelps.fileList.filter { it.isVideo() })
Audio -> showList.addAll(FileHelps.fileList.filter { it.isAudio() })
APK -> showList.addAll(FileHelps.fileList.filter { it.isApk() })
Image -> showList.addAll(FileHelps.fileList.filter { it.isImage() })
FileCategoryBean.ALL -> showList.addAll(temp.filter { it.isDoc() })
XLS -> showList.addAll(temp.filter { it.isXls() })
DOC -> showList.addAll(temp.filter { it.isDocx() })
PDF -> showList.addAll(temp.filter { it.isPdf() })
ZIP -> showList.addAll(temp.filter { it.isZip() })
TXT -> showList.addAll(temp.filter { it.isTxt() })
PPT -> showList.addAll(temp.filter { it.isPpt() })
Video -> showList.addAll(temp.filter { it.isVideo() })
Audio -> showList.addAll(temp.filter { it.isAudio() })
APK -> showList.addAll(temp.filter { it.isApk() })
Image -> showList.addAll(temp.filter { it.isImage() })
}
if (showList.isNotEmpty()) {
binding.clOther.visibility = View.GONE
......
......@@ -49,9 +49,7 @@ class FileBrowseAdapter(private val select: (size: Int) -> Unit) : RecyclerView.
select.invoke(fileList.filter { it.isSelect }.size)
}
} else {
binding.apply {
ivSelector.isSelected = data.isSelect
}
binding.ivSelector.isSelected = data.isSelect
super.onBindViewHolder(holder, position, payloads)
}
}
......
......@@ -8,7 +8,7 @@ import javax.crypto.spec.SecretKeySpec
object AESHelper {
private const val aesKey = "tqdd8p5oplj9vj3y"
private const val aesKey = "bgp8skv94x8r420k"
private val cipher by lazy {
Cipher.getInstance("AES/GCM/NoPadding")
......
......@@ -20,7 +20,7 @@ object ConfigHelper {
const val nativeAdmobId = "ca-app-pub-3940256099942544/2247696110"
// 正式包名
const val packageName = "com.kkzxaakk.filemanagerr.abcd"
const val packageName = "com.kktq.superfilemanager.cba"
val noLoadingActivities = listOf(
"full", // 过滤全屏广告
......
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Base.Theme.Smartfilemanager" parent="Theme.Material3.DayNight.NoActionBar">
<style name="Base.Theme.Superfilemanager" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
</style>
......
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Base.Theme.Smartfilemanager" parent="Theme.Material3.DayNight.NoActionBar">
<style name="Base.Theme.Superfilemanager" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
</style>
<style name="Theme.Smartfilemanager" parent="Base.Theme.Smartfilemanager" />
<style name="Theme.Superfilemanager" parent="Base.Theme.Superfilemanager" />
</resources>
\ No newline at end of file
File added
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