diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 56f1e53..2c48c06 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -108,15 +108,6 @@ } } -//拼接图片地址 -fun String.combineImagePath(): String { - if (this.isEmpty()) return this - val defaultValue = SaveKeyValues.getValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL - ) as String - return "$defaultValue/static/${this.replace("\\", "/")}" -} - //拼接附件地址 fun String.combineFilePath(): String { if (this.isEmpty()) return this @@ -128,6 +119,15 @@ return "$defaultValue/test/${this.replace("\\", "/")}" } +//拼接图片地址 +fun String.combineImagePath(): String { + if (this.isEmpty()) return this + val defaultValue = SaveKeyValues.getValue( + LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL + ) as String + return "$defaultValue/static/${this.replace("\\", "/")}" +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 56f1e53..2c48c06 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -108,15 +108,6 @@ } } -//拼接图片地址 -fun String.combineImagePath(): String { - if (this.isEmpty()) return this - val defaultValue = SaveKeyValues.getValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL - ) as String - return "$defaultValue/static/${this.replace("\\", "/")}" -} - //拼接附件地址 fun String.combineFilePath(): String { if (this.isEmpty()) return this @@ -128,6 +119,15 @@ return "$defaultValue/test/${this.replace("\\", "/")}" } +//拼接图片地址 +fun String.combineImagePath(): String { + if (this.isEmpty()) return this + val defaultValue = SaveKeyValues.getValue( + LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL + ) as String + return "$defaultValue/static/${this.replace("\\", "/")}" +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt index 7ad1253..a5bb60b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt @@ -4,6 +4,7 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.combineImagePath import com.casic.xz.meterage.extensions.formatTextFromHtml import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.vm.NoticeViewModel @@ -16,6 +17,7 @@ import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_notice_detail.* import kotlinx.android.synthetic.main.include_base_title.* +import java.util.* @SuppressLint("SetTextI18n") class NoticeDetailActivity : KotlinBaseActivity() { @@ -59,19 +61,25 @@ minioFileView.setOnClickListener { //查看附件 - when { - minioFileName.endsWith("pdf") -> { - navigatePageTo(minioFileName) - } - minioFileName.endsWith("doc") -> { - navigatePageTo(minioFileName) - } - minioFileName.endsWith("txt") -> { - navigatePageTo(minioFileName) - } - else -> { - "文件类型未知，无法打开附件".show(this) - } + if (minioFileName.endsWith("pdf")) { + navigatePageTo(minioFileName) + } else if ( + minioFileName.endsWith("doc") || + minioFileName.endsWith("docx") + ) { + navigatePageTo(minioFileName) + } else if (minioFileName.endsWith("txt")) { + navigatePageTo(minioFileName) + } else if ( + minioFileName.endsWith("png") || + minioFileName.endsWith("jpeg") || + minioFileName.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(minioFileName.combineImagePath()) + navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(this) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 56f1e53..2c48c06 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -108,15 +108,6 @@ } } -//拼接图片地址 -fun String.combineImagePath(): String { - if (this.isEmpty()) return this - val defaultValue = SaveKeyValues.getValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL - ) as String - return "$defaultValue/static/${this.replace("\\", "/")}" -} - //拼接附件地址 fun String.combineFilePath(): String { if (this.isEmpty()) return this @@ -128,6 +119,15 @@ return "$defaultValue/test/${this.replace("\\", "/")}" } +//拼接图片地址 +fun String.combineImagePath(): String { + if (this.isEmpty()) return this + val defaultValue = SaveKeyValues.getValue( + LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL + ) as String + return "$defaultValue/static/${this.replace("\\", "/")}" +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt index 7ad1253..a5bb60b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt @@ -4,6 +4,7 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.combineImagePath import com.casic.xz.meterage.extensions.formatTextFromHtml import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.vm.NoticeViewModel @@ -16,6 +17,7 @@ import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_notice_detail.* import kotlinx.android.synthetic.main.include_base_title.* +import java.util.* @SuppressLint("SetTextI18n") class NoticeDetailActivity : KotlinBaseActivity() { @@ -59,19 +61,25 @@ minioFileView.setOnClickListener { //查看附件 - when { - minioFileName.endsWith("pdf") -> { - navigatePageTo(minioFileName) - } - minioFileName.endsWith("doc") -> { - navigatePageTo(minioFileName) - } - minioFileName.endsWith("txt") -> { - navigatePageTo(minioFileName) - } - else -> { - "文件类型未知，无法打开附件".show(this) - } + if (minioFileName.endsWith("pdf")) { + navigatePageTo(minioFileName) + } else if ( + minioFileName.endsWith("doc") || + minioFileName.endsWith("docx") + ) { + navigatePageTo(minioFileName) + } else if (minioFileName.endsWith("txt")) { + navigatePageTo(minioFileName) + } else if ( + minioFileName.endsWith("png") || + minioFileName.endsWith("jpeg") || + minioFileName.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(minioFileName.combineImagePath()) + navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(this) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt index 1e6dd90..15f6a16 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt @@ -1,11 +1,13 @@ package com.casic.xz.meterage.view import android.os.Handler +import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.NoticeListModel @@ -145,6 +147,10 @@ "", "" ) + Log.d( + "Casic", + "NoticeListActivity => onItemClicked: ${rowsModel.minioFileName.combineFilePath()}" + ) navigatePageTo(allArgs) } }) diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 56f1e53..2c48c06 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -108,15 +108,6 @@ } } -//拼接图片地址 -fun String.combineImagePath(): String { - if (this.isEmpty()) return this - val defaultValue = SaveKeyValues.getValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL - ) as String - return "$defaultValue/static/${this.replace("\\", "/")}" -} - //拼接附件地址 fun String.combineFilePath(): String { if (this.isEmpty()) return this @@ -128,6 +119,15 @@ return "$defaultValue/test/${this.replace("\\", "/")}" } +//拼接图片地址 +fun String.combineImagePath(): String { + if (this.isEmpty()) return this + val defaultValue = SaveKeyValues.getValue( + LocaleConstant.DEFAULT_SERVER_CONFIG, LocaleConstant.SERVER_BASE_URL + ) as String + return "$defaultValue/static/${this.replace("\\", "/")}" +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt index 7ad1253..a5bb60b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/NoticeDetailActivity.kt @@ -4,6 +4,7 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.combineImagePath import com.casic.xz.meterage.extensions.formatTextFromHtml import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.vm.NoticeViewModel @@ -16,6 +17,7 @@ import com.pengxh.kt.lite.utils.Constant import kotlinx.android.synthetic.main.activity_notice_detail.* import kotlinx.android.synthetic.main.include_base_title.* +import java.util.* @SuppressLint("SetTextI18n") class NoticeDetailActivity : KotlinBaseActivity() { @@ -59,19 +61,25 @@ minioFileView.setOnClickListener { //查看附件 - when { - minioFileName.endsWith("pdf") -> { - navigatePageTo(minioFileName) - } - minioFileName.endsWith("doc") -> { - navigatePageTo(minioFileName) - } - minioFileName.endsWith("txt") -> { - navigatePageTo(minioFileName) - } - else -> { - "文件类型未知，无法打开附件".show(this) - } + if (minioFileName.endsWith("pdf")) { + navigatePageTo(minioFileName) + } else if ( + minioFileName.endsWith("doc") || + minioFileName.endsWith("docx") + ) { + navigatePageTo(minioFileName) + } else if (minioFileName.endsWith("txt")) { + navigatePageTo(minioFileName) + } else if ( + minioFileName.endsWith("png") || + minioFileName.endsWith("jpeg") || + minioFileName.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(minioFileName.combineImagePath()) + navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(this) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt index 1e6dd90..15f6a16 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/NoticeListActivity.kt @@ -1,11 +1,13 @@ package com.casic.xz.meterage.view import android.os.Handler +import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.NoticeListAdapter import com.casic.xz.meterage.extensions.addAll +import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.NoticeListModel @@ -145,6 +147,10 @@ "", "" ) + Log.d( + "Casic", + "NoticeListActivity => onItemClicked: ${rowsModel.minioFileName.combineFilePath()}" + ) navigatePageTo(allArgs) } }) diff --git a/app/src/main/java/com/casic/xz/meterage/view/PreviewPdfActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/PreviewPdfActivity.kt index 027f411..39f8ac2 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/PreviewPdfActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/PreviewPdfActivity.kt @@ -3,6 +3,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.utils.LoadingDialogHub import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.callback.OnDownloadListener @@ -25,7 +26,9 @@ url.downloadFile(createDownloadFileDir().toString(), object : OnDownloadListener { override fun onDownloadStart(totalBytes: Long) { - + runOnUiThread { + LoadingDialogHub.show(this@PreviewPdfActivity, "附件加载中") + } } override fun onProgressChanged(currentBytes: Long) { @@ -33,6 +36,9 @@ } override fun onDownloadEnd(file: File?) { + runOnUiThread { + LoadingDialogHub.dismiss() + } val inputStream = FileInputStream(file) pdfView.fromStream(inputStream).load() }