diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt deleted file mode 100644 index da898b2..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt +++ /dev/null @@ -1,58 +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.databinding.ActivityNewObjectDetailBinding -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.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class NewObjectDetailActivity : KotlinBaseActivity() { - - override fun initViewBinding(): ActivityNewObjectDetailBinding { - return ActivityNewObjectDetailBinding.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.3).toInt()) - window.attributes = params - - val identifierId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - binding.identifierIdView.text = identifierId - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - finish() - "此对象没相关照片".show(this) - } - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt deleted file mode 100644 index da898b2..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt +++ /dev/null @@ -1,58 +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.databinding.ActivityNewObjectDetailBinding -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.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class NewObjectDetailActivity : KotlinBaseActivity() { - - override fun initViewBinding(): ActivityNewObjectDetailBinding { - return ActivityNewObjectDetailBinding.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.3).toInt()) - window.attributes = params - - val identifierId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - binding.identifierIdView.text = identifierId - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - finish() - "此对象没相关照片".show(this) - } - } -} \ 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 811d26c..8b9abd1 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 @@ -30,9 +30,9 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService -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.utils.LoadingDialog @@ -143,7 +143,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(markerId) + NewMarkerDetailDialog(this, markerId) } markerId = "" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt deleted file mode 100644 index da898b2..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt +++ /dev/null @@ -1,58 +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.databinding.ActivityNewObjectDetailBinding -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.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class NewObjectDetailActivity : KotlinBaseActivity() { - - override fun initViewBinding(): ActivityNewObjectDetailBinding { - return ActivityNewObjectDetailBinding.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.3).toInt()) - window.attributes = params - - val identifierId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - binding.identifierIdView.text = identifierId - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - finish() - "此对象没相关照片".show(this) - } - } -} \ 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 811d26c..8b9abd1 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 @@ -30,9 +30,9 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService -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.utils.LoadingDialog @@ -143,7 +143,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(markerId) + NewMarkerDetailDialog(this, markerId) } 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 df76dc0..5ea7f24 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 @@ -18,10 +18,10 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -76,7 +76,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(nearestMarkerId) + NewMarkerDetailDialog(this, nearestMarkerId) } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt deleted file mode 100644 index da898b2..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt +++ /dev/null @@ -1,58 +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.databinding.ActivityNewObjectDetailBinding -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.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class NewObjectDetailActivity : KotlinBaseActivity() { - - override fun initViewBinding(): ActivityNewObjectDetailBinding { - return ActivityNewObjectDetailBinding.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.3).toInt()) - window.attributes = params - - val identifierId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - binding.identifierIdView.text = identifierId - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - finish() - "此对象没相关照片".show(this) - } - } -} \ 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 811d26c..8b9abd1 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 @@ -30,9 +30,9 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService -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.utils.LoadingDialog @@ -143,7 +143,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(markerId) + NewMarkerDetailDialog(this, markerId) } 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 df76dc0..5ea7f24 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 @@ -18,10 +18,10 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -76,7 +76,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(nearestMarkerId) + NewMarkerDetailDialog(this, 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 5171a63..44723f2 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 @@ -2,19 +2,16 @@ import android.app.Dialog import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle 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.extensions.initDialogLayoutParams 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 @@ -30,19 +27,9 @@ private val binding: DialogMarkerDetailBinding by binding() - private fun Dialog.initDialogLayoutParams() { - val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - val params = window.attributes - params.width = ((context.getScreenWidth() * 0.97).toInt()) - params.height = ((context.getScreenHeight() * 0.75).toInt()) - window.attributes = params - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - this.initDialogLayoutParams() + this.initDialogLayoutParams(0.97f, 0.75f) setCanceledOnTouchOutside(true) binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt deleted file mode 100644 index da898b2..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt +++ /dev/null @@ -1,58 +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.databinding.ActivityNewObjectDetailBinding -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.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class NewObjectDetailActivity : KotlinBaseActivity() { - - override fun initViewBinding(): ActivityNewObjectDetailBinding { - return ActivityNewObjectDetailBinding.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.3).toInt()) - window.attributes = params - - val identifierId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - binding.identifierIdView.text = identifierId - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - finish() - "此对象没相关照片".show(this) - } - } -} \ 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 811d26c..8b9abd1 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 @@ -30,9 +30,9 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService -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.utils.LoadingDialog @@ -143,7 +143,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(markerId) + NewMarkerDetailDialog(this, markerId) } 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 df76dc0..5ea7f24 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 @@ -18,10 +18,10 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -76,7 +76,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(nearestMarkerId) + NewMarkerDetailDialog(this, 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 5171a63..44723f2 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 @@ -2,19 +2,16 @@ import android.app.Dialog import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle 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.extensions.initDialogLayoutParams 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 @@ -30,19 +27,9 @@ private val binding: DialogMarkerDetailBinding by binding() - private fun Dialog.initDialogLayoutParams() { - val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - val params = window.attributes - params.width = ((context.getScreenWidth() * 0.97).toInt()) - params.height = ((context.getScreenHeight() * 0.75).toInt()) - window.attributes = params - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - this.initDialogLayoutParams() + this.initDialogLayoutParams(0.97f, 0.75f) setCanceledOnTouchOutside(true) binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt new file mode 100644 index 0000000..eef55bc --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -0,0 +1,28 @@ +package com.casic.common.detector.gd.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.common.detector.gd.R +import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding +import com.casic.common.detector.gd.extensions.initDialogLayoutParams +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.show + +class NewMarkerDetailDialog(context: Context, private val markerId: String) : + Dialog(context, R.style.UserDefinedDialogStyle) { + + private val binding: DialogNewMarkerDetailBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(0.97f, 0.75f) + setCanceledOnTouchOutside(true) + + binding.identifierIdView.text = markerId + binding.showImageView.setOnClickListener { + "此标识器没相关照片".show(context) + dismiss() + } + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt deleted file mode 100644 index da898b2..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt +++ /dev/null @@ -1,58 +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.databinding.ActivityNewObjectDetailBinding -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.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class NewObjectDetailActivity : KotlinBaseActivity() { - - override fun initViewBinding(): ActivityNewObjectDetailBinding { - return ActivityNewObjectDetailBinding.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.3).toInt()) - window.attributes = params - - val identifierId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - binding.identifierIdView.text = identifierId - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - finish() - "此对象没相关照片".show(this) - } - } -} \ 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 811d26c..8b9abd1 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 @@ -30,9 +30,9 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService -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.utils.LoadingDialog @@ -143,7 +143,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(markerId) + NewMarkerDetailDialog(this, markerId) } 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 df76dc0..5ea7f24 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 @@ -18,10 +18,10 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -76,7 +76,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(nearestMarkerId) + NewMarkerDetailDialog(this, 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 5171a63..44723f2 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 @@ -2,19 +2,16 @@ import android.app.Dialog import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle 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.extensions.initDialogLayoutParams 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 @@ -30,19 +27,9 @@ private val binding: DialogMarkerDetailBinding by binding() - private fun Dialog.initDialogLayoutParams() { - val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - val params = window.attributes - params.width = ((context.getScreenWidth() * 0.97).toInt()) - params.height = ((context.getScreenHeight() * 0.75).toInt()) - window.attributes = params - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - this.initDialogLayoutParams() + this.initDialogLayoutParams(0.97f, 0.75f) setCanceledOnTouchOutside(true) binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt new file mode 100644 index 0000000..eef55bc --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -0,0 +1,28 @@ +package com.casic.common.detector.gd.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.common.detector.gd.R +import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding +import com.casic.common.detector.gd.extensions.initDialogLayoutParams +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.show + +class NewMarkerDetailDialog(context: Context, private val markerId: String) : + Dialog(context, R.style.UserDefinedDialogStyle) { + + private val binding: DialogNewMarkerDetailBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(0.97f, 0.75f) + setCanceledOnTouchOutside(true) + + binding.identifierIdView.text = markerId + binding.showImageView.setOnClickListener { + "此标识器没相关照片".show(context) + dismiss() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt index e25694f..023dd92 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt @@ -5,7 +5,6 @@ import android.content.Context import android.content.pm.PackageManager import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.location.GnssStatus import android.location.Location import android.location.LocationListener @@ -18,17 +17,15 @@ import com.casic.common.detector.gd.adapter.SatelliteRecyclerAdapter import com.casic.common.detector.gd.callback.OnGetLocationListener import com.casic.common.detector.gd.databinding.DialogSatelliteStatusBinding +import com.casic.common.detector.gd.extensions.initDialogLayoutParams import com.casic.common.detector.gd.extensions.toDegree import com.casic.common.detector.gd.model.Satellite import com.casic.common.detector.gd.utils.LocationKit import com.pengxh.kt.lite.divider.RecyclerViewItemDivider 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.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.TitleBarView -import kotlin.math.roundToInt class SatelliteStatusDialog(private val context: Context) : Dialog(context, R.style.UserDefinedDialogStyle), LocationListener { @@ -51,13 +48,7 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - val params = window.attributes - params.width = (context.getScreenWidth() * 0.97).roundToInt() - params.height = (context.getScreenHeight() * 0.80).roundToInt() - window.attributes = params + this.initDialogLayoutParams(0.97f, 0.80f) if (ActivityCompat.checkSelfPermission( context, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d0d2cb..9aaed04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -66,9 +66,6 @@ - diff --git a/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt new file mode 100644 index 0000000..88535fb --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/extensions/Dialog.kt @@ -0,0 +1,18 @@ +package com.casic.common.detector.gd.extensions + +import android.app.Dialog +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth +import kotlin.math.roundToInt + +fun Dialog.initDialogLayoutParams(widthRatio: Float, heightRatio: Float) { + val window = this.window ?: return + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + val params = window.attributes + params.width = ((context.getScreenWidth() * widthRatio).roundToInt()) + params.height = ((context.getScreenHeight() * heightRatio).roundToInt()) + window.attributes = params +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt deleted file mode 100644 index da898b2..0000000 --- a/app/src/main/java/com/casic/common/detector/gd/view/NewObjectDetailActivity.kt +++ /dev/null @@ -1,58 +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.databinding.ActivityNewObjectDetailBinding -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.show -import com.pengxh.kt.lite.utils.LiteKitConstant -import com.pengxh.kt.lite.widget.TitleBarView - -class NewObjectDetailActivity : KotlinBaseActivity() { - - override fun initViewBinding(): ActivityNewObjectDetailBinding { - return ActivityNewObjectDetailBinding.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.3).toInt()) - window.attributes = params - - val identifierId = intent.getStringExtra(LiteKitConstant.INTENT_PARAM_KEY)!! - binding.identifierIdView.text = identifierId - } - - override fun initEvent() { - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - - } - - override fun onRightClick() { - finish() - } - }) - - binding.showImageView.setOnClickListener { - finish() - "此对象没相关照片".show(this) - } - } -} \ 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 811d26c..8b9abd1 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 @@ -30,9 +30,9 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.extensions.getSystemService -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.utils.LoadingDialog @@ -143,7 +143,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(markerId) + NewMarkerDetailDialog(this, markerId) } 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 df76dc0..5ea7f24 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 @@ -18,10 +18,10 @@ 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.NewMarkerDetailDialog import com.casic.common.detector.gd.widgets.RadarScanView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.getSystemService -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -76,7 +76,7 @@ if (result.isNotEmpty()) { MarkerDetailDialog(this).setMarker(result.first()).show() } else { - navigatePageTo(nearestMarkerId) + NewMarkerDetailDialog(this, 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 5171a63..44723f2 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 @@ -2,19 +2,16 @@ import android.app.Dialog import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle 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.extensions.initDialogLayoutParams 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 @@ -30,19 +27,9 @@ private val binding: DialogMarkerDetailBinding by binding() - private fun Dialog.initDialogLayoutParams() { - val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - val params = window.attributes - params.width = ((context.getScreenWidth() * 0.97).toInt()) - params.height = ((context.getScreenHeight() * 0.75).toInt()) - window.attributes = params - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - this.initDialogLayoutParams() + this.initDialogLayoutParams(0.97f, 0.75f) setCanceledOnTouchOutside(true) binding.objectTypeView.text = LocaleConstant.POINT_TYPE_ARRAY[marker.objectType.toInt() - 1] diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt new file mode 100644 index 0000000..eef55bc --- /dev/null +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/NewMarkerDetailDialog.kt @@ -0,0 +1,28 @@ +package com.casic.common.detector.gd.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.common.detector.gd.R +import com.casic.common.detector.gd.databinding.DialogNewMarkerDetailBinding +import com.casic.common.detector.gd.extensions.initDialogLayoutParams +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.show + +class NewMarkerDetailDialog(context: Context, private val markerId: String) : + Dialog(context, R.style.UserDefinedDialogStyle) { + + private val binding: DialogNewMarkerDetailBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(0.97f, 0.75f) + setCanceledOnTouchOutside(true) + + binding.identifierIdView.text = markerId + binding.showImageView.setOnClickListener { + "此标识器没相关照片".show(context) + dismiss() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt index e25694f..023dd92 100644 --- a/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt +++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SatelliteStatusDialog.kt @@ -5,7 +5,6 @@ import android.content.Context import android.content.pm.PackageManager import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.location.GnssStatus import android.location.Location import android.location.LocationListener @@ -18,17 +17,15 @@ import com.casic.common.detector.gd.adapter.SatelliteRecyclerAdapter import com.casic.common.detector.gd.callback.OnGetLocationListener import com.casic.common.detector.gd.databinding.DialogSatelliteStatusBinding +import com.casic.common.detector.gd.extensions.initDialogLayoutParams import com.casic.common.detector.gd.extensions.toDegree import com.casic.common.detector.gd.model.Satellite import com.casic.common.detector.gd.utils.LocationKit import com.pengxh.kt.lite.divider.RecyclerViewItemDivider 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.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.TitleBarView -import kotlin.math.roundToInt class SatelliteStatusDialog(private val context: Context) : Dialog(context, R.style.UserDefinedDialogStyle), LocationListener { @@ -51,13 +48,7 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val window = this.window ?: return - window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - window.decorView.setBackgroundColor(Color.TRANSPARENT) - val params = window.attributes - params.width = (context.getScreenWidth() * 0.97).roundToInt() - params.height = (context.getScreenHeight() * 0.80).roundToInt() - window.attributes = params + this.initDialogLayoutParams(0.97f, 0.80f) if (ActivityCompat.checkSelfPermission( context, Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml deleted file mode 100644 index 3143760..0000000 --- a/app/src/main/res/layout/activity_new_object_detail.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -