Commit da021a46 authored by wanglei's avatar wanglei

...

parent 7d3d4400
Pipeline #1402 canceled with stages
...@@ -111,6 +111,7 @@ public class LargeFileActivity extends AppCompatActivity { ...@@ -111,6 +111,7 @@ public class LargeFileActivity extends AppCompatActivity {
// 更新 UI // 更新 UI
runOnUiThread(() -> { runOnUiThread(() -> {
binding.tvLoad.setVisibility(View.GONE);
largeFileAdapter = new LargeFileAdapter(allFiles, new LargeFileAdapter.OnItemClickListener() { largeFileAdapter = new LargeFileAdapter(allFiles, new LargeFileAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(CleanFileBean fileBean) { public void onItemClick(CleanFileBean fileBean) {
......
...@@ -5,6 +5,7 @@ import androidx.appcompat.widget.AppCompatButton; ...@@ -5,6 +5,7 @@ import androidx.appcompat.widget.AppCompatButton;
import androidx.cardview.widget.CardView; import androidx.cardview.widget.CardView;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
...@@ -12,6 +13,7 @@ import android.os.Bundle; ...@@ -12,6 +13,7 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.view.View; import android.view.View;
import com.gyf.immersionbar.ImmersionBar; import com.gyf.immersionbar.ImmersionBar;
import com.swiftcleaner.chovey.R; import com.swiftcleaner.chovey.R;
import com.swiftcleaner.chovey.databinding.ActivityScreenShotBinding; import com.swiftcleaner.chovey.databinding.ActivityScreenShotBinding;
...@@ -55,10 +57,10 @@ public class ScreenShotActivity extends AppCompatActivity { ...@@ -55,10 +57,10 @@ public class ScreenShotActivity extends AppCompatActivity {
binding.ivReturn.setOnClickListener(v -> { binding.ivReturn.setOnClickListener(v -> {
initCustDialog(); initCustDialog();
}); });
binding.buttonScreenshotDelete.setOnClickListener(v->{ binding.buttonScreenshotDelete.setOnClickListener(v -> {
if (selectedSize==0){ if (selectedSize == 0) {
ToastUtil.showLongToast(this,"请勾选要删除的文件"); ToastUtil.showLongToast(this, "请勾选要删除的文件");
}else { } else {
showCustomDialog(); showCustomDialog();
} }
}); });
...@@ -74,6 +76,7 @@ public class ScreenShotActivity extends AppCompatActivity { ...@@ -74,6 +76,7 @@ public class ScreenShotActivity extends AppCompatActivity {
} }
runOnUiThread(() -> { runOnUiThread(() -> {
binding.tvLoad.setVisibility(View.GONE);
screenShotAdapter = new ScreenShotAdapter(cleanFileBeans, (fileBean) -> { screenShotAdapter = new ScreenShotAdapter(cleanFileBeans, (fileBean) -> {
if (fileBean.isSelected()) { if (fileBean.isSelected()) {
selectedSize += fileBean.getLength(); selectedSize += fileBean.getLength();
...@@ -155,7 +158,7 @@ public class ScreenShotActivity extends AppCompatActivity { ...@@ -155,7 +158,7 @@ public class ScreenShotActivity extends AppCompatActivity {
}, 3000); }, 3000);
} }
private String formatFileSize(long size) { private String formatFileSize(long size) {
if (size <= 0) return "0 Bytes"; if (size <= 0) return "0 Bytes";
final String[] units = new String[]{"Bytes", "KB", "MB", "GB", "TB"}; final String[] units = new String[]{"Bytes", "KB", "MB", "GB", "TB"};
int digitGroups = (int) (Math.log10(size) / Math.log10(1024)); int digitGroups = (int) (Math.log10(size) / Math.log10(1024));
...@@ -200,6 +203,7 @@ public class ScreenShotActivity extends AppCompatActivity { ...@@ -200,6 +203,7 @@ public class ScreenShotActivity extends AppCompatActivity {
}); });
customScoreDialog.show(); customScoreDialog.show();
} }
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
......
package com.swiftcleaner.chovey.view.activity; package com.swiftcleaner.chovey.view.activity;
import static com.zxdemo.ZxApplication.packname;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.AppCompatButton; import androidx.appcompat.widget.AppCompatButton;
import androidx.cardview.widget.CardView; import androidx.cardview.widget.CardView;
...@@ -17,6 +19,7 @@ import com.swiftcleaner.chovey.R; ...@@ -17,6 +19,7 @@ import com.swiftcleaner.chovey.R;
import com.swiftcleaner.chovey.databinding.ActivityMainBinding; import com.swiftcleaner.chovey.databinding.ActivityMainBinding;
import com.swiftcleaner.chovey.databinding.ActivitySettingBinding; import com.swiftcleaner.chovey.databinding.ActivitySettingBinding;
import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog; import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog;
import com.zxdemo.ZxApplication;
import com.zxdemo.admob.AdmobHelper; import com.zxdemo.admob.AdmobHelper;
import com.zxdemo.http.ZxHttp; import com.zxdemo.http.ZxHttp;
...@@ -63,6 +66,13 @@ public class SettingActivity extends AppCompatActivity { ...@@ -63,6 +66,13 @@ public class SettingActivity extends AppCompatActivity {
}); });
dialog_submit_button.setOnClickListener(v -> { dialog_submit_button.setOnClickListener(v -> {
dialog.dismiss(); dialog.dismiss();
try {
Uri uri = Uri.parse("https://play.google.com/store/apps/details?id=" + packname);
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
this.startActivity(intent);
} catch (Exception e) {
}
}); });
dialog.setCanceledOnTouchOutside(false); dialog.setCanceledOnTouchOutside(false);
...@@ -79,7 +89,8 @@ public class SettingActivity extends AppCompatActivity { ...@@ -79,7 +89,8 @@ public class SettingActivity extends AppCompatActivity {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
initCustDialog(); // initCustDialog();
finish();
} }
private void initCustDialog() { private void initCustDialog() {
......
...@@ -28,7 +28,7 @@ class ZxApplication : Application() { ...@@ -28,7 +28,7 @@ class ZxApplication : Application() {
var uuid = "" var uuid = ""
lateinit var context: Context lateinit var context: Context
var APP_STATE = 0 var APP_STATE = 0
val packname = "com.swiftcleaner.chovey" const val packname = "com.swiftcleaner.chovey"
var isDeviceLocked: Boolean = false var isDeviceLocked: Boolean = false
var isAppInForeground: Boolean = false var isAppInForeground: Boolean = false
var isScreenOn: Boolean = false var isScreenOn: Boolean = false
...@@ -57,7 +57,7 @@ class ZxApplication : Application() { ...@@ -57,7 +57,7 @@ class ZxApplication : Application() {
startOmgNotification() startOmgNotification()
} }
fun initApp() { fun initApp() {
FcmUtils().initFirebase(context) FcmUtils().initFirebase(context)
FcmUtils().subscribeToTopic("${packname}_push") FcmUtils().subscribeToTopic("${packname}_push")
......
...@@ -54,13 +54,15 @@ ...@@ -54,13 +54,15 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextView <TextView
android:id="@+id/tv_load"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="loading...." android:text="loading...."
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="wrap_content"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/large_file_recy" android:id="@+id/large_file_recy"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -68,8 +70,8 @@ ...@@ -68,8 +70,8 @@
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="110dp" android:layout_marginTop="110dp"
android:layout_marginBottom="100dp" android:layout_marginBottom="100dp"
android:overScrollMode="never"
android:background="@color/white" android:background="@color/white"
android:overScrollMode="never"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
...@@ -95,13 +95,14 @@ ...@@ -95,13 +95,14 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/tv_load"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="loading...." android:text="loading...."
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="wrap_content"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/screenshot_recy" android:id="@+id/screenshot_recy"
...@@ -130,8 +131,8 @@ ...@@ -130,8 +131,8 @@
android:layout_marginStart="16sp" android:layout_marginStart="16sp"
android:text="Select All" android:text="Select All"
android:textColor="#666666" android:textColor="#666666"
android:visibility="gone"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/button_screenshot_delete" app:layout_constraintBottom_toBottomOf="@id/button_screenshot_delete"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
......
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