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 b214b05..8d2223b 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 @@ -17,11 +17,15 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity +import com.casic.xz.meterage.view.notice.PreviewDocumentActivity +import com.casic.xz.meterage.view.notice.PreviewPdfActivity +import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.createCompressImageDir import com.pengxh.kt.lite.extensions.dateToTimestamp import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues import org.json.JSONObject import org.xml.sax.XMLReader @@ -154,6 +158,27 @@ } } +//查看附件 +fun String.watchAttachFile(context: Context) { + if (this.endsWith("pdf")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("doc") || this.endsWith("docx") + ) { + context.navigatePageTo(this) + } else if (this.endsWith("txt")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(this.combineImagePath()) + context.navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(context) + } +} + 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 b214b05..8d2223b 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 @@ -17,11 +17,15 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity +import com.casic.xz.meterage.view.notice.PreviewDocumentActivity +import com.casic.xz.meterage.view.notice.PreviewPdfActivity +import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.createCompressImageDir import com.pengxh.kt.lite.extensions.dateToTimestamp import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues import org.json.JSONObject import org.xml.sax.XMLReader @@ -154,6 +158,27 @@ } } +//查看附件 +fun String.watchAttachFile(context: Context) { + if (this.endsWith("pdf")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("doc") || this.endsWith("docx") + ) { + context.navigatePageTo(this) + } else if (this.endsWith("txt")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(this.combineImagePath()) + context.navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(context) + } +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0650a70..1c7f943 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -3,11 +3,13 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_device_basic_information.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -56,8 +58,21 @@ textPaint.isAntiAlias = true documentsView.setTextColor(R.color.themeColor.convertColor(requireContext())) + val files = ArrayList() + data.fileList.forEach { file -> + files.add(file.minioFileName) + } documentsView.setOnClickListener { - + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(files) + .setItemTextColor(R.color.themeColor.convertColor(requireContext())) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + files[position].watchAttachFile(requireContext()) + } + }).build().show() } } remarkView.text = data.remark 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 b214b05..8d2223b 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 @@ -17,11 +17,15 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity +import com.casic.xz.meterage.view.notice.PreviewDocumentActivity +import com.casic.xz.meterage.view.notice.PreviewPdfActivity +import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.createCompressImageDir import com.pengxh.kt.lite.extensions.dateToTimestamp import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues import org.json.JSONObject import org.xml.sax.XMLReader @@ -154,6 +158,27 @@ } } +//查看附件 +fun String.watchAttachFile(context: Context) { + if (this.endsWith("pdf")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("doc") || this.endsWith("docx") + ) { + context.navigatePageTo(this) + } else if (this.endsWith("txt")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(this.combineImagePath()) + context.navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(context) + } +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0650a70..1c7f943 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -3,11 +3,13 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_device_basic_information.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -56,8 +58,21 @@ textPaint.isAntiAlias = true documentsView.setTextColor(R.color.themeColor.convertColor(requireContext())) + val files = ArrayList() + data.fileList.forEach { file -> + files.add(file.minioFileName) + } documentsView.setOnClickListener { - + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(files) + .setItemTextColor(R.color.themeColor.convertColor(requireContext())) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + files[position].watchAttachFile(requireContext()) + } + }).build().show() } } remarkView.text = data.remark diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index c4f82a7..cc14ffb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -3,11 +3,13 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -74,8 +76,21 @@ textPaint.isAntiAlias = true instructionsView.setTextColor(R.color.themeColor.convertColor(requireContext())) + val files = ArrayList() + data.fileList.forEach { file -> + files.add(file.minioFileName) + } instructionsView.setOnClickListener { - + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(files) + .setItemTextColor(R.color.themeColor.convertColor(requireContext())) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + files[position].watchAttachFile(requireContext()) + } + }).build().show() } } } 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 b214b05..8d2223b 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 @@ -17,11 +17,15 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity +import com.casic.xz.meterage.view.notice.PreviewDocumentActivity +import com.casic.xz.meterage.view.notice.PreviewPdfActivity +import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.createCompressImageDir import com.pengxh.kt.lite.extensions.dateToTimestamp import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues import org.json.JSONObject import org.xml.sax.XMLReader @@ -154,6 +158,27 @@ } } +//查看附件 +fun String.watchAttachFile(context: Context) { + if (this.endsWith("pdf")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("doc") || this.endsWith("docx") + ) { + context.navigatePageTo(this) + } else if (this.endsWith("txt")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(this.combineImagePath()) + context.navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(context) + } +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0650a70..1c7f943 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -3,11 +3,13 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_device_basic_information.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -56,8 +58,21 @@ textPaint.isAntiAlias = true documentsView.setTextColor(R.color.themeColor.convertColor(requireContext())) + val files = ArrayList() + data.fileList.forEach { file -> + files.add(file.minioFileName) + } documentsView.setOnClickListener { - + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(files) + .setItemTextColor(R.color.themeColor.convertColor(requireContext())) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + files[position].watchAttachFile(requireContext()) + } + }).build().show() } } remarkView.text = data.remark diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index c4f82a7..cc14ffb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -3,11 +3,13 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -74,8 +76,21 @@ textPaint.isAntiAlias = true instructionsView.setTextColor(R.color.themeColor.convertColor(requireContext())) + val files = ArrayList() + data.fileList.forEach { file -> + files.add(file.minioFileName) + } instructionsView.setOnClickListener { - + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(files) + .setItemTextColor(R.color.themeColor.convertColor(requireContext())) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + files[position].watchAttachFile(requireContext()) + } + }).build().show() } } } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 32ecaf1..6775a25 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -37,7 +37,7 @@ private String directorDiscountPermission; private String historicalPriceList; private String id; - private int isDel; + private String isDel; private String itemName; private String model; private String operatorDiscountPermission; @@ -100,11 +100,11 @@ this.id = id; } - public int getIsDel() { + public String getIsDel() { return isDel; } - public void setIsDel(int isDel) { + public void setIsDel(String isDel) { this.isDel = isDel; } 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 b214b05..8d2223b 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 @@ -17,11 +17,15 @@ import com.casic.xz.meterage.model.ErrorMessageModel import com.casic.xz.meterage.utils.LocaleConstant import com.casic.xz.meterage.view.BigImageActivity +import com.casic.xz.meterage.view.notice.PreviewDocumentActivity +import com.casic.xz.meterage.view.notice.PreviewPdfActivity +import com.casic.xz.meterage.view.notice.PreviewTextActivity import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.extensions.createCompressImageDir import com.pengxh.kt.lite.extensions.dateToTimestamp import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues import org.json.JSONObject import org.xml.sax.XMLReader @@ -154,6 +158,27 @@ } } +//查看附件 +fun String.watchAttachFile(context: Context) { + if (this.endsWith("pdf")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("doc") || this.endsWith("docx") + ) { + context.navigatePageTo(this) + } else if (this.endsWith("txt")) { + context.navigatePageTo(this) + } else if ( + this.endsWith("png") || this.endsWith("jpeg") || this.endsWith("jpg") + ) { + val urls = ArrayList() + urls.add(this.combineImagePath()) + context.navigatePageTo(0, urls) + } else { + "文件类型未知，无法打开附件".show(context) + } +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 0650a70..1c7f943 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -3,11 +3,13 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_device_basic_information.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -56,8 +58,21 @@ textPaint.isAntiAlias = true documentsView.setTextColor(R.color.themeColor.convertColor(requireContext())) + val files = ArrayList() + data.fileList.forEach { file -> + files.add(file.minioFileName) + } documentsView.setOnClickListener { - + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(files) + .setItemTextColor(R.color.themeColor.convertColor(requireContext())) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + files[position].watchAttachFile(requireContext()) + } + }).build().show() } } remarkView.text = data.remark diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index c4f82a7..cc14ffb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -3,11 +3,13 @@ import android.graphics.Paint import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.vm.LoadState +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_equipment_basic_information.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -74,8 +76,21 @@ textPaint.isAntiAlias = true instructionsView.setTextColor(R.color.themeColor.convertColor(requireContext())) + val files = ArrayList() + data.fileList.forEach { file -> + files.add(file.minioFileName) + } instructionsView.setOnClickListener { - + BottomActionSheet.Builder() + .setContext(requireContext()) + .setActionItemTitle(files) + .setItemTextColor(R.color.themeColor.convertColor(requireContext())) + .setOnActionSheetListener(object : + BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + files[position].watchAttachFile(requireContext()) + } + }).build().show() } } } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java index 32ecaf1..6775a25 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityDetailModel.java @@ -37,7 +37,7 @@ private String directorDiscountPermission; private String historicalPriceList; private String id; - private int isDel; + private String isDel; private String itemName; private String model; private String operatorDiscountPermission; @@ -100,11 +100,11 @@ this.id = id; } - public int getIsDel() { + public String getIsDel() { return isDel; } - public void setIsDel(int isDel) { + public void setIsDel(String isDel) { this.isDel = isDel; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index c60b69f..21fe5ed 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -4,21 +4,17 @@ 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.view.BigImageActivity +import com.casic.xz.meterage.extensions.watchAttachFile import com.casic.xz.meterage.vm.NoticeViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.obtainScreenWidth -import com.pengxh.kt.lite.extensions.show 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() { @@ -61,27 +57,7 @@ minioFileView.setTextColor(R.color.themeColor.convertColor(this)) minioFileView.setOnClickListener { - //查看附件 - 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) - } + minioFileName.watchAttachFile(this) } } }