diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e896199..8d0d2cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - - (title) + val result = DataBaseManager.get.queryMarkerById(title) + MarkerDetailDialog(context).setMarker(result.first()).show() } }).build().show() } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e896199..8d0d2cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - (title) + val result = DataBaseManager.get.queryMarkerById(title) + MarkerDetailDialog(context).setMarker(result.first()).show() } }).build().show() } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt deleted file mode 100644 index 3e2703d..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt +++ /dev/null @@ -1,110 +0,0 @@ -package com.casic.common.detector.gd.view - -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.Gravity -import com.casic.common.detector.gd.bean.MarkerLocalBean -import com.casic.common.detector.gd.databinding.ActivityObjectDetailBinding -import com.casic.common.detector.gd.extensions.appendDownloadUrl -import com.casic.common.detector.gd.utils.DataBaseManager -import com.casic.common.detector.gd.utils.FileType -import com.casic.common.detector.gd.utils.LocaleConstant -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.getScreenHeight -import com.pengxh.kt.lite.extensions.getScreenWidth -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class ObjectDetailActivity : KotlinBaseActivity() { - - private val kTag = "ObjectDetailActivity" - private lateinit var marker: MarkerLocalBean - - override fun initViewBinding(): ActivityObjectDetailBinding { - return ActivityObjectDetailBinding.inflate(layoutInflater) - } - - override fun setupTopBarLayout() { - - } - - override fun observeRequestState() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - window.setGravity(Gravity.CENTER) - val params = window.attributes - params.width = ((getScreenWidth() * 0.9).toInt()) - params.height = ((getScreenHeight() * 0.7).toInt()) - window.attributes = params - - val id = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - try { - marker = DataBaseManager.get.queryMarkerById(id).first() - binding.objectTypeView.text = - LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] - binding.pipelineTypeView.text = marker.pipelineType - binding.pipelineDiameterView.text = marker.pipelineDiameter - binding.pipelineMaterialView.text = marker.pipelineMaterial - binding.buryMethodView.text = marker.buryMethod - binding.buryDeepView.text = marker.buryDepth - binding.areaView.text = marker.area - binding.lineView.text = marker.line - binding.roadView.text = marker.road - binding.constructTimeView.text = marker.constructTime - binding.ownerView.text = marker.owner - binding.identifierIdView.text = marker.markerId - binding.identifierTypeView.text = marker.markerType - binding.identifierDeepView.text = marker.markerDepth - binding.personView.text = marker.installationDept - binding.installTimeView.text = marker.updateTime - binding.remarkView.text = marker.remark - } catch (e: NoSuchElementException) { - e.printStackTrace() - } - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - //查数据库 - if (marker.imagePath.isNullOrEmpty()) { - "此标识器无图片".show(this) - } else { - val realPaths: ArrayList = ArrayList() //真实图片路径 - - /** - * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg - * */ - val imagePath = marker.imagePath - if (imagePath.contains(",")) { - val list = imagePath.split(",") - list.forEach { path -> - val url = path.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - } else { - //只有一张图片 - val url = imagePath.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - navigatePageTo(0, realPaths) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e896199..8d0d2cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - (title) + val result = DataBaseManager.get.queryMarkerById(title) + MarkerDetailDialog(context).setMarker(result.first()).show() } }).build().show() } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt deleted file mode 100644 index 3e2703d..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt +++ /dev/null @@ -1,110 +0,0 @@ -package com.casic.common.detector.gd.view - -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.Gravity -import com.casic.common.detector.gd.bean.MarkerLocalBean -import com.casic.common.detector.gd.databinding.ActivityObjectDetailBinding -import com.casic.common.detector.gd.extensions.appendDownloadUrl -import com.casic.common.detector.gd.utils.DataBaseManager -import com.casic.common.detector.gd.utils.FileType -import com.casic.common.detector.gd.utils.LocaleConstant -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.getScreenHeight -import com.pengxh.kt.lite.extensions.getScreenWidth -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class ObjectDetailActivity : KotlinBaseActivity() { - - private val kTag = "ObjectDetailActivity" - private lateinit var marker: MarkerLocalBean - - override fun initViewBinding(): ActivityObjectDetailBinding { - return ActivityObjectDetailBinding.inflate(layoutInflater) - } - - override fun setupTopBarLayout() { - - } - - override fun observeRequestState() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - window.setGravity(Gravity.CENTER) - val params = window.attributes - params.width = ((getScreenWidth() * 0.9).toInt()) - params.height = ((getScreenHeight() * 0.7).toInt()) - window.attributes = params - - val id = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - try { - marker = DataBaseManager.get.queryMarkerById(id).first() - binding.objectTypeView.text = - LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] - binding.pipelineTypeView.text = marker.pipelineType - binding.pipelineDiameterView.text = marker.pipelineDiameter - binding.pipelineMaterialView.text = marker.pipelineMaterial - binding.buryMethodView.text = marker.buryMethod - binding.buryDeepView.text = marker.buryDepth - binding.areaView.text = marker.area - binding.lineView.text = marker.line - binding.roadView.text = marker.road - binding.constructTimeView.text = marker.constructTime - binding.ownerView.text = marker.owner - binding.identifierIdView.text = marker.markerId - binding.identifierTypeView.text = marker.markerType - binding.identifierDeepView.text = marker.markerDepth - binding.personView.text = marker.installationDept - binding.installTimeView.text = marker.updateTime - binding.remarkView.text = marker.remark - } catch (e: NoSuchElementException) { - e.printStackTrace() - } - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - //查数据库 - if (marker.imagePath.isNullOrEmpty()) { - "此标识器无图片".show(this) - } else { - val realPaths: ArrayList = ArrayList() //真实图片路径 - - /** - * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg - * */ - val imagePath = marker.imagePath - if (imagePath.contains(",")) { - val list = imagePath.split(",") - list.forEach { path -> - val url = path.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - } else { - //只有一张图片 - val url = imagePath.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - navigatePageTo(0, realPaths) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 83eeee3..811d26c 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -29,6 +29,7 @@ import com.casic.common.detector.gd.utils.RuntimeCache import com.casic.common.detector.gd.utils.SerialPortCommand import com.casic.common.detector.gd.vm.TaskViewModel +import com.casic.common.detector.gd.widgets.MarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo @@ -140,7 +141,7 @@ binding.markerInfoButton.setOnClickListener { val result = DataBaseManager.get.queryMarkerById(markerId) if (result.isNotEmpty()) { - navigatePageTo(markerId) + MarkerDetailDialog(this).setMarker(result.first()).show() } else { navigatePageTo(markerId) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e896199..8d0d2cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - (title) + val result = DataBaseManager.get.queryMarkerById(title) + MarkerDetailDialog(context).setMarker(result.first()).show() } }).build().show() } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt deleted file mode 100644 index 3e2703d..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt +++ /dev/null @@ -1,110 +0,0 @@ -package com.casic.common.detector.gd.view - -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.Gravity -import com.casic.common.detector.gd.bean.MarkerLocalBean -import com.casic.common.detector.gd.databinding.ActivityObjectDetailBinding -import com.casic.common.detector.gd.extensions.appendDownloadUrl -import com.casic.common.detector.gd.utils.DataBaseManager -import com.casic.common.detector.gd.utils.FileType -import com.casic.common.detector.gd.utils.LocaleConstant -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.getScreenHeight -import com.pengxh.kt.lite.extensions.getScreenWidth -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class ObjectDetailActivity : KotlinBaseActivity() { - - private val kTag = "ObjectDetailActivity" - private lateinit var marker: MarkerLocalBean - - override fun initViewBinding(): ActivityObjectDetailBinding { - return ActivityObjectDetailBinding.inflate(layoutInflater) - } - - override fun setupTopBarLayout() { - - } - - override fun observeRequestState() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - window.setGravity(Gravity.CENTER) - val params = window.attributes - params.width = ((getScreenWidth() * 0.9).toInt()) - params.height = ((getScreenHeight() * 0.7).toInt()) - window.attributes = params - - val id = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - try { - marker = DataBaseManager.get.queryMarkerById(id).first() - binding.objectTypeView.text = - LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] - binding.pipelineTypeView.text = marker.pipelineType - binding.pipelineDiameterView.text = marker.pipelineDiameter - binding.pipelineMaterialView.text = marker.pipelineMaterial - binding.buryMethodView.text = marker.buryMethod - binding.buryDeepView.text = marker.buryDepth - binding.areaView.text = marker.area - binding.lineView.text = marker.line - binding.roadView.text = marker.road - binding.constructTimeView.text = marker.constructTime - binding.ownerView.text = marker.owner - binding.identifierIdView.text = marker.markerId - binding.identifierTypeView.text = marker.markerType - binding.identifierDeepView.text = marker.markerDepth - binding.personView.text = marker.installationDept - binding.installTimeView.text = marker.updateTime - binding.remarkView.text = marker.remark - } catch (e: NoSuchElementException) { - e.printStackTrace() - } - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - //查数据库 - if (marker.imagePath.isNullOrEmpty()) { - "此标识器无图片".show(this) - } else { - val realPaths: ArrayList = ArrayList() //真实图片路径 - - /** - * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg - * */ - val imagePath = marker.imagePath - if (imagePath.contains(",")) { - val list = imagePath.split(",") - list.forEach { path -> - val url = path.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - } else { - //只有一张图片 - val url = imagePath.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - navigatePageTo(0, realPaths) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 83eeee3..811d26c 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -29,6 +29,7 @@ import com.casic.common.detector.gd.utils.RuntimeCache import com.casic.common.detector.gd.utils.SerialPortCommand import com.casic.common.detector.gd.vm.TaskViewModel +import com.casic.common.detector.gd.widgets.MarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo @@ -140,7 +141,7 @@ binding.markerInfoButton.setOnClickListener { val result = DataBaseManager.get.queryMarkerById(markerId) if (result.isNotEmpty()) { - navigatePageTo(markerId) + MarkerDetailDialog(this).setMarker(result.first()).show() } else { navigatePageTo(markerId) } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt index e769fd9..df76dc0 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt @@ -17,6 +17,7 @@ import com.casic.common.detector.gd.utils.DataBaseManager import com.casic.common.detector.gd.utils.LocaleConstant import com.casic.common.detector.gd.utils.LocationKit +import com.casic.common.detector.gd.widgets.MarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService @@ -73,7 +74,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(nearestMarkerId) if (result.isNotEmpty()) { - navigatePageTo(nearestMarkerId) + MarkerDetailDialog(this).setMarker(result.first()).show() } else { navigatePageTo(nearestMarkerId) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e896199..8d0d2cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - (title) + val result = DataBaseManager.get.queryMarkerById(title) + MarkerDetailDialog(context).setMarker(result.first()).show() } }).build().show() } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt deleted file mode 100644 index 3e2703d..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt +++ /dev/null @@ -1,110 +0,0 @@ -package com.casic.common.detector.gd.view - -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.Gravity -import com.casic.common.detector.gd.bean.MarkerLocalBean -import com.casic.common.detector.gd.databinding.ActivityObjectDetailBinding -import com.casic.common.detector.gd.extensions.appendDownloadUrl -import com.casic.common.detector.gd.utils.DataBaseManager -import com.casic.common.detector.gd.utils.FileType -import com.casic.common.detector.gd.utils.LocaleConstant -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.getScreenHeight -import com.pengxh.kt.lite.extensions.getScreenWidth -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class ObjectDetailActivity : KotlinBaseActivity() { - - private val kTag = "ObjectDetailActivity" - private lateinit var marker: MarkerLocalBean - - override fun initViewBinding(): ActivityObjectDetailBinding { - return ActivityObjectDetailBinding.inflate(layoutInflater) - } - - override fun setupTopBarLayout() { - - } - - override fun observeRequestState() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - window.setGravity(Gravity.CENTER) - val params = window.attributes - params.width = ((getScreenWidth() * 0.9).toInt()) - params.height = ((getScreenHeight() * 0.7).toInt()) - window.attributes = params - - val id = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - try { - marker = DataBaseManager.get.queryMarkerById(id).first() - binding.objectTypeView.text = - LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] - binding.pipelineTypeView.text = marker.pipelineType - binding.pipelineDiameterView.text = marker.pipelineDiameter - binding.pipelineMaterialView.text = marker.pipelineMaterial - binding.buryMethodView.text = marker.buryMethod - binding.buryDeepView.text = marker.buryDepth - binding.areaView.text = marker.area - binding.lineView.text = marker.line - binding.roadView.text = marker.road - binding.constructTimeView.text = marker.constructTime - binding.ownerView.text = marker.owner - binding.identifierIdView.text = marker.markerId - binding.identifierTypeView.text = marker.markerType - binding.identifierDeepView.text = marker.markerDepth - binding.personView.text = marker.installationDept - binding.installTimeView.text = marker.updateTime - binding.remarkView.text = marker.remark - } catch (e: NoSuchElementException) { - e.printStackTrace() - } - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - //查数据库 - if (marker.imagePath.isNullOrEmpty()) { - "此标识器无图片".show(this) - } else { - val realPaths: ArrayList = ArrayList() //真实图片路径 - - /** - * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg - * */ - val imagePath = marker.imagePath - if (imagePath.contains(",")) { - val list = imagePath.split(",") - list.forEach { path -> - val url = path.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - } else { - //只有一张图片 - val url = imagePath.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - navigatePageTo(0, realPaths) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 83eeee3..811d26c 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -29,6 +29,7 @@ import com.casic.common.detector.gd.utils.RuntimeCache import com.casic.common.detector.gd.utils.SerialPortCommand import com.casic.common.detector.gd.vm.TaskViewModel +import com.casic.common.detector.gd.widgets.MarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo @@ -140,7 +141,7 @@ binding.markerInfoButton.setOnClickListener { val result = DataBaseManager.get.queryMarkerById(markerId) if (result.isNotEmpty()) { - navigatePageTo(markerId) + MarkerDetailDialog(this).setMarker(result.first()).show() } else { navigatePageTo(markerId) } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt index e769fd9..df76dc0 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt @@ -17,6 +17,7 @@ import com.casic.common.detector.gd.utils.DataBaseManager import com.casic.common.detector.gd.utils.LocaleConstant import com.casic.common.detector.gd.utils.LocationKit +import com.casic.common.detector.gd.widgets.MarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService @@ -73,7 +74,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(nearestMarkerId) if (result.isNotEmpty()) { - navigatePageTo(nearestMarkerId) + MarkerDetailDialog(this).setMarker(result.first()).show() } else { navigatePageTo(nearestMarkerId) } diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt index ef593f5..5171a63 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt @@ -8,12 +8,17 @@ import com.casic.common.detector.gd.R import com.casic.common.detector.gd.bean.MarkerLocalBean import com.casic.common.detector.gd.databinding.DialogMarkerDetailBinding +import com.casic.common.detector.gd.extensions.appendDownloadUrl +import com.casic.common.detector.gd.utils.FileType import com.casic.common.detector.gd.utils.LocaleConstant +import com.casic.common.detector.gd.view.BigImageActivity import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show -class MarkerDetailDialog constructor(context: Context) : +class MarkerDetailDialog(context: Context) : Dialog(context, R.style.UserDefinedDialogStyle) { private lateinit var marker: MarkerLocalBean @@ -30,8 +35,8 @@ window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes - params.width = ((context.getScreenWidth() * 0.8).toInt()) - params.height = ((context.getScreenHeight() * 0.7).toInt()) + params.width = ((context.getScreenWidth() * 0.97).toInt()) + params.height = ((context.getScreenHeight() * 0.75).toInt()) window.attributes = params } @@ -57,5 +62,31 @@ binding.personView.text = marker.installationDept binding.installTimeView.text = marker.updateTime binding.remarkView.text = marker.remark + + binding.showImageView.setOnClickListener { + //查数据库 + if (marker.imagePath.isNullOrEmpty()) { + "此标识器无图片".show(context) + } else { + val realPaths = ArrayList() //真实图片路径 + + /** + * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg + * */ + val imagePath = marker.imagePath + if (imagePath.contains(",")) { + val list = imagePath.split(",") + list.forEach { path -> + val url = path.appendDownloadUrl(FileType.Image) + realPaths.add(url) + } + } else { + //只有一张图片 + val url = imagePath.appendDownloadUrl(FileType.Image) + realPaths.add(url) + } + context.navigatePageTo(0, realPaths) + } + } } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e896199..8d0d2cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - (title) + val result = DataBaseManager.get.queryMarkerById(title) + MarkerDetailDialog(context).setMarker(result.first()).show() } }).build().show() } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt deleted file mode 100644 index 3e2703d..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/ObjectDetailActivity.kt +++ /dev/null @@ -1,110 +0,0 @@ -package com.casic.common.detector.gd.view - -import android.graphics.Color -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.Gravity -import com.casic.common.detector.gd.bean.MarkerLocalBean -import com.casic.common.detector.gd.databinding.ActivityObjectDetailBinding -import com.casic.common.detector.gd.extensions.appendDownloadUrl -import com.casic.common.detector.gd.utils.DataBaseManager -import com.casic.common.detector.gd.utils.FileType -import com.casic.common.detector.gd.utils.LocaleConstant -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.getScreenHeight -import com.pengxh.kt.lite.extensions.getScreenWidth -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class ObjectDetailActivity : KotlinBaseActivity() { - - private val kTag = "ObjectDetailActivity" - private lateinit var marker: MarkerLocalBean - - override fun initViewBinding(): ActivityObjectDetailBinding { - return ActivityObjectDetailBinding.inflate(layoutInflater) - } - - override fun setupTopBarLayout() { - - } - - override fun observeRequestState() { - - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - window.setGravity(Gravity.CENTER) - val params = window.attributes - params.width = ((getScreenWidth() * 0.9).toInt()) - params.height = ((getScreenHeight() * 0.7).toInt()) - window.attributes = params - - val id = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - try { - marker = DataBaseManager.get.queryMarkerById(id).first() - binding.objectTypeView.text = - LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] - binding.pipelineTypeView.text = marker.pipelineType - binding.pipelineDiameterView.text = marker.pipelineDiameter - binding.pipelineMaterialView.text = marker.pipelineMaterial - binding.buryMethodView.text = marker.buryMethod - binding.buryDeepView.text = marker.buryDepth - binding.areaView.text = marker.area - binding.lineView.text = marker.line - binding.roadView.text = marker.road - binding.constructTimeView.text = marker.constructTime - binding.ownerView.text = marker.owner - binding.identifierIdView.text = marker.markerId - binding.identifierTypeView.text = marker.markerType - binding.identifierDeepView.text = marker.markerDepth - binding.personView.text = marker.installationDept - binding.installTimeView.text = marker.updateTime - binding.remarkView.text = marker.remark - } catch (e: NoSuchElementException) { - e.printStackTrace() - } - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - //查数据库 - if (marker.imagePath.isNullOrEmpty()) { - "此标识器无图片".show(this) - } else { - val realPaths: ArrayList = ArrayList() //真实图片路径 - - /** - * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg - * */ - val imagePath = marker.imagePath - if (imagePath.contains(",")) { - val list = imagePath.split(",") - list.forEach { path -> - val url = path.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - } else { - //只有一张图片 - val url = imagePath.appendDownloadUrl(FileType.Image) - realPaths.add(url) - } - navigatePageTo(0, realPaths) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 83eeee3..811d26c 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -29,6 +29,7 @@ import com.casic.common.detector.gd.utils.RuntimeCache import com.casic.common.detector.gd.utils.SerialPortCommand import com.casic.common.detector.gd.vm.TaskViewModel +import com.casic.common.detector.gd.widgets.MarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.navigatePageTo @@ -140,7 +141,7 @@ binding.markerInfoButton.setOnClickListener { val result = DataBaseManager.get.queryMarkerById(markerId) if (result.isNotEmpty()) { - navigatePageTo(markerId) + MarkerDetailDialog(this).setMarker(result.first()).show() } else { navigatePageTo(markerId) } diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt index e769fd9..df76dc0 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerAuditActivity.kt @@ -17,6 +17,7 @@ import com.casic.common.detector.gd.utils.DataBaseManager import com.casic.common.detector.gd.utils.LocaleConstant import com.casic.common.detector.gd.utils.LocationKit +import com.casic.common.detector.gd.widgets.MarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService @@ -73,7 +74,7 @@ //查库 val result = DataBaseManager.get.queryMarkerById(nearestMarkerId) if (result.isNotEmpty()) { - navigatePageTo(nearestMarkerId) + MarkerDetailDialog(this).setMarker(result.first()).show() } else { navigatePageTo(nearestMarkerId) } diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt index ef593f5..5171a63 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/MarkerDetailDialog.kt @@ -8,12 +8,17 @@ import com.casic.common.detector.gd.R import com.casic.common.detector.gd.bean.MarkerLocalBean import com.casic.common.detector.gd.databinding.DialogMarkerDetailBinding +import com.casic.common.detector.gd.extensions.appendDownloadUrl +import com.casic.common.detector.gd.utils.FileType import com.casic.common.detector.gd.utils.LocaleConstant +import com.casic.common.detector.gd.view.BigImageActivity import com.pengxh.kt.lite.extensions.binding import com.pengxh.kt.lite.extensions.getScreenHeight import com.pengxh.kt.lite.extensions.getScreenWidth +import com.pengxh.kt.lite.extensions.navigatePageTo +import com.pengxh.kt.lite.extensions.show -class MarkerDetailDialog constructor(context: Context) : +class MarkerDetailDialog(context: Context) : Dialog(context, R.style.UserDefinedDialogStyle) { private lateinit var marker: MarkerLocalBean @@ -30,8 +35,8 @@ window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) window.decorView.setBackgroundColor(Color.TRANSPARENT) val params = window.attributes - params.width = ((context.getScreenWidth() * 0.8).toInt()) - params.height = ((context.getScreenHeight() * 0.7).toInt()) + params.width = ((context.getScreenWidth() * 0.97).toInt()) + params.height = ((context.getScreenHeight() * 0.75).toInt()) window.attributes = params } @@ -57,5 +62,31 @@ binding.personView.text = marker.installationDept binding.installTimeView.text = marker.updateTime binding.remarkView.text = marker.remark + + binding.showImageView.setOnClickListener { + //查数据库 + if (marker.imagePath.isNullOrEmpty()) { + "此标识器无图片".show(context) + } else { + val realPaths = ArrayList() //真实图片路径 + + /** + * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg + * */ + val imagePath = marker.imagePath + if (imagePath.contains(",")) { + val list = imagePath.split(",") + list.forEach { path -> + val url = path.appendDownloadUrl(FileType.Image) + realPaths.add(url) + } + } else { + //只有一张图片 + val url = imagePath.appendDownloadUrl(FileType.Image) + realPaths.add(url) + } + context.navigatePageTo(0, realPaths) + } + } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml deleted file mode 100644 index ce5fb93..0000000 --- a/app/src/main/res/layout/activity_object_detail.xml +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -