Commit f0aca520 authored by 马乐's avatar 马乐

1.完成延时选择对话框

parent ebe8f712
...@@ -35,6 +35,7 @@ import com.waytous.anticollision.databinding.CurrentVehicleViewAnnotationLayoutB ...@@ -35,6 +35,7 @@ import com.waytous.anticollision.databinding.CurrentVehicleViewAnnotationLayoutB
import com.waytous.anticollision.databinding.LayoutMapBoxBinding import com.waytous.anticollision.databinding.LayoutMapBoxBinding
import com.waytous.anticollision.databinding.OtherVehicleViewAnnotationLayoutBinding import com.waytous.anticollision.databinding.OtherVehicleViewAnnotationLayoutBinding
import com.waytous.anticollision.repository.MainRepository import com.waytous.anticollision.repository.MainRepository
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
...@@ -99,6 +100,8 @@ open class BaseMapFragment : Fragment() { ...@@ -99,6 +100,8 @@ open class BaseMapFragment : Fragment() {
lateinit var reportStatusDialog: FaultCauseDialog lateinit var reportStatusDialog: FaultCauseDialog
lateinit var delaySelectDialog: DelayCauseDialog
val iconCurrentNormalVehicleBitmap by lazy { val iconCurrentNormalVehicleBitmap by lazy {
BitmapUtils.bitmapFromDrawableRes(requireContext(), R.drawable.my_vehicle_normal) BitmapUtils.bitmapFromDrawableRes(requireContext(), R.drawable.my_vehicle_normal)
} }
...@@ -159,6 +162,7 @@ open class BaseMapFragment : Fragment() { ...@@ -159,6 +162,7 @@ open class BaseMapFragment : Fragment() {
BarUtils.setNavBarVisibility(requireActivity(),false) BarUtils.setNavBarVisibility(requireActivity(),false)
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)
layoutMapBoxBinding.mapView.run { layoutMapBoxBinding.mapView.run {
logo.enabled = false logo.enabled = false
compass.enabled = false compass.enabled = false
...@@ -181,6 +185,7 @@ open class BaseMapFragment : Fragment() { ...@@ -181,6 +185,7 @@ open class BaseMapFragment : Fragment() {
it.popupGravity = Gravity.TOP or Gravity.CENTER it.popupGravity = Gravity.TOP or Gravity.CENTER
it.setBackgroundColor(R.color.color_99000000) it.setBackgroundColor(R.color.color_99000000)
it.itemFault(reportStatusDialog) it.itemFault(reportStatusDialog)
it.itemDelay(delaySelectDialog)
} }
} }
......
...@@ -10,6 +10,7 @@ import androidx.appcompat.app.AlertDialog ...@@ -10,6 +10,7 @@ import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.viewModels import androidx.fragment.app.viewModels
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.blankj.utilcode.util.BarUtils
import com.mapbox.maps.MapView import com.mapbox.maps.MapView
import com.waytous.anticollision.R import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.DialogFaultCauseSelectBinding import com.waytous.anticollision.databinding.DialogFaultCauseSelectBinding
...@@ -42,6 +43,7 @@ class HomeNoVideoFragment : BaseMapFragment() { ...@@ -42,6 +43,7 @@ class HomeNoVideoFragment : BaseMapFragment() {
container: ViewGroup?, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View { ): View {
BarUtils.setNavBarVisibility(requireActivity(),false)
val homeViewModel = val homeViewModel =
ViewModelProvider(this)[HomeViewModel::class.java] ViewModelProvider(this)[HomeViewModel::class.java]
_binding = FragmentNoVideoHomeBinding.inflate(inflater, container, false) _binding = FragmentNoVideoHomeBinding.inflate(inflater, container, false)
......
package com.waytous.anticollision.ui.view
import android.content.Context
import android.os.Bundle
import android.view.LayoutInflater
import android.widget.RadioGroup
import android.widget.RadioGroup.OnCheckedChangeListener
import androidx.appcompat.app.AlertDialog
import com.blankj.utilcode.util.BarUtils
import com.blankj.utilcode.util.LogUtils
import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.DialogDelayCauseSelectBinding
class DelayCauseDialog(context: Context, themeResId: Int) : AlertDialog(context, themeResId) {
private lateinit var binding:DialogDelayCauseSelectBinding
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
window?.let { BarUtils.setNavBarVisibility(it,false) }
window?.setLayout(context.resources.getDimension(R.dimen.dp_984).toInt(),context.resources.getDimension(R.dimen.dp_636).toInt())
val inflater = LayoutInflater.from(context).also {
it.inflate(R.layout.dialog_delay_cause_select,null)
}
binding = DialogDelayCauseSelectBinding.inflate(inflater)
setContentView(binding.root)
binding.radioGroup1.setOnCheckedChangeListener(DelaySelectItemCheckedListener())
binding.radioGroup2.setOnCheckedChangeListener(DelaySelectItemCheckedListener())
binding.radioGroup3.setOnCheckedChangeListener(DelaySelectItemCheckedListener())
binding.delayCauseConfirm.setOnClickListener { }
binding.delayCauseCancel.setOnClickListener {
dismiss()
window?.let { BarUtils.setNavBarVisibility(it,false) }
}
binding.delayCauseSelectClose.setOnClickListener {
dismiss()
window?.let { BarUtils.setNavBarVisibility(it,false) }
}
}
inner class DelaySelectItemCheckedListener:OnCheckedChangeListener{
override fun onCheckedChanged(group: RadioGroup?, checkedId: Int) {
when(group?.id){
R.id.radioGroup1 ->{
binding.radioGroup2.setOnCheckedChangeListener(null)
binding.radioGroup2.clearCheck()
binding.radioGroup3.setOnCheckedChangeListener(null)
binding.radioGroup3.clearCheck()
when(checkedId){
R.id.itemShiftsChange->{
LogUtils.d("交接班")
}
R.id.itemStandbyPark->{
LogUtils.d("备停")
}
R.id.itemWeatherEffect->{
LogUtils.d("天气影响")
}
R.id.itemExternalReasons->{
LogUtils.d("外界原因")
}
}
binding.radioGroup2.setOnCheckedChangeListener(this)
binding.radioGroup3.setOnCheckedChangeListener(this)
}
R.id.radioGroup2 ->{
binding.radioGroup1.setOnCheckedChangeListener(null)
binding.radioGroup1.clearCheck()
binding.radioGroup3.setOnCheckedChangeListener(null)
binding.radioGroup3.clearCheck()
when(checkedId){
R.id.itemFaultOutage->{
LogUtils.d("故障停电")
}
R.id.itemShoveling->{
LogUtils.d("待铲")
}
R.id.itemScheduledOutage->{
LogUtils.d("计划停电")
}
R.id.itemBlastingImpact->{
LogUtils.d("爆破影响")
}
}
binding.radioGroup1.setOnCheckedChangeListener(this)
binding.radioGroup3.setOnCheckedChangeListener(this)
}
R.id.radioGroup3 ->{
binding.radioGroup1.setOnCheckedChangeListener(null)
binding.radioGroup1.clearCheck()
binding.radioGroup2.setOnCheckedChangeListener(null)
binding.radioGroup2.clearCheck()
when(checkedId){
R.id.itemOtherInput->{
LogUtils.d("其他录入")
}
}
binding.radioGroup1.setOnCheckedChangeListener(this)
binding.radioGroup2.setOnCheckedChangeListener(this)
}
}
}
}
}
\ No newline at end of file
...@@ -29,9 +29,11 @@ class FaultCauseDialog(context: Context, themeResId: Int) : AlertDialog(context, ...@@ -29,9 +29,11 @@ class FaultCauseDialog(context: Context, themeResId: Int) : AlertDialog(context,
binding.faultCauseConfirm.setOnClickListener { } binding.faultCauseConfirm.setOnClickListener { }
binding.faultCauseCancel.setOnClickListener { binding.faultCauseCancel.setOnClickListener {
dismiss() dismiss()
window?.let { BarUtils.setNavBarVisibility(it,false) }
} }
binding.faultCauseSelectClose.setOnClickListener { binding.faultCauseSelectClose.setOnClickListener {
dismiss() dismiss()
window?.let { BarUtils.setNavBarVisibility(it,false) }
} }
} }
......
...@@ -18,8 +18,10 @@ class ReportStatusPopup(context: Context?) : BasePopupWindow(context) { ...@@ -18,8 +18,10 @@ class ReportStatusPopup(context: Context?) : BasePopupWindow(context) {
} }
fun itemDelay(){ fun itemDelay(dialog:AlertDialog){
binding.reportDialogDelay.setOnClickListener {
dialog.show()
}
} }
fun itemFault(dialog:AlertDialog){ fun itemFault(dialog:AlertDialog){
......
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_blasting_impact_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_blasting_impact_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_external_reasons_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_external_reasons_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_fault_outage_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_fault_outage_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_scheduled_outage_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_scheduled_outage_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_shifts_change_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_shifts_change_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_shoveling_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_shoveling_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_standby_park_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_standby_park_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_delay_weather_effect_light" android:state_checked="false"/>
<item android:drawable="@drawable/icon_delay_weather_effect_night" android:state_checked="true"/>
</selector>
\ No newline at end of file
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="46.34dp"
android:height="45.59dp"
android:viewportWidth="46.34"
android:viewportHeight="45.59">
<path
android:pathData="M44.4,20.83l-8.29,4V14.93c0,-1 -0.87,-1.59 -1.6,-1l-5.82,4.67L25.93,1.2a1.07,1.07 0,0 0,0 -0.4A0.86,0.86 0,0 0,25.8 0.43a0.94,0.94 0,0 0,-0.28 -0.28A1,1 0,0 0,24.75 0a1,1 0,0 0,-0.36 0.18,1 1,0 0,0 -0.25,0.31 1,1 0,0 0,-0.1 0.39L18.23,16.56l-9,-7.69c-0.87,-0.58 -1.74,0.29 -1.6,1.3l2.77,15.09 -7.26,-0.87c-0.9,0.14 -1,1.42 -0.43,2l5,8.56L4.53,38a0.94,0.94 0,0 0,-0.28 0.49,1 1,0 0,0 0,0.56 1,1 0,0 0,0.89 0.61h6.76l2.61,-2.46 -2.9,-7.27 5.45,0.45 -2.66,-9.64L20.67,25 24,17l1.74,11.3 5.84,-4.69 -0.79,7.69L36.93,30l-6.3,9.61h6.75l5.35,-2.76a0.81,0.81 0,0 0,0.28 -0.44,0.84 0.84,0 0,0 0,-0.52 0.86,0.86 0,0 0,-0.34 -0.39,0.87 0.87,0 0,0 -0.52,-0.11l-4,0.3 7.09,-12.84C45.7,22.13 45.24,20.68 44.4,20.83ZM1.35,45.59H45a1.44,1.44 0,0 0,1.35 -1.49v-0.57a1.4,1.4 0,0 0,-0.07 -0.54,1.25 1.25,0 0,0 -0.27,-0.47 1.35,1.35 0,0 0,-0.43 -0.32,1.38 1.38,0 0,0 -0.53,-0.12H1.35a1.44,1.44 0,0 0,-1 0.45,1.46 1.46,0 0,0 -0.38,1v0.57A1.43,1.43 0,0 0,1.35 45.59Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="46.34dp"
android:height="45.59dp"
android:viewportWidth="46.34"
android:viewportHeight="45.59">
<path
android:pathData="M44.4,20.83l-8.29,4V14.93c0,-1 -0.87,-1.59 -1.6,-1l-5.82,4.67L25.93,1.2a1.07,1.07 0,0 0,0 -0.4A0.86,0.86 0,0 0,25.8 0.43a0.94,0.94 0,0 0,-0.28 -0.28A1,1 0,0 0,24.75 0a1,1 0,0 0,-0.36 0.18,1 1,0 0,0 -0.25,0.31 1,1 0,0 0,-0.1 0.39L18.23,16.56l-9,-7.69c-0.87,-0.58 -1.74,0.29 -1.6,1.3l2.77,15.09 -7.26,-0.87c-0.9,0.14 -1,1.42 -0.43,2l5,8.56L4.53,38a0.94,0.94 0,0 0,-0.28 0.49,1 1,0 0,0 0,0.56 1,1 0,0 0,0.89 0.61h6.76l2.61,-2.46 -2.9,-7.27 5.45,0.45 -2.66,-9.64L20.67,25 24,17l1.74,11.3 5.84,-4.69 -0.79,7.69L36.93,30l-6.3,9.61h6.75l5.35,-2.76a0.81,0.81 0,0 0,0.28 -0.44,0.84 0.84,0 0,0 0,-0.52 0.86,0.86 0,0 0,-0.34 -0.4,0.87 0.87,0 0,0 -0.52,-0.12l-4,0.3 7.09,-12.84C45.7,22.13 45.24,20.68 44.4,20.83ZM1.35,45.59H45a1.44,1.44 0,0 0,1.35 -1.49v-0.57a1.4,1.4 0,0 0,-0.07 -0.54,1.25 1.25,0 0,0 -0.27,-0.47 1.35,1.35 0,0 0,-0.43 -0.32,1.38 1.38,0 0,0 -0.53,-0.12H1.35a1.44,1.44 0,0 0,-1 0.45,1.46 1.46,0 0,0 -0.38,1v0.57A1.43,1.43 0,0 0,1.35 45.59Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="46dp"
android:height="46dp"
android:viewportWidth="46"
android:viewportHeight="46">
<path
android:pathData="M23,0A23,23 0,1 0,46 23,23 23,0 0,0 23,0ZM25.41,35.19a2.82,2.82 0,0 1,-1.93 0.75,2.47 2.47,0 0,1 -1.86,-0.78 2.7,2.7 0,0 1,0 -3.84,2.47 2.47,0 0,1 1.86,-0.75 2.58,2.58 0,0 1,2.69 2.67A2.72,2.72 0,0 1,25.41 35.19ZM30.34,21.43c-0.37,0.43 -1.35,1.36 -3,2.81A5.42,5.42 0,0 0,26 26a3.93,3.93 0,0 0,-0.51 2h-4a6.27,6.27 0,0 1,0.69 -3.13c0.44,-0.95 1.78,-2.45 4,-4.51l0.41,-0.5a4.18,4.18 0,0 0,0 -5.3,3.69 3.69,0 0,0 -2.76,-1A3.75,3.75 0,0 0,20.61 15a6.06,6.06 0,0 0,-0.86 3.52L15.82,18.52a8.29,8.29 0,0 1,2.24 -6.18,8.18 8.18,0 0,1 6,-2.24 7.71,7.71 0,0 1,5.45 1.88,6.51 6.51,0 0,1 2.07,5.12A7.21,7.21 0,0 1,30.34 21.43Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="46dp"
android:height="46dp"
android:viewportWidth="46"
android:viewportHeight="46">
<path
android:pathData="M23,0A23,23 0,1 0,46 23,23 23,0 0,0 23,0ZM25.41,35.19a2.82,2.82 0,0 1,-1.93 0.75,2.47 2.47,0 0,1 -1.86,-0.78 2.7,2.7 0,0 1,0 -3.84,2.47 2.47,0 0,1 1.86,-0.75 2.58,2.58 0,0 1,2.69 2.67A2.72,2.72 0,0 1,25.41 35.19ZM30.34,21.43c-0.37,0.43 -1.35,1.36 -3,2.81A5.42,5.42 0,0 0,26 26a3.92,3.92 0,0 0,-0.51 2h-4a6.27,6.27 0,0 1,0.69 -3.13c0.44,-0.95 1.78,-2.45 4,-4.51l0.41,-0.5a4.18,4.18 0,0 0,0 -5.3,3.69 3.69,0 0,0 -2.76,-1A3.75,3.75 0,0 0,20.61 15a6.06,6.06 0,0 0,-0.86 3.52L15.82,18.52a8.29,8.29 0,0 1,2.24 -6.18,8.18 8.18,0 0,1 6,-2.24 7.7,7.7 0,0 1,5.45 1.88,6.51 6.51,0 0,1 2.07,5.12A7.21,7.21 0,0 1,30.34 21.43Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="30dp"
android:height="44dp"
android:viewportWidth="30"
android:viewportHeight="44">
<path
android:pathData="M27.31,33.23a1.79,1.79 0,0 1,-2.54 0l-0.06,-0.07q-8,-8.45 -16.14,-16.87C4.9,12.49 5.42,13 1.73,9.15c-0.31,-0.33 -0.59,-0.68 -0.92,-1C0,7.35 -0.42,6.53 0.63,5.57c0.81,-0.75 1.69,-0.68 2.67,0.33C9,11.72 10.41,13.31 16.09,19.16c4.42,4.53 6.78,7 11.2,11.5A2.21,2.21 0,0 1,27.31 33.23ZM21.51,16.23h6.54c1.4,0 2.08,1 1.22,2A35.18,35.18 0,0 1,25 22.63a1.68,1.68 0,0 1,-2.32 -0.35q-7,-7.69 -14.08,-15.35a1.49,1.49 0,0 1,-0.31 -1.71c0.44,-1.36 0.92,-2.75 1.25,-4.14A1.17,1.17 0,0 1,10.89 0c5.86,0 11.72,0 17.6,0 1.62,0 1.92,0.68 1,2.31 -2.1,3.67 -4.24,7.35 -6.34,11C22.63,14.23 22.17,15.09 21.51,16.23ZM11.57,29.08c-3,0 -5.71,0 -8.47,0C1,29.05 0.57,28.4 1.29,26.42c0.94,-2.53 2,-5 2.89,-7.52 0.52,-1.5 1.42,-1.47 2.31,-0.55q6,6.1 11.92,12.27a1.73,1.73 0,0 1,0.24 2.44,1.69 1.69,0 0,1 -0.2,0.2C15.37,36.64 12.26,40 9.16,43.42c-0.42,0.44 -0.92,0.77 -1.44,0.46s-0.53,-1 -0.31,-1.63C8.79,37.94 10.14,33.65 11.57,29.08Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="30dp"
android:height="44dp"
android:viewportWidth="30"
android:viewportHeight="44">
<path
android:pathData="M27.31,33.23a1.79,1.79 0,0 1,-2.54 0l-0.07,-0.07q-8,-8.45 -16.14,-16.87C4.9,12.49 5.42,13 1.73,9.15c-0.31,-0.33 -0.59,-0.68 -0.92,-1C0,7.35 -0.42,6.53 0.63,5.57c0.81,-0.75 1.68,-0.68 2.67,0.33C9,11.72 10.41,13.31 16.09,19.16c4.42,4.53 6.78,7 11.19,11.5A2.19,2.19 0,0 1,27.31 33.23ZM21.52,16.23h6.54c1.4,0 2.08,1 1.22,2A35.2,35.2 0,0 1,25 22.63a1.68,1.68 0,0 1,-2.32 -0.35q-7,-7.69 -14.08,-15.35a1.48,1.48 0,0 1,-0.31 -1.71c0.44,-1.36 0.92,-2.75 1.25,-4.14A1.17,1.17 0,0 1,10.89 0c5.86,0 11.72,0 17.6,0 1.62,0 1.92,0.68 1,2.31 -2.1,3.67 -4.24,7.35 -6.34,11C22.63,14.23 22.17,15.09 21.51,16.23ZM11.57,29.08c-3,0 -5.71,0 -8.46,0 -2.1,0 -2.54,-0.68 -1.81,-2.66 0.94,-2.53 2,-5 2.89,-7.52 0.52,-1.5 1.42,-1.47 2.32,-0.55q6,6.1 11.92,12.27a1.73,1.73 0,0 1,0.24 2.44,1.68 1.68,0 0,1 -0.2,0.2q-4.62,5.08 -9.29,10.16c-0.42,0.44 -0.92,0.77 -1.44,0.46s-0.52,-1 -0.31,-1.63C8.79,37.94 10.14,33.65 11.57,29.08Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="38.18dp"
android:height="45.05dp"
android:viewportWidth="38.18"
android:viewportHeight="45.05">
<path
android:pathData="M27.49,45a10.69,10.69 0,1 0,-10.7 -10.69A10.69,10.69 0,0 0,27.49 45ZM22.91,37.8 L26.69,34V29.54A0.8,0.8 0,0 1,28.05 29a0.77,0.77 0,0 1,0.24 0.57v4.81a0.77,0.77 0,0 1,-0.24 0.57l-4,4a0.74,0.74 0,0 1,-0.26 0.18,0.76 0.76,0 0,1 -0.31,0.07 0.78,0.78 0,0 1,-0.57 -0.23,0.9 0.9,0 0,1 -0.18,-0.26 0.66,0.66 0,0 1,0 -0.31,0.81 0.81,0 0,1 0.06,-0.31A0.73,0.73 0,0 1,22.91 37.8Z"
android:fillColor="#ffc01d"/>
<path
android:pathData="M23.31,22.8a1.63,1.63 0,0 1,-0.66 -0.52h0q-7,-7.69 -14.08,-15.35a1.49,1.49 0,0 1,-0.31 -1.71c0.09,-0.26 0.17,-0.53 0.26,-0.79 0.36,-1.11 0.73,-2.23 1,-3.34A1.17,1.17 0,0 1,10.89 0h17.6c1.62,0 1.92,0.68 1,2.31q-1.84,3.23 -3.71,6.44l-2.63,4.55c-0.17,0.3 -0.33,0.59 -0.49,0.89 -0.34,0.61 -0.69,1.24 -1.13,2h6.54c1.4,0 2.08,1 1.22,2a34.71,34.71 0,0 1,-3.94 4A11.84,11.84 0,0 0,23.31 22.8ZM20.78,24a12,12 0,0 0,-2.7 2.26q-4.74,-5 -9.51,-9.92c-1.69,-1.76 -2.49,-2.61 -3.22,-3.38S3.72,11.22 1.73,9.15l-0.36,-0.4C1.19,8.54 1,8.34 0.81,8.14 0,7.35 -0.42,6.53 0.63,5.57c0.81,-0.75 1.69,-0.68 2.67,0.33C6.12,8.8 7.9,10.65 9.67,12.5s3.57,3.72 6.42,6.65ZM16.44,28.59q-4.93,-5.13 -9.95,-10.22c-0.89,-0.92 -1.79,-0.95 -2.31,0.55 -0.49,1.33 -1,2.65 -1.53,4s-0.92,2.36 -1.36,3.55c-0.72,2 -0.28,2.64 1.81,2.66 1.83,0 3.65,0 5.53,0h2.94c-1.43,4.57 -2.78,8.86 -4.16,13.17 -0.22,0.66 -0.33,1.28 0.31,1.63s1,0 1.44,-0.46h0l6.09,-6.65A12.47,12.47 0,0 1,15 34.3,12.06 12.06,0 0,1 16.44,28.57Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="38.18dp"
android:height="45.05dp"
android:viewportWidth="38.18"
android:viewportHeight="45.05">
<path
android:pathData="M27.49,45a10.69,10.69 0,1 0,-10.7 -10.69A10.69,10.69 0,0 0,27.49 45ZM22.91,37.8 L26.69,34V29.54A0.8,0.8 0,0 1,28.05 29a0.77,0.77 0,0 1,0.24 0.57v4.81a0.77,0.77 0,0 1,-0.24 0.57l-4,4a0.74,0.74 0,0 1,-0.26 0.18,0.76 0.76,0 0,1 -0.31,0.07 0.78,0.78 0,0 1,-0.57 -0.24,0.9 0.9,0 0,1 -0.18,-0.26 0.66,0.66 0,0 1,0 -0.31,0.81 0.81,0 0,1 0.06,-0.31A0.73,0.73 0,0 1,22.91 37.8Z"
android:fillColor="#ffc01d"/>
<path
android:pathData="M23.31,22.8a1.63,1.63 0,0 1,-0.66 -0.52h0q-7,-7.69 -14.08,-15.35a1.49,1.49 0,0 1,-0.31 -1.71c0.09,-0.26 0.17,-0.53 0.26,-0.79 0.36,-1.11 0.73,-2.23 1,-3.34A1.17,1.17 0,0 1,10.89 0h17.6c1.62,0 1.92,0.68 1,2.31q-1.84,3.23 -3.71,6.44l-2.63,4.55c-0.17,0.3 -0.33,0.59 -0.49,0.89 -0.34,0.61 -0.69,1.24 -1.13,2h6.54c1.4,0 2.08,1 1.22,2a34.7,34.7 0,0 1,-3.94 4A11.85,11.85 0,0 0,23.31 22.8ZM20.78,24a12,12 0,0 0,-2.7 2.26q-4.74,-5 -9.51,-9.92c-1.69,-1.76 -2.49,-2.61 -3.22,-3.38S3.72,11.22 1.73,9.15l-0.36,-0.4C1.19,8.54 1,8.34 0.81,8.14 0,7.35 -0.42,6.53 0.63,5.57c0.81,-0.75 1.69,-0.68 2.67,0.33C6.12,8.8 7.9,10.65 9.67,12.5s3.57,3.72 6.42,6.65ZM16.44,28.59q-4.93,-5.13 -9.95,-10.22c-0.89,-0.92 -1.79,-0.95 -2.31,0.55 -0.49,1.33 -1,2.65 -1.53,4s-0.92,2.36 -1.36,3.55c-0.72,2 -0.28,2.64 1.81,2.66 1.83,0 3.65,0 5.53,0h2.94c-1.43,4.57 -2.78,8.86 -4.16,13.18 -0.22,0.66 -0.33,1.28 0.31,1.63s1,0 1.44,-0.46h0l6.09,-6.65A12.47,12.47 0,0 1,15 34.3,12.06 12.06,0 0,1 16.44,28.57Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="43dp"
android:height="43dp"
android:viewportWidth="43"
android:viewportHeight="43">
<path
android:pathData="M5,10a9.55,9.55 0,0 0,0.8 3.83,10 10,0 0,0 2.28,3.24 10.51,10.51 0,0 0,3.4 2.17,11 11,0 0,0 8,0 10.51,10.51 0,0 0,3.4 -2.17,10 10,0 0,0 2.28,-3.24 9.55,9.55 0,0 0,0 -7.65,10 10,0 0,0 -2.28,-3.24A10.51,10.51 0,0 0,19.52 0.76a11,11 0,0 0,-8 0,10.51 10.51,0 0,0 -3.4,2.17A10,10 0,0 0,5.8 6.17,9.55 9.55,0 0,0 5,10Z"
android:fillColor="#333"/>
<path
android:pathData="M27.09,0A10.39,10.39 0,0 0,23 0.83a11.9,11.9 0,0 1,3.42 4.11,11.53 11.53,0 0,1 0,10.33A11.9,11.9 0,0 1,23 19.38a10.52,10.52 0,0 0,8.84 -0.33,10.27 10.27,0 0,0 3.45,-2.87 9.9,9.9 0,0 0,1.87 -4,9.78 9.78,0 0,0 -0.08,-4.44 10,10 0,0 0,-2 -4A10.24,10.24 0,0 0,31.51 1,10.49 10.49,0 0,0 27.09,0ZM34.09,23.65L25.55,23.65a9.88,9.88 0,0 1,6.91 2.81,9.49 9.49,0 0,1 2.86,6.77L35.32,43L43,43L43,32.4a8.67,8.67 0,0 0,-2.61 -6.18A9,9 0,0 0,34.08 23.65Z"
android:fillColor="#333"/>
<path
android:pathData="M24,23L9,23a8.91,8.91 0,0 0,-6.33 2.65A9.09,9.09 0,0 0,0 32L0,43L33,43L33,32a9.08,9.08 0,0 0,-2.62 -6.39A8.92,8.92 0,0 0,24 23ZM21.12,36.91L15,36.91l0.46,0.59a1.58,1.58 0,0 1,-0.27 2.19,1.76 1.76,0 0,1 -1,0.31A1.56,1.56 0,0 1,13 39.41l-2.39,-3.13a1.56,1.56 0,0 1,-0.15 -1.64,1.59 1.59,0 0,1 1.38,-0.86h9.24a1.55,1.55 0,0 1,1.07 0.47,1.58 1.58,0 0,1 0,2.18A1.55,1.55 0,0 1,21.12 36.91ZM22.5,31.37a1.58,1.58 0,0 1,-1.38 0.86L11.88,32.23a1.53,1.53 0,0 1,-1.09 -0.46,1.58 1.58,0 0,1 0,-2.21 1.53,1.53 0,0 1,1.09 -0.46L18,29.1l-0.46,-0.59a1.57,1.57 0,0 1,0.26 -2.18,1.53 1.53,0 0,1 2.16,0.27l2.39,3.12a1.55,1.55 0,0 1,0.15 1.64Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="43dp"
android:height="43dp"
android:viewportWidth="43"
android:viewportHeight="43">
<path
android:pathData="M5,10a9.55,9.55 0,0 0,0.8 3.83,10 10,0 0,0 2.28,3.24 10.51,10.51 0,0 0,3.4 2.17,11 11,0 0,0 8,0 10.51,10.51 0,0 0,3.4 -2.17,10 10,0 0,0 2.28,-3.24 9.55,9.55 0,0 0,0 -7.65,10 10,0 0,0 -2.28,-3.24A10.51,10.51 0,0 0,19.52 0.76a11,11 0,0 0,-8 0,10.51 10.51,0 0,0 -3.4,2.17A10,10 0,0 0,5.8 6.17,9.55 9.55,0 0,0 5,10Z"
android:fillColor="#fff"/>
<path
android:pathData="M27.09,0A10.4,10.4 0,0 0,23 0.83a11.91,11.91 0,0 1,3.42 4.11,11.54 11.54,0 0,1 0,10.33A11.91,11.91 0,0 1,23 19.38a10.52,10.52 0,0 0,8.84 -0.33,10.27 10.27,0 0,0 3.45,-2.87 9.9,9.9 0,0 0,1.87 -4,9.78 9.78,0 0,0 -0.08,-4.44 10,10 0,0 0,-2 -4A10.24,10.24 0,0 0,31.51 1,10.5 10.5,0 0,0 27.09,0ZM34.09,23.65L25.55,23.65a9.88,9.88 0,0 1,6.91 2.81,9.49 9.49,0 0,1 2.86,6.77L35.32,43L43,43L43,32.4a8.67,8.67 0,0 0,-2.61 -6.18A9,9 0,0 0,34.08 23.65Z"
android:fillColor="#fff"/>
<path
android:pathData="M24,23L9,23a8.91,8.91 0,0 0,-6.33 2.65A9.09,9.09 0,0 0,0 32L0,43L33,43L33,32a9.08,9.08 0,0 0,-2.62 -6.39A8.92,8.92 0,0 0,24 23ZM21.12,36.91L15,36.91l0.46,0.59a1.58,1.58 0,0 1,-0.27 2.19,1.75 1.75,0 0,1 -1,0.31A1.56,1.56 0,0 1,13 39.41l-2.39,-3.13a1.56,1.56 0,0 1,-0.15 -1.64,1.59 1.59,0 0,1 1.38,-0.86h9.24a1.55,1.55 0,0 1,1.07 0.47,1.58 1.58,0 0,1 0,2.18A1.55,1.55 0,0 1,21.12 36.91ZM22.5,31.38a1.58,1.58 0,0 1,-1.38 0.86L11.88,32.24a1.53,1.53 0,0 1,-1.09 -0.46,1.58 1.58,0 0,1 0,-2.21 1.53,1.53 0,0 1,1.09 -0.46L18,29.11l-0.46,-0.59a1.57,1.57 0,0 1,0.26 -2.18,1.53 1.53,0 0,1 2.16,0.27l2.39,3.12a1.55,1.55 0,0 1,0.15 1.64Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="58dp"
android:height="45.83dp"
android:viewportWidth="58"
android:viewportHeight="45.83">
<path
android:pathData="M20.91,21.39A10.69,10.69 0,1 0,10.21 10.7,10.69 10.69,0 0,0 20.91,21.39ZM16.33,14.14 L20.11,10.36L20.11,5.88a0.79,0.79 0,0 1,0.8 -0.8,0.79 0.79,0 0,1 0.56,0.23 0.77,0.77 0,0 1,0.24 0.57L21.71,10.7a0.77,0.77 0,0 1,-0.24 0.57l-4,4a0.73,0.73 0,0 1,-0.26 0.18,0.76 0.76,0 0,1 -0.31,0.07 0.79,0.79 0,0 1,-0.57 -0.24,0.9 0.9,0 0,1 -0.18,-0.26 0.66,0.66 0,0 1,-0.05 -0.31,0.82 0.82,0 0,1 0.06,-0.31A0.73,0.73 0,0 1,16.33 14.14Z"
android:fillColor="#ffc01d"/>
<path
android:pathData="M29.79,20.16A13.53,13.53 0,0 1,9.26 15.94v2.83L4.63,18.77c-2.32,0 -3.7,2.08 -4.17,4.86A11.67,11.67 0,0 0,0 26.4a10.36,10.36 0,0 0,0.11 1.33,14 14,0 0,1 0.12,1.67c0.7,2.54 2.08,4.86 4.4,4.86 2.84,0 5.71,0 8.59,0.05h0c5.79,0.05 11.61,0.1 17.33,-0.05a1.75,1.75 0,0 0,1.15 -0.46l7.41,-11.56A10.06,10.06 0,0 1,41 19.7a1.8,1.8 0,0 0,0.23 0.69c0.58,0.69 1.1,1.33 1.62,2l1.62,2 1.39,1.85a0.23,0.23 0,0 0,0.23 0.23,1.12 1.12,0 0,0 1.62,-0.23 15.26,15.26 0,0 0,1.85 -3,11 11,0 0,1 0.62,-1.1c0.11,-0.18 0.21,-0.33 0.31,-0.52a1,1 0,0 0,0.23 -1.62L44.2,12.3A5.25,5.25 0,0 0,40.73 10a3.81,3.81 0,0 0,-3.47 2.08l-3.94,5.55 -2.77,3.93a7.75,7.75 0,0 1,-0.58 -1ZM10.41,34.73L31.24,34.73a6.63,6.63 0,0 1,4.16 1.62A6,6 0,0 1,37 40.28a5.54,5.54 0,0 1,-5.78 5.55L10.41,45.83a6.63,6.63 0,0 1,-4.16 -1.62L6,44a5.44,5.44 0,0 1,0.23 -7.63A5.56,5.56 0,0 1,10.41 34.73ZM31.24,43.29a3,3 0,0 0,2.31 -0.92A2.42,2.42 0,0 0,34.48 40a3.17,3.17 0,0 0,-3.24 -3.24L10.41,36.76a3,3 0,0 0,-2.31 0.92,3.34 3.34,0 0,0 0,4.63 3,3 0,0 0,2.31 0.92ZM52.63,23.14c3.48,2.68 6.26,5.82 5.1,10.29a12.36,12.36 0,0 1,-2.08 3.8,11.12 11.12,0 0,1 -3.72,2.68 15,15 0,0 1,-14.37 -2.24,0.94 0.94,0 0,1 -0.24,-1.57c0.24,-0.22 0.47,-0.45 0.7,-0.45a14.9,14.9 0,0 0,6.26 -2.24,8.51 8.51,0 0,0 2.55,-4.92 0.52,0.52 0,0 1,0 -0.2c0,-0.07 0.08,-0.12 0.21,-0.25h0l3.48,-4.7a1.24,1.24 0,0 1,1.86 -0.22ZM29.14,37.83a2,2 0,1 0,0 4,1.76 1.76,0 0,0 1.82,-2C31.19,38.83 30.28,38 29.14,37.83ZM23.44,37.83a2,2 0,1 0,0 4,2 2,0 1,0 0,-4ZM17.98,37.83a2,2 0,1 0,0 4c1.14,-0.2 2.05,-1 1.82,-2A2,2 0,0 0,18 37.83ZM12.28,37.83a2,2 0,1 0,0 4,1.76 1.76,0 0,0 1.82,-2C14.33,38.83 13.42,38 12.28,37.83Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="58dp"
android:height="45.83dp"
android:viewportWidth="58"
android:viewportHeight="45.83">
<path
android:pathData="M20.91,21.39A10.69,10.69 0,1 0,10.21 10.7,10.69 10.69,0 0,0 20.91,21.39ZM16.33,14.14 L20.11,10.36L20.11,5.88a0.79,0.79 0,0 1,0.8 -0.8,0.79 0.79,0 0,1 0.56,0.24 0.77,0.77 0,0 1,0.24 0.57L21.71,10.7a0.77,0.77 0,0 1,-0.24 0.57l-4,4a0.73,0.73 0,0 1,-0.26 0.18,0.76 0.76,0 0,1 -0.31,0.07 0.81,0.81 0,0 1,-0.31 -0.06,0.82 0.82,0 0,1 -0.26,-0.18 0.9,0.9 0,0 1,-0.18 -0.26,0.66 0.66,0 0,1 -0.05,-0.31 0.82,0.82 0,0 1,0.06 -0.31A0.73,0.73 0,0 1,16.33 14.14Z"
android:fillColor="#ffc01d"/>
<path
android:pathData="M29.79,20.16A13.53,13.53 0,0 1,9.26 15.94v2.83L4.63,18.77c-2.32,0 -3.7,2.08 -4.17,4.86A11.67,11.67 0,0 0,0 26.4a10.36,10.36 0,0 0,0.11 1.34,14 14,0 0,1 0.12,1.67c0.7,2.54 2.08,4.86 4.4,4.86 2.84,0 5.71,0 8.59,0.05h0c5.79,0.05 11.61,0.1 17.33,-0.05a1.75,1.75 0,0 0,1.15 -0.46l7.41,-11.56A10.06,10.06 0,0 1,41 19.7a1.8,1.8 0,0 0,0.23 0.69c0.58,0.69 1.1,1.33 1.62,2l1.62,2 1.39,1.85a0.23,0.23 0,0 0,0.23 0.23,1.12 1.12,0 0,0 1.62,-0.23 15.26,15.26 0,0 0,1.85 -3,11 11,0 0,1 0.62,-1.1c0.11,-0.18 0.21,-0.33 0.31,-0.52a1,1 0,0 0,0.23 -1.62L44.2,12.3A5.25,5.25 0,0 0,40.73 10a3.81,3.81 0,0 0,-3.47 2.08l-3.94,5.55 -2.77,3.93a7.76,7.76 0,0 1,-0.58 -1ZM10.41,34.73L31.24,34.73a6.63,6.63 0,0 1,4.16 1.62A6,6 0,0 1,37 40.28a5.54,5.54 0,0 1,-5.78 5.55L10.41,45.83a6.63,6.63 0,0 1,-4.16 -1.62L6,44a5.44,5.44 0,0 1,0.23 -7.63A5.56,5.56 0,0 1,10.41 34.73ZM31.24,43.29a3,3 0,0 0,2.31 -0.93A2.42,2.42 0,0 0,34.48 40a3.17,3.17 0,0 0,-3.24 -3.24L10.41,36.76a3,3 0,0 0,-2.31 0.92,3.34 3.34,0 0,0 0,4.63 3,3 0,0 0,2.31 0.93ZM52.63,23.14c3.48,2.68 6.26,5.82 5.1,10.29a12.36,12.36 0,0 1,-2.08 3.8,11.12 11.12,0 0,1 -3.72,2.68 15,15 0,0 1,-14.37 -2.24,0.94 0.94,0 0,1 -0.24,-1.57c0.24,-0.22 0.47,-0.45 0.7,-0.45a14.9,14.9 0,0 0,6.26 -2.24,8.51 8.51,0 0,0 2.55,-4.92 0.52,0.52 0,0 1,0 -0.2c0,-0.07 0.08,-0.12 0.21,-0.25h0l3.48,-4.7a1.24,1.24 0,0 1,1.86 -0.22ZM29.14,37.83a2,2 0,1 0,0 4,1.76 1.76,0 0,0 1.82,-2C31.19,38.83 30.28,38 29.14,37.83ZM23.44,37.83a2,2 0,1 0,0 4,2 2,0 1,0 0,-4ZM17.98,37.83a2,2 0,1 0,0 4c1.14,-0.2 2.05,-1 1.82,-2A2,2 0,0 0,18 37.83ZM12.28,37.83a2,2 0,1 0,0 4,1.76 1.76,0 0,0 1.82,-2C14.33,38.83 13.42,38 12.28,37.83Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="29.45dp"
android:height="42.19dp"
android:viewportWidth="29.45"
android:viewportHeight="42.19">
<path
android:pathData="M0,0H15.2c8.88,0 14.25,5.26 14.25,12.86V13c0,8.62 -6.7,13.08 -15,13.08H8.19V42.19H0V0ZM14.67,18.77c4.1,0 6.49,-2.45 6.49,-5.63V13c0,-3.67 -2.55,-5.64 -6.64,-5.64H8.19V18.77h6.48Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="29.45dp"
android:height="42.19dp"
android:viewportWidth="29.45"
android:viewportHeight="42.19">
<path
android:pathData="M0,0H15.2c8.88,0 14.25,5.26 14.25,12.86V13c0,8.62 -6.7,13.08 -15,13.08H8.19V42.19H0V0ZM14.67,18.77c4.1,0 6.49,-2.45 6.49,-5.64V13c0,-3.67 -2.55,-5.64 -6.64,-5.64H8.19V18.77h6.48Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="42dp"
android:height="45.84dp"
android:viewportWidth="42"
android:viewportHeight="45.84">
<path
android:pathData="M18.38,34.44 L10.5,45.84l18.21,-11.4 -7.31,-4.6 3.81,-1.64L20,23l-9,6.84Z"
android:fillColor="#ffc01d"/>
<path
android:pathData="M34.72,12.88h-0.16A11.32,11.32 0,0 0,34.72 11,11 11,0 0,0 13.25,7.89a9.94,9.94 0,0 0,-3.2 -0.53A10.08,10.08 0,0 0,0 17.49v2.76a7.39,7.39 0,0 0,2.15 5.21A7.22,7.22 0,0 0,7.31 27.6h3.77l7.52,-5.73a2.73,2.73 0,0 1,3.59 0.25l5.16,5.21 0.21,0.27h7.15a7.23,7.23 0,0 0,5.15 -2.15,7.41 7.41,0 0,0 0,-10.41A7.24,7.24 0,0 0,34.72 12.88Z"
android:fillColor="#333"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="42dp"
android:height="45.84dp"
android:viewportWidth="42"
android:viewportHeight="45.84">
<path
android:pathData="M18.38,34.44 L10.5,45.84l18.21,-11.4 -7.31,-4.6 3.81,-1.64L20,23l-9,6.84Z"
android:fillColor="#ffc01d"/>
<path
android:pathData="M34.72,12.88h-0.16A11.33,11.33 0,0 0,34.72 11,11 11,0 0,0 13.25,7.89a10,10 0,0 0,-3.2 -0.52A10.08,10.08 0,0 0,0 17.49v2.76a7.39,7.39 0,0 0,2.15 5.21A7.21,7.21 0,0 0,7.31 27.6h3.77l7.52,-5.73a2.73,2.73 0,0 1,3.59 0.25l5.16,5.2 0.21,0.27h7.15a7.23,7.23 0,0 0,5.15 -2.15,7.41 7.41,0 0,0 0,-10.41A7.24,7.24 0,0 0,34.72 12.88Z"
android:fillColor="#fff"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="47dp"
android:height="47dp"
android:viewportWidth="47"
android:viewportHeight="47">
<path
android:pathData="M23.5,0A23.5,23.5 0,1 0,47 23.5,23.5 23.5,0 0,0 23.5,0ZM12.87,26.41a2.91,2.91 0,1 1,2.91 -2.91A2.91,2.91 0,0 1,12.87 26.41ZM23.5,26.41a2.91,2.91 0,1 1,2.91 -2.91A2.91,2.91 0,0 1,23.5 26.41ZM34.13,26.41A2.91,2.91 0,1 1,37 23.5,2.91 2.91,0 0,1 34.13,26.41Z"
android:fillColor="#fff"/>
</vector>
This diff is collapsed.
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
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_16"
android:background="@drawable/drawable_bg_map_box"> android:background="@drawable/drawable_bg_map_box"
tools:context=".ui.MainActivity">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
android:id="@+id/faultCauseSelectClose" android:id="@+id/faultCauseSelectClose"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/close_the_dialog"
android:src="@drawable/icon_close" android:src="@drawable/icon_close"
android:layout_marginEnd="@dimen/dp_45" android:layout_marginEnd="@dimen/dp_45"
android:focusable="true" android:focusable="true"
...@@ -41,13 +43,14 @@ ...@@ -41,13 +43,14 @@
android:layout_marginEnd="@dimen/dp_44" android:layout_marginEnd="@dimen/dp_44"
app:layout_constraintTop_toBottomOf="@id/faultCauseSelectTitle" app:layout_constraintTop_toBottomOf="@id/faultCauseSelectTitle"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/radioGroup2">
<RadioButton <RadioButton
android:id="@+id/itemFaultEngine" android:id="@+id/itemFaultEngine"
android:layout_width="@dimen/dp_0" android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:drawableTop="@drawable/background_fault_cause_item_engine" android:drawableTop="@drawable/drawable_fault_cause_item_engine"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -59,7 +62,7 @@ ...@@ -59,7 +62,7 @@
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32" android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_mechanical" android:drawableTop="@drawable/drawable_fault_cause_item_mechanical"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -70,7 +73,7 @@ ...@@ -70,7 +73,7 @@
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32" android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_hydraulic_system" android:drawableTop="@drawable/drawable_fault_cause_item_hydraulic_system"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -81,7 +84,7 @@ ...@@ -81,7 +84,7 @@
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32" android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_electrical" android:drawableTop="@drawable/drawable_fault_cause_item_electrical"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -97,13 +100,14 @@ ...@@ -97,13 +100,14 @@
android:layout_marginEnd="@dimen/dp_44" android:layout_marginEnd="@dimen/dp_44"
app:layout_constraintTop_toBottomOf="@id/radioGroup1" app:layout_constraintTop_toBottomOf="@id/radioGroup1"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/delayCauseEdit">
<RadioButton <RadioButton
android:id="@+id/itemFaultEdgeReduction" android:id="@+id/itemFaultEdgeReduction"
android:layout_width="@dimen/dp_0" android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:drawableTop="@drawable/background_fault_cause_item_edge_reduction" android:drawableTop="@drawable/drawable_fault_cause_item_edge_reduction"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -114,7 +118,7 @@ ...@@ -114,7 +118,7 @@
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32" android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_tire" android:drawableTop="@drawable/drawable_fault_cause_item_tire"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -125,7 +129,7 @@ ...@@ -125,7 +129,7 @@
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32" android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_equipment_maintenance" android:drawableTop="@drawable/drawable_fault_cause_item_equipment_maintenance"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -136,7 +140,7 @@ ...@@ -136,7 +140,7 @@
android:layout_height="@dimen/dp_136" android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle" style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32" android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_other_inputs" android:drawableTop="@drawable/drawable_fault_cause_item_other_inputs"
android:background="@drawable/background_fault_cause_item" android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4" android:textColor="@drawable/color_text_btn_4"
android:button="@null" android:button="@null"
...@@ -144,7 +148,7 @@ ...@@ -144,7 +148,7 @@
</RadioGroup> </RadioGroup>
<androidx.appcompat.widget.AppCompatEditText <androidx.appcompat.widget.AppCompatEditText
android:id="@+id/faultCauseEdit" android:id="@+id/delayCauseEdit"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_44" android:layout_marginTop="@dimen/dp_44"
...@@ -156,7 +160,7 @@ ...@@ -156,7 +160,7 @@
android:paddingEnd="@dimen/dp_30" android:paddingEnd="@dimen/dp_30"
android:textColor="@color/color_ff333333" android:textColor="@color/color_ff333333"
android:textSize="@dimen/sp_22" android:textSize="@dimen/sp_22"
app:layout_constraintBottom_toTopOf="@+id/faultCauseConfirm" app:layout_constraintBottom_toTopOf="@id/faultCauseConfirm"
app:layout_constraintEnd_toEndOf="@id/radioGroup2" app:layout_constraintEnd_toEndOf="@id/radioGroup2"
app:layout_constraintStart_toStartOf="@id/radioGroup2" app:layout_constraintStart_toStartOf="@id/radioGroup2"
app:layout_constraintTop_toBottomOf="@id/radioGroup2" /> app:layout_constraintTop_toBottomOf="@id/radioGroup2" />
......
...@@ -75,6 +75,16 @@ ...@@ -75,6 +75,16 @@
<string name="select_reporting_fault">故障</string> <string name="select_reporting_fault">故障</string>
<string name="select_reporting_standby">备用</string> <string name="select_reporting_standby">备用</string>
<string name="select_reporting_update">更新请调</string> <string name="select_reporting_update">更新请调</string>
<string name="delay_cause_select">选择延时原因</string>
<string name="delay_cause_shift_change">交接班</string>
<string name="delay_cause_standby_park">备停</string>
<string name="delay_cause_weather_effect">天气影响</string>
<string name="delay_cause_external_reasons">外部原因</string>
<string name="delay_cause_fault_outage">故障停电</string>
<string name="delay_cause_shoveling">待铲</string>
<string name="delay_cause_scheduled_outage">计划停电</string>
<string name="delay_cause_blasting_impact">爆破影响</string>
<string name="close_the_dialog">关闭对话框</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