Commit 2cf2c001 authored by wanglei's avatar wanglei

...

parent 7aeb65d0
Pipeline #1406 canceled with stages
...@@ -38,6 +38,8 @@ import com.swiftcleaner.chovey.view.dialog.AppExitDialog; ...@@ -38,6 +38,8 @@ import com.swiftcleaner.chovey.view.dialog.AppExitDialog;
import com.swiftcleaner.chovey.view.dialog.CustomBottomSheetDialog; import com.swiftcleaner.chovey.view.dialog.CustomBottomSheetDialog;
import com.zxdemo.admob.AdmobHelper; import com.zxdemo.admob.AdmobHelper;
import java.util.concurrent.atomic.AtomicBoolean;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
ActivityMainBinding binding; ActivityMainBinding binding;
private static final int REQUEST_ALL_FILES_ACCESS_PERMISSION = 1; private static final int REQUEST_ALL_FILES_ACCESS_PERMISSION = 1;
...@@ -208,8 +210,6 @@ public class MainActivity extends AppCompatActivity { ...@@ -208,8 +210,6 @@ public class MainActivity extends AppCompatActivity {
private void checkAndRequestPermissions() { private void checkAndRequestPermissions() {
if (checkFilesAccessPermission(this)) { if (checkFilesAccessPermission(this)) {
// 有权限,直接跳转页面
} else { } else {
// 没有权限,请求权限 // 没有权限,请求权限
CustomBottomSheetDialog customBottomSheetDialog = new CustomBottomSheetDialog(); CustomBottomSheetDialog customBottomSheetDialog = new CustomBottomSheetDialog();
...@@ -297,12 +297,20 @@ public class MainActivity extends AppCompatActivity { ...@@ -297,12 +297,20 @@ public class MainActivity extends AppCompatActivity {
appExitDialog.show(); appExitDialog.show();
} }
private AtomicBoolean bannerShowed = new AtomicBoolean(false);
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (binding.lottieAnimattionView != null) { if (binding.lottieAnimattionView != null) {
binding.lottieAnimattionView.resumeAnimation(); // 恢复动画 binding.lottieAnimattionView.resumeAnimation(); // 恢复动画
} }
if (checkFilesAccessPermission(this)) {
if (bannerShowed.get()) return;
bannerShowed.set(true);
AdmobHelper.INSTANCE.showBannerAd(this, binding.flBanner, "bottom", null, null);
}
} }
@Override @Override
......
...@@ -641,10 +641,10 @@ object AdmobHelper { ...@@ -641,10 +641,10 @@ object AdmobHelper {
completed: (() -> Unit?)? = null, completed: (() -> Unit?)? = null,
failed: (() -> Unit?)? = null failed: (() -> Unit?)? = null
) { ) {
if (!isShowAdBanner() || isBlacklist()) { // if (!isShowAdBanner() || isBlacklist()) {
failed?.invoke() // failed?.invoke()
return // return
} // }
Log.d(TAG, "banner Ad load.") Log.d(TAG, "banner Ad load.")
val adView = AdView(context) val adView = AdView(context)
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -8,6 +8,11 @@ ...@@ -8,6 +8,11 @@
android:overScrollMode="never" android:overScrollMode="never"
tools:context=".view.MainActivity"> tools:context=".view.MainActivity">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="60dp">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -76,11 +81,11 @@ ...@@ -76,11 +81,11 @@
android:id="@+id/lottie_animattion_view" android:id="@+id/lottie_animattion_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:lottie_loop="true"
app:layout_constraintBottom_toBottomOf="@+id/cl_clean_animation" app:layout_constraintBottom_toBottomOf="@+id/cl_clean_animation"
app:layout_constraintEnd_toEndOf="@+id/cl_clean_animation" app:layout_constraintEnd_toEndOf="@+id/cl_clean_animation"
app:layout_constraintStart_toStartOf="@+id/cl_clean_animation" app:layout_constraintStart_toStartOf="@+id/cl_clean_animation"
app:layout_constraintTop_toTopOf="@+id/cl_clean_animation" /> app:layout_constraintTop_toTopOf="@+id/cl_clean_animation"
app:lottie_loop="true" />
<ImageView <ImageView
android:layout_width="41dp" android:layout_width="41dp"
...@@ -321,6 +326,7 @@ ...@@ -321,6 +326,7 @@
app:layout_constraintEnd_toEndOf="@id/large_file_cleaner" app:layout_constraintEnd_toEndOf="@id/large_file_cleaner"
app:layout_constraintTop_toTopOf="@id/large_file_cleaner" /> app:layout_constraintTop_toTopOf="@id/large_file_cleaner" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/whats_app" android:id="@+id/whats_app"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -362,6 +368,7 @@ ...@@ -362,6 +368,7 @@
app:layout_constraintEnd_toEndOf="@id/whats_app" app:layout_constraintEnd_toEndOf="@id/whats_app"
app:layout_constraintTop_toTopOf="@id/whats_app" /> app:layout_constraintTop_toTopOf="@id/whats_app" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/app_process" android:id="@+id/app_process"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -445,6 +452,7 @@ ...@@ -445,6 +452,7 @@
app:layout_constraintEnd_toEndOf="@id/similar_photos" app:layout_constraintEnd_toEndOf="@id/similar_photos"
app:layout_constraintTop_toTopOf="@id/similar_photos" /> app:layout_constraintTop_toTopOf="@id/similar_photos" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/screenshot_cleaner" android:id="@+id/screenshot_cleaner"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -500,5 +508,13 @@ ...@@ -500,5 +508,13 @@
app:layout_constraintTop_toBottomOf="@id/cl4" /> app:layout_constraintTop_toBottomOf="@id/cl4" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
<FrameLayout
android:id="@+id/fl_banner"
android:layout_width="match_parent"
android:layout_height="60dp"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file \ 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