Commit 307413f5 authored by wanglei's avatar wanglei

动画替换

parent ec9d314e
...@@ -22,8 +22,8 @@ android { ...@@ -22,8 +22,8 @@ android {
applicationId "com.base.superfilemanager" applicationId "com.base.superfilemanager"
minSdk 24 minSdk 24
targetSdk 33 targetSdk 33
versionCode 6 versionCode 3
versionName "1.5" versionName "1.2"
ndk { ndk {
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64' abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
} }
......
This image diff could not be displayed because it is too large. You can view the blob instead.
...@@ -138,12 +138,12 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() { ...@@ -138,12 +138,12 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() {
} }
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
AdmobUtils.showInterstitialAd(this) { AdmobUtils.showInterstitialAd(this) {
finish() finishToMain()
} }
} }
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
AdmobUtils.showInterstitialAd(this@AppManagerActivity) { AdmobUtils.showInterstitialAd(this@AppManagerActivity) {
finish() finishToMain()
} }
} }
......
...@@ -73,13 +73,13 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() { ...@@ -73,13 +73,13 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() {
override fun initListener() { override fun initListener() {
binding.flBack.setOnClickListener { binding.flBack.setOnClickListener {
AdmobUtils.showInterstitialAd(this) { AdmobUtils.showInterstitialAd(this) {
finish() finishToMain()
} }
} }
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
LogEx.logDebug(TAG, "onBackPressedDispatcher") LogEx.logDebug(TAG, "onBackPressedDispatcher")
AdmobUtils.showInterstitialAd(this@RecentAppActivity) { AdmobUtils.showInterstitialAd(this@RecentAppActivity) {
finish() finishToMain()
} }
} }
binding.tvGrand.setOnClickListener { binding.tvGrand.setOnClickListener {
......
...@@ -39,7 +39,7 @@ class ToolsAdapter( ...@@ -39,7 +39,7 @@ class ToolsAdapter(
ToolUI(PHOTO_COMPRESS, context.getString(R.string.photo_compress), R.drawable.tool_photo), ToolUI(PHOTO_COMPRESS, context.getString(R.string.photo_compress), R.drawable.tool_photo),
) )
), ),
ToolsUI(isAd = true), // ToolsUI(isAd = true),
ToolsUI( ToolsUI(
tittle = "More", tittle = "More",
tools = listOf( tools = listOf(
......
...@@ -93,7 +93,10 @@ object NotificationHelper { ...@@ -93,7 +93,10 @@ object NotificationHelper {
SPUtils.getInstance().getString("push_circle_order", initJson) SPUtils.getInstance().getString("push_circle_order", initJson)
tempList.addAll(filterList) tempList.addAll(filterList)
} else { } else {
val array = Gson().fromJson(json, object : TypeToken<Array<Int>>() {}) var array = arrayOf<Int>()
runCatching {
array = Gson().fromJson(json, object : TypeToken<Array<Int>>() {})
}
tempList.addAll(array) tempList.addAll(array)
if (tempList.isEmpty()) { if (tempList.isEmpty()) {
......
...@@ -171,9 +171,9 @@ ...@@ -171,9 +171,9 @@
android:gravity="center" android:gravity="center"
android:text="Authorization" android:text="Authorization"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="10sp" android:textSize="14sp"
app:bl_corners_radius="12dp" app:bl_corners_radius="12dp"
app:bl_solid_color="#2D4059" app:bl_solid_color="@color/theme_color"
tools:ignore="HardcodedText,SmallSp" /> tools:ignore="HardcodedText,SmallSp" />
</LinearLayout> </LinearLayout>
......
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