diff --git a/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt b/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt index aa058a2..23a553d 100644 --- a/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt +++ b/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt @@ -2,11 +2,11 @@ import android.annotation.SuppressLint import android.content.Context -import android.os.Environment import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.casic.endoscope.R +import com.casic.endoscope.utils.FileManager import com.casic.endoscope.view.BigImageActivity import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.extensions.navigatePageTo @@ -40,14 +40,14 @@ //根据不同的日期显示不同的改日期下的九宫格形式子文件 val fileBeans = ArrayList() - val videoDir = File(context.getExternalFilesDir(Environment.DIRECTORY_MOVIES), date) + val videoDir = File(File(FileManager.getRootDirectory(), "Video"), date) videoDir.listFiles()?.forEach { if (it.name.startsWith("t")) { fileBeans.add(it) } } - val imageDir = File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), date) + val imageDir = File(File(FileManager.getRootDirectory(), "Picture"), date) imageDir.listFiles()?.forEach { fileBeans.add(it) } diff --git a/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt b/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt index aa058a2..23a553d 100644 --- a/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt +++ b/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt @@ -2,11 +2,11 @@ import android.annotation.SuppressLint import android.content.Context -import android.os.Environment import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.casic.endoscope.R +import com.casic.endoscope.utils.FileManager import com.casic.endoscope.view.BigImageActivity import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.extensions.navigatePageTo @@ -40,14 +40,14 @@ //根据不同的日期显示不同的改日期下的九宫格形式子文件 val fileBeans = ArrayList() - val videoDir = File(context.getExternalFilesDir(Environment.DIRECTORY_MOVIES), date) + val videoDir = File(File(FileManager.getRootDirectory(), "Video"), date) videoDir.listFiles()?.forEach { if (it.name.startsWith("t")) { fileBeans.add(it) } } - val imageDir = File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), date) + val imageDir = File(File(FileManager.getRootDirectory(), "Picture"), date) imageDir.listFiles()?.forEach { fileBeans.add(it) } diff --git a/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt b/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt index c46dafd..de928e8 100644 --- a/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt @@ -2,7 +2,6 @@ import com.casic.endoscope.base.BaseApplication import com.casic.endoscope.bean.GasValueBean -import com.pengxh.kt.lite.extensions.timestampToTime class DataBaseManager private constructor() { @@ -19,10 +18,10 @@ return gasValueBeanDao.loadAll() } - fun saveGasDensity(density: Int) { + fun saveGasDensity(density: Int, currentTime: String) { val bean = GasValueBean() bean.value = density - bean.time = System.currentTimeMillis().timestampToTime() + bean.time = currentTime gasValueBeanDao.insert(bean) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt b/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt index aa058a2..23a553d 100644 --- a/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt +++ b/app/src/main/java/com/casic/endoscope/adapter/MediaDirAdapter.kt @@ -2,11 +2,11 @@ import android.annotation.SuppressLint import android.content.Context -import android.os.Environment import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.casic.endoscope.R +import com.casic.endoscope.utils.FileManager import com.casic.endoscope.view.BigImageActivity import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.extensions.navigatePageTo @@ -40,14 +40,14 @@ //根据不同的日期显示不同的改日期下的九宫格形式子文件 val fileBeans = ArrayList() - val videoDir = File(context.getExternalFilesDir(Environment.DIRECTORY_MOVIES), date) + val videoDir = File(File(FileManager.getRootDirectory(), "Video"), date) videoDir.listFiles()?.forEach { if (it.name.startsWith("t")) { fileBeans.add(it) } } - val imageDir = File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), date) + val imageDir = File(File(FileManager.getRootDirectory(), "Picture"), date) imageDir.listFiles()?.forEach { fileBeans.add(it) } diff --git a/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt b/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt index c46dafd..de928e8 100644 --- a/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/endoscope/utils/DataBaseManager.kt @@ -2,7 +2,6 @@ import com.casic.endoscope.base.BaseApplication import com.casic.endoscope.bean.GasValueBean -import com.pengxh.kt.lite.extensions.timestampToTime class DataBaseManager private constructor() { @@ -19,10 +18,10 @@ return gasValueBeanDao.loadAll() } - fun saveGasDensity(density: Int) { + fun saveGasDensity(density: Int, currentTime: String) { val bean = GasValueBean() bean.value = density - bean.time = System.currentTimeMillis().timestampToTime() + bean.time = currentTime gasValueBeanDao.insert(bean) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt index e0244fe..1bf1e99 100644 --- a/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt +++ b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt @@ -2,7 +2,6 @@ import android.annotation.SuppressLint import android.os.Bundle -import android.os.Environment import android.view.View import android.widget.ImageView import androidx.lifecycle.lifecycleScope @@ -10,6 +9,7 @@ import com.casic.endoscope.R import com.casic.endoscope.adapter.MediaDirAdapter import com.casic.endoscope.databinding.ActivityAlbumBinding +import com.casic.endoscope.utils.FileManager import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -55,12 +55,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val temp = ArrayList() - val videoDir = File(getExternalFilesDir(Environment.DIRECTORY_MOVIES), "") + val videoDir = File(FileManager.getRootDirectory(), "Video") videoDir.list()?.forEach { temp.add(it) } - val imageDir = File(getExternalFilesDir(Environment.DIRECTORY_PICTURES), "") + val imageDir = File(FileManager.getRootDirectory(), "Picture") imageDir.list()?.forEach { temp.add(it) }