Commit c5877018 authored by wanglei's avatar wanglei

Merge remote-tracking branch 'origin/free-master' into free-master

parents ec517dcc 6265ca49
...@@ -15,7 +15,7 @@ import kotlin.math.abs ...@@ -15,7 +15,7 @@ import kotlin.math.abs
class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() { class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() {
override val isLightMode = true
private lateinit var adapter: DeviceScanAdapter private lateinit var adapter: DeviceScanAdapter
override val binding: ActivityDeviceScanBinding by lazy { override val binding: ActivityDeviceScanBinding by lazy {
......
...@@ -37,8 +37,8 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeaterdPhotoBinding>() ...@@ -37,8 +37,8 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeaterdPhotoBinding>()
binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
binding.idTvDelete.isEnabled = false binding.idTvDelete.isEnabled = false
initListener() initListener()
checkPermission()
} }
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
override fun initListener() { override fun initListener() {
binding.idBack.setOnClickListener { binding.idBack.setOnClickListener {
...@@ -87,25 +87,26 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeaterdPhotoBinding>() ...@@ -87,25 +87,26 @@ class RepeatPhotoActivity : BaseActivity<ActivityLayoutRepeaterdPhotoBinding>()
} }
private var fileList = mutableListOf<ImageDataBean>() private var fileList = mutableListOf<ImageDataBean>()
override fun onStart() {
super.onStart()
checkPermission()
}
var isplay = 0
override fun onPermissionsResult(isGranted: Boolean) { override fun onPermissionsResult(isGranted: Boolean) {
if (isGranted) { if (isGranted) {
FileHelps.getImageFiles { isplay += 1
AdmobUtils.showInterstitialAd(this) if (isplay == 1) {
binding.idLlScaning.isVisible = false FileHelps.getImageFiles {
binding.idLlResult.isVisible = true AdmobUtils.showInterstitialAd(this)
fileList = FileHelps.similarImageList binding.idLlScaning.isVisible = false
binding.idTvNoData.isVisible = fileList.size == 0 binding.idLlResult.isVisible = true
binding.idTvDelete.isVisible = fileList.size > 0 fileList = FileHelps.similarImageList
binding.idTvAll.isVisible = fileList.size > 0 binding.idTvNoData.isVisible = fileList.size == 0
binding.idImgSelect.isVisible = fileList.size > 0 binding.idTvDelete.isVisible = fileList.size > 0
binding.idRlList.layoutManager = GridLayoutManager(this, 3) binding.idTvAll.isVisible = fileList.size > 0
binding.idRlList.adapter = mAdapter binding.idImgSelect.isVisible = fileList.size > 0
binding.idRlList.layoutManager = GridLayoutManager(this, 3)
binding.idRlList.adapter = mAdapter
}
} }
} else { } else {
finishToMain() finishToMain()
} }
......
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