Commit a76b6d9a authored by 马乐's avatar 马乐

1.增加备用对话框

parent df19766b
...@@ -45,6 +45,7 @@ import com.waytous.anticollision.ui.view.DelayCauseDialog ...@@ -45,6 +45,7 @@ import com.waytous.anticollision.ui.view.DelayCauseDialog
import com.waytous.anticollision.ui.view.FaultCauseDialog import com.waytous.anticollision.ui.view.FaultCauseDialog
import com.waytous.anticollision.ui.view.MoreFeaturesPopup import com.waytous.anticollision.ui.view.MoreFeaturesPopup
import com.waytous.anticollision.ui.view.ReportStatusPopup import com.waytous.anticollision.ui.view.ReportStatusPopup
import com.waytous.anticollision.ui.view.StandbyDialog
import com.waytous.anticollision.ui.view.WorkStatusEditPopup import com.waytous.anticollision.ui.view.WorkStatusEditPopup
import com.waytous.anticollision.utils.BitmapUtils import com.waytous.anticollision.utils.BitmapUtils
import com.waytous.anticollision.utils.LATITUDE import com.waytous.anticollision.utils.LATITUDE
...@@ -108,6 +109,8 @@ open class BaseMapFragment : Fragment() { ...@@ -108,6 +109,8 @@ open class BaseMapFragment : Fragment() {
lateinit var delaySelectDialog: DelayCauseDialog lateinit var delaySelectDialog: DelayCauseDialog
lateinit var standbyDialog: StandbyDialog
val iconCurrentNormalVehicleBitmap by lazy { val iconCurrentNormalVehicleBitmap by lazy {
BitmapUtils.bitmapFromDrawableRes(requireContext(), R.drawable.my_vehicle_normal) BitmapUtils.bitmapFromDrawableRes(requireContext(), R.drawable.my_vehicle_normal)
} }
...@@ -169,6 +172,7 @@ open class BaseMapFragment : Fragment() { ...@@ -169,6 +172,7 @@ open class BaseMapFragment : Fragment() {
layoutMapBoxBinding = LayoutMapBoxBinding.inflate(LayoutInflater.from(requireContext())) layoutMapBoxBinding = LayoutMapBoxBinding.inflate(LayoutInflater.from(requireContext()))
reportStatusDialog = FaultCauseDialog(requireContext(),R.style.DialogStyle) reportStatusDialog = FaultCauseDialog(requireContext(),R.style.DialogStyle)
delaySelectDialog = DelayCauseDialog(requireContext(),R.style.DialogStyle) delaySelectDialog = DelayCauseDialog(requireContext(),R.style.DialogStyle)
standbyDialog = StandbyDialog(requireContext(),R.style.DialogStyle)
layoutMapBoxBinding.mapView.run { layoutMapBoxBinding.mapView.run {
logo.enabled = false logo.enabled = false
compass.enabled = false compass.enabled = false
...@@ -192,6 +196,7 @@ open class BaseMapFragment : Fragment() { ...@@ -192,6 +196,7 @@ open class BaseMapFragment : Fragment() {
it.setBackgroundColor(R.color.color_99000000) it.setBackgroundColor(R.color.color_99000000)
it.itemFault(reportStatusDialog) it.itemFault(reportStatusDialog)
it.itemDelay(delaySelectDialog) it.itemDelay(delaySelectDialog)
it.itemStandby(standbyDialog)
} }
} }
......
...@@ -2,20 +2,16 @@ package com.waytous.anticollision.ui.view ...@@ -2,20 +2,16 @@ package com.waytous.anticollision.ui.view
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View
import android.view.WindowManager import android.view.WindowManager
import android.widget.RadioGroup import android.widget.RadioGroup
import android.widget.RadioGroup.OnCheckedChangeListener import android.widget.RadioGroup.OnCheckedChangeListener
import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import com.blankj.utilcode.util.BarUtils import com.blankj.utilcode.util.BarUtils
import com.blankj.utilcode.util.KeyboardUtils import com.blankj.utilcode.util.KeyboardUtils
import com.blankj.utilcode.util.LogUtils import com.blankj.utilcode.util.LogUtils
import com.blankj.utilcode.util.ScreenUtils
import com.waytous.anticollision.R import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.DialogFaultCauseSelectBinding import com.waytous.anticollision.databinding.DialogFaultCauseSelectBinding
......
...@@ -30,7 +30,9 @@ class ReportStatusPopup(context: Context?) : BasePopupWindow(context) { ...@@ -30,7 +30,9 @@ class ReportStatusPopup(context: Context?) : BasePopupWindow(context) {
} }
} }
fun itemStandby(){ fun itemStandby(dialog: Dialog){
binding.reportDialogStandby.setOnClickListener {
dialog.show()
}
} }
} }
\ No newline at end of file
package com.waytous.anticollision.ui.view
import android.app.Dialog
import android.content.Context
import android.graphics.Color
import android.os.Bundle
import android.text.Spannable
import android.text.SpannableString
import android.text.style.ForegroundColorSpan
import android.view.LayoutInflater
import android.view.WindowManager
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import com.blankj.utilcode.util.BarUtils
import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.DialogStandbySelectBinding
class StandbyDialog(context: Context, themeResId: Int) : Dialog(context, themeResId) {
private lateinit var binding:DialogStandbySelectBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
window?.let { BarUtils.setNavBarVisibility(it,false) }
window?.setLayout(context.resources.getDimension(R.dimen.dp_560).toInt(),context.resources.getDimension(R.dimen.dp_340).toInt())
val inflater = LayoutInflater.from(context).also {
it.inflate(R.layout.dialog_standby_select,null)
}
binding = DialogStandbySelectBinding.inflate(inflater)
setContentView(binding.root)
binding.dialogStandbyConfirm.setOnClickListener { }
binding.dialogStandbyCancel.setOnClickListener {
dismiss()
}
setMessageFontStyle()
}
private fun setMessageFontStyle(){
val spannableString = SpannableString(context.getString(R.string.dialog_standby_message))
val foregroundColorSpan = ForegroundColorSpan(Color.parseColor("#ff3684f9"))
spannableString.setSpan(foregroundColorSpan,5,7,Spannable.SPAN_INCLUSIVE_INCLUSIVE)
binding.dialogMessage.text = spannableString
}
override fun show() {
window?.setFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
super.show()
val controller = window?.let { WindowCompat.getInsetsController(it,it.decorView) }
controller?.hide(WindowInsetsCompat.Type.systemBars())
window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="@dimen/dp_492" android:height="@dimen/dp_84"/>
<stroke android:width="@dimen/dp_1" android:color="@color/color_1a000000" />
<corners android:bottomRightRadius="@dimen/dp_16"/>
</shape>
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_984" android:layout_width="@dimen/dp_984"
android:layout_height="@dimen/dp_636" android:layout_height="@dimen/dp_636"
app:cardCornerRadius="@dimen/dp_16" app:cardCornerRadius="@dimen/dp_20"
android:background="@drawable/drawable_bg_map_box"
tools:context=".ui.MainActivity"> tools:context=".ui.MainActivity">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -188,7 +187,7 @@ ...@@ -188,7 +187,7 @@
android:id="@+id/delayCauseConfirm" android:id="@+id/delayCauseConfirm"
android:layout_width="@dimen/dp_0" android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_fault_cause_button1" android:background="@drawable/background_dialog_button1"
android:gravity="center" android:gravity="center"
android:text="@string/confirm" android:text="@string/confirm"
android:textSize="@dimen/sp_28" android:textSize="@dimen/sp_28"
...@@ -202,7 +201,7 @@ ...@@ -202,7 +201,7 @@
android:id="@+id/delayCauseCancel" android:id="@+id/delayCauseCancel"
android:layout_width="@dimen/dp_0" android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_fault_cause_button2" android:background="@drawable/background_dialog_button1"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textSize="@dimen/sp_28" android:textSize="@dimen/sp_28"
......
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_984" android:layout_width="@dimen/dp_984"
android:layout_height="@dimen/dp_636" android:layout_height="@dimen/dp_636"
app:cardCornerRadius="@dimen/dp_16" app:cardCornerRadius="@dimen/dp_20"
android:background="@drawable/drawable_bg_map_box"
tools:context=".ui.MainActivity"> tools:context=".ui.MainActivity">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -169,7 +168,7 @@ ...@@ -169,7 +168,7 @@
android:id="@+id/faultCauseConfirm" android:id="@+id/faultCauseConfirm"
android:layout_width="@dimen/dp_0" android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_fault_cause_button1" android:background="@drawable/background_dialog_button1"
android:gravity="center" android:gravity="center"
android:text="@string/confirm" android:text="@string/confirm"
android:textSize="@dimen/sp_28" android:textSize="@dimen/sp_28"
...@@ -183,7 +182,7 @@ ...@@ -183,7 +182,7 @@
android:id="@+id/faultCauseCancel" android:id="@+id/faultCauseCancel"
android:layout_width="@dimen/dp_0" android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_fault_cause_button2" android:background="@drawable/background_dialog_button1"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textSize="@dimen/sp_28" android:textSize="@dimen/sp_28"
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_560"
android:layout_height="@dimen/dp_340"
app:cardCornerRadius="@dimen/dp_20"
tools:context=".ui.MainActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/dialogStandbyLogo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@mipmap/icon_report_standby"
android:layout_marginTop="@dimen/dp_80"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/dialogMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/dialog_standby_message"
android:textSize="@dimen/sp_24"
android:textColor="@color/color_ff333333"
app:layout_constraintTop_toBottomOf="@id/dialogStandbyLogo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/dialogStandbyConfirm"
android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content"
android:background="@drawable/background_dialog_button1"
android:gravity="center"
android:text="@string/confirm"
android:textSize="@dimen/sp_28"
android:textColor="@drawable/color_text_btn_3"
android:focusable="true"
android:clickable="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/dialogStandbyCancel"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/dialogStandbyCancel"
android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content"
android:background="@drawable/background_dialog_button1"
android:gravity="center"
android:text="@string/cancel"
android:textSize="@dimen/sp_28"
android:textColor="@drawable/color_text_btn_3"
android:focusable="true"
android:clickable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/dialogStandbyConfirm"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
\ No newline at end of file
...@@ -388,6 +388,7 @@ ...@@ -388,6 +388,7 @@
<dimen name="dp_472">472dp</dimen> <dimen name="dp_472">472dp</dimen>
<dimen name="dp_492">492dp</dimen> <dimen name="dp_492">492dp</dimen>
<dimen name="dp_500">500dp</dimen> <dimen name="dp_500">500dp</dimen>
<dimen name="dp_560">560dp</dimen>
<dimen name="dp_600">600dp</dimen> <dimen name="dp_600">600dp</dimen>
<dimen name="dp_636">636dp</dimen> <dimen name="dp_636">636dp</dimen>
<dimen name="dp_652">652dp</dimen> <dimen name="dp_652">652dp</dimen>
......
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
<string name="delay_cause_scheduled_outage">计划停电</string> <string name="delay_cause_scheduled_outage">计划停电</string>
<string name="delay_cause_blasting_impact">爆破影响</string> <string name="delay_cause_blasting_impact">爆破影响</string>
<string name="close_the_dialog">关闭对话框</string> <string name="close_the_dialog">关闭对话框</string>
<string name="dialog_standby_message">确定上报 备用 状态吗?</string>
<string name="collect_data_text">采集状态:%1s 采集点数:%2d 速度:%3dKM/h 当前位置:%4f,%5f 高程:%6fm</string> <string name="collect_data_text">采集状态:%1s 采集点数:%2d 速度:%3dKM/h 当前位置:%4f,%5f 高程:%6fm</string>
<string name="confirm">确定</string> <string name="confirm">确定</string>
<string name="cancel">取消</string> <string name="cancel">取消</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment