Commit c492025f authored by wanglei's avatar wanglei

...

parent 1c224f88
...@@ -4,14 +4,26 @@ import android.annotation.SuppressLint ...@@ -4,14 +4,26 @@ import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.core.content.ContentProviderCompat.requireContext
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.datarecovery.activity.junkclean.ScanJunkActivity import com.base.datarecovery.activity.junkclean.ScanJunkActivity
import com.base.datarecovery.activity.privacyspace.PrivacyPinOneActivity
import com.base.datarecovery.activity.privacyspace.PrivacySpaceActivity
import com.base.datarecovery.activity.recovery.FileScanActivity
import com.base.datarecovery.adapter.AppFunctionAdapter import com.base.datarecovery.adapter.AppFunctionAdapter
import com.base.datarecovery.ads.AdmobInterstitialUtils import com.base.datarecovery.ads.AdmobInterstitialUtils
import com.base.datarecovery.ads.AdmobNativeUtils import com.base.datarecovery.ads.AdmobNativeUtils
import com.base.datarecovery.bean.ConstObject.JUNK_CLEANER import com.base.datarecovery.bean.ConstObject.JUNK_CLEANER
import com.base.datarecovery.bean.ConstObject.PRIVACY_SPACE
import com.base.datarecovery.bean.ConstObject.RECOVERY_DOCUMENTS
import com.base.datarecovery.bean.ConstObject.RECOVERY_PHOTOS
import com.base.datarecovery.bean.ConstObject.RECOVERY_VIDEOS
import com.base.datarecovery.bean.ConstObject.REPEAT_PHOTOS import com.base.datarecovery.bean.ConstObject.REPEAT_PHOTOS
import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS
import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS
import com.base.datarecovery.bean.ConstObject.SCAN_VIDEOS
import com.base.datarecovery.bean.ConstObject.SCREENSHOT_CLEANER import com.base.datarecovery.bean.ConstObject.SCREENSHOT_CLEANER
import com.base.datarecovery.bean.ConstObject.privacyPinPassword
import com.base.datarecovery.databinding.ActivityLayoutResultBinding import com.base.datarecovery.databinding.ActivityLayoutResultBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.help.KotlinExt.toFormatSize import com.base.datarecovery.help.KotlinExt.toFormatSize
...@@ -43,6 +55,34 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() { ...@@ -43,6 +55,34 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
SCREENSHOT_CLEANER -> { SCREENSHOT_CLEANER -> {
startActivity(Intent(this, ScreenShotActivity::class.java)) startActivity(Intent(this, ScreenShotActivity::class.java))
} }
RECOVERY_PHOTOS -> {
startActivity(Intent(this, FileScanActivity::class.java).apply {
putExtra("Type", SCAN_PHOTOS)
})
}
RECOVERY_VIDEOS -> {
startActivity(Intent(this, FileScanActivity::class.java).apply {
putExtra("Type", SCAN_VIDEOS)
})
}
RECOVERY_DOCUMENTS -> {
startActivity(Intent(this, FileScanActivity::class.java).apply {
putExtra("Type", SCAN_DOCUMENTS)
})
}
PRIVACY_SPACE -> {
if (privacyPinPassword.isNotEmpty()) {
startActivity(Intent(this, PrivacyPinOneActivity::class.java))
} else {
startActivity(Intent(this, PrivacySpaceActivity::class.java).apply {
})
}
}
} }
finish() finish()
} }
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_top" app:layout_constraintTop_toBottomOf="@+id/fl_ad"
app:spanCount="2" app:spanCount="2"
tools:listitem="@layout/item_result_fun_2" /> tools:listitem="@layout/item_result_fun_2" />
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
android:padding="10dp"> android:padding="10dp">
<ImageView <ImageView
android:layout_width="30dp" android:layout_width="wrap_content"
android:layout_height="30dp" android:layout_height="wrap_content"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:src="@mipmap/fanhui" android:src="@mipmap/fanhui"
android:tint="@color/black" android:tint="@color/black"
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginTop="23dp" android:layout_marginTop="16dp"
android:text="Core Services" android:text="Core Services"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="19sp" android:textSize="19sp"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="18dp" android:layout_marginTop="16dp"
android:orientation="horizontal" android:orientation="horizontal"
tools:ignore="DisableBaselineAlignment"> tools:ignore="DisableBaselineAlignment">
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginTop="20dp" android:layout_marginTop="16dp"
android:text="Comprehensive functions" android:text="Comprehensive functions"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="19sp" android:textSize="19sp"
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="8dp"
android:layout_marginTop="16dp"
android:orientation="horizontal"> android:orientation="horizontal">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
......
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