diff --git a/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt index eb68e92..4bd08f9 100644 --- a/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt +++ b/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt @@ -37,55 +37,59 @@ window.attributes = params val objectJson = intent.getStringExtra(Constant.INTENT_PARAM)!! - val labelBean = gson.fromJson( - objectJson, object : TypeToken() {}.type - ) + try { + val labelBean = gson.fromJson( + objectJson, object : TypeToken() {}.type + ) - objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[labelBean.objectType.toInt() - 1] - pipelineTypeView.text = labelBean.pipelineType - pipelineDiameterView.text = labelBean.pipelineDiameter - pipelineMaterialView.text = labelBean.pipelineMaterial - buryMethodView.text = labelBean.buryMethod - buryDeepView.text = labelBean.buryDeep - areaView.text = labelBean.area - lineView.text = labelBean.line - roadView.text = labelBean.road - constructTimeView.text = labelBean.constructTime - ownerView.text = labelBean.owner - identifierIdView.text = labelBean.identifierId - identifierTypeView.text = labelBean.identifierType - identifierDeepView.text = labelBean.identifierDeep - personView.text = labelBean.person - installTimeView.text = labelBean.installTime - remarkView.text = labelBean.remark + objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[labelBean.objectType.toInt() - 1] + pipelineTypeView.text = labelBean.pipelineType + pipelineDiameterView.text = labelBean.pipelineDiameter + pipelineMaterialView.text = labelBean.pipelineMaterial + buryMethodView.text = labelBean.buryMethod + buryDeepView.text = labelBean.buryDeep + areaView.text = labelBean.area + lineView.text = labelBean.line + roadView.text = labelBean.road + constructTimeView.text = labelBean.constructTime + ownerView.text = labelBean.owner + identifierIdView.text = labelBean.identifierId + identifierTypeView.text = labelBean.identifierType + identifierDeepView.text = labelBean.identifierDeep + personView.text = labelBean.person + installTimeView.text = labelBean.installTime + remarkView.text = labelBean.remark - closeView.setOnClickListener { finish() } + closeView.setOnClickListener { finish() } - showImageView.setOnClickListener { - //查数据库 - if (labelBean.imagePath.isNullOrEmpty()) { - "此标识器无图片".show(context) - } else { - val realPaths: ArrayList = ArrayList() //真实图片路径 + showImageView.setOnClickListener { + //查数据库 + if (labelBean.imagePath.isNullOrEmpty()) { + "此标识器无图片".show(context) + } 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 = labelBean.imagePath - if (imagePath.contains(",")) { - val list = imagePath.split(",") - list.forEach { path -> - val url = path.appendDownloadUrl(FileType.IMAGE) + /** + * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg + * */ + val imagePath = labelBean.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) } - } else { - //只有一张图片 - val url = imagePath.appendDownloadUrl(FileType.IMAGE) - realPaths.add(url) + Log.d(kTag, "onCreate => ${realPaths.toJson()}") + navigatePageTo(0, realPaths) } - Log.d(kTag, "onCreate => ${realPaths.toJson()}") - navigatePageTo(0, realPaths) } + } catch (e: NumberFormatException) { + e.printStackTrace() } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt b/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt index eb68e92..4bd08f9 100644 --- a/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt +++ b/app/src/main/java/com/casic/detector/view/ObjectDetailActivity.kt @@ -37,55 +37,59 @@ window.attributes = params val objectJson = intent.getStringExtra(Constant.INTENT_PARAM)!! - val labelBean = gson.fromJson( - objectJson, object : TypeToken() {}.type - ) + try { + val labelBean = gson.fromJson( + objectJson, object : TypeToken() {}.type + ) - objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[labelBean.objectType.toInt() - 1] - pipelineTypeView.text = labelBean.pipelineType - pipelineDiameterView.text = labelBean.pipelineDiameter - pipelineMaterialView.text = labelBean.pipelineMaterial - buryMethodView.text = labelBean.buryMethod - buryDeepView.text = labelBean.buryDeep - areaView.text = labelBean.area - lineView.text = labelBean.line - roadView.text = labelBean.road - constructTimeView.text = labelBean.constructTime - ownerView.text = labelBean.owner - identifierIdView.text = labelBean.identifierId - identifierTypeView.text = labelBean.identifierType - identifierDeepView.text = labelBean.identifierDeep - personView.text = labelBean.person - installTimeView.text = labelBean.installTime - remarkView.text = labelBean.remark + objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[labelBean.objectType.toInt() - 1] + pipelineTypeView.text = labelBean.pipelineType + pipelineDiameterView.text = labelBean.pipelineDiameter + pipelineMaterialView.text = labelBean.pipelineMaterial + buryMethodView.text = labelBean.buryMethod + buryDeepView.text = labelBean.buryDeep + areaView.text = labelBean.area + lineView.text = labelBean.line + roadView.text = labelBean.road + constructTimeView.text = labelBean.constructTime + ownerView.text = labelBean.owner + identifierIdView.text = labelBean.identifierId + identifierTypeView.text = labelBean.identifierType + identifierDeepView.text = labelBean.identifierDeep + personView.text = labelBean.person + installTimeView.text = labelBean.installTime + remarkView.text = labelBean.remark - closeView.setOnClickListener { finish() } + closeView.setOnClickListener { finish() } - showImageView.setOnClickListener { - //查数据库 - if (labelBean.imagePath.isNullOrEmpty()) { - "此标识器无图片".show(context) - } else { - val realPaths: ArrayList = ArrayList() //真实图片路径 + showImageView.setOnClickListener { + //查数据库 + if (labelBean.imagePath.isNullOrEmpty()) { + "此标识器无图片".show(context) + } 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 = labelBean.imagePath - if (imagePath.contains(",")) { - val list = imagePath.split(",") - list.forEach { path -> - val url = path.appendDownloadUrl(FileType.IMAGE) + /** + * /images/markers/202307/0008818922_EVENT_20230704_160349_0_1.jpg,/images/markers/202307/0008818922_EVENT_20230704_160406_0_2.jpg + * */ + val imagePath = labelBean.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) } - } else { - //只有一张图片 - val url = imagePath.appendDownloadUrl(FileType.IMAGE) - realPaths.add(url) + Log.d(kTag, "onCreate => ${realPaths.toJson()}") + navigatePageTo(0, realPaths) } - Log.d(kTag, "onCreate => ${realPaths.toJson()}") - navigatePageTo(0, realPaths) } + } catch (e: NumberFormatException) { + e.printStackTrace() } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt index 2e4fb08..2e4c7b8 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -42,7 +42,7 @@ private var fastResId = 0 private val gpioManager by lazy { GpioManager() } private lateinit var weakReferenceHandler: WeakReferenceHandler - private val timer by lazy { Timer() } + private val detectTimer by lazy { Timer() } private val decimal by lazy { DecimalFormat("#.0") } private var identifierId = "" private val lastDegreeMap by lazy { HashMap() } @@ -79,7 +79,7 @@ fastResId = fastSoundPool.load(this, R.raw.ring2, 1) //搜索信号 - timer.schedule(object : TimerTask() { + detectTimer.schedule(object : TimerTask() { override fun run() { try { if (!isDetectDepth) { @@ -93,7 +93,7 @@ }, 100, 150) //发送搜索能量指令 - timer.schedule(object : TimerTask() { + detectTimer.schedule(object : TimerTask() { override fun run() { try { if (!isDetectDepth) { @@ -296,6 +296,7 @@ override fun onDestroy() { gpioManager.setGpioLow("18") + detectTimer.cancel() super.onDestroy() } } \ No newline at end of file