Commit f54d085d authored by wanglei's avatar wanglei

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

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