Commit ebe8f712 authored by 马乐's avatar 马乐

1.完成故障原因原则对话框

parent aad9f221
...@@ -25,7 +25,7 @@ class SplashActivity : AppCompatActivity() { ...@@ -25,7 +25,7 @@ class SplashActivity : AppCompatActivity() {
//设置下布局向上移动状态栏的高度 //设置下布局向上移动状态栏的高度
BarUtils.setStatusBarColor(this, ColorUtils.getColor(R.color.white)) BarUtils.setStatusBarColor(this, ColorUtils.getColor(R.color.white))
//设置隐藏虚拟按键 //设置隐藏虚拟按键
BarUtils.setNavBarVisibility(this,false); BarUtils.setNavBarVisibility(this,false)
binding = ActivitySplashBinding.inflate(layoutInflater) binding = ActivitySplashBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
......
package com.waytous.anticollision.ui package com.waytous.anticollision.ui
import android.os.Bundle import android.os.Bundle
import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import androidx.asynclayoutinflater.view.AsyncLayoutInflater import androidx.asynclayoutinflater.view.AsyncLayoutInflater
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
...@@ -8,13 +9,14 @@ import androidx.fragment.app.viewModels ...@@ -8,13 +9,14 @@ import androidx.fragment.app.viewModels
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.fragment.findNavController
import com.blankj.utilcode.util.BarUtils
import com.blankj.utilcode.util.LogUtils import com.blankj.utilcode.util.LogUtils
import com.mapbox.geojson.Point import com.mapbox.geojson.Point
import com.mapbox.maps.CameraOptions import com.mapbox.maps.CameraOptions
import com.mapbox.maps.MapboxMap import com.mapbox.maps.MapboxMap
import com.mapbox.maps.Style import com.mapbox.maps.Style
import com.mapbox.maps.ViewAnnotationAnchor import com.mapbox.maps.ViewAnnotationAnchor
import com.mapbox.maps.extension.style.expressions.dsl.generated.distanceFromCenter
import com.mapbox.maps.extension.style.layers.properties.generated.IconAnchor import com.mapbox.maps.extension.style.layers.properties.generated.IconAnchor
import com.mapbox.maps.extension.style.style import com.mapbox.maps.extension.style.style
import com.mapbox.maps.plugin.animation.flyTo import com.mapbox.maps.plugin.animation.flyTo
...@@ -26,7 +28,6 @@ import com.mapbox.maps.plugin.annotation.generated.createPointAnnotationManager ...@@ -26,7 +28,6 @@ import com.mapbox.maps.plugin.annotation.generated.createPointAnnotationManager
import com.mapbox.maps.plugin.attribution.attribution import com.mapbox.maps.plugin.attribution.attribution
import com.mapbox.maps.plugin.compass.compass import com.mapbox.maps.plugin.compass.compass
import com.mapbox.maps.plugin.logo.logo import com.mapbox.maps.plugin.logo.logo
import com.mapbox.maps.plugin.scalebar.scalebar
import com.mapbox.maps.viewannotation.ViewAnnotationManager import com.mapbox.maps.viewannotation.ViewAnnotationManager
import com.mapbox.maps.viewannotation.viewAnnotationOptions import com.mapbox.maps.viewannotation.viewAnnotationOptions
import com.waytous.anticollision.R import com.waytous.anticollision.R
...@@ -34,6 +35,10 @@ import com.waytous.anticollision.databinding.CurrentVehicleViewAnnotationLayoutB ...@@ -34,6 +35,10 @@ 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.FaultCauseDialog
import com.waytous.anticollision.ui.view.MoreFeaturesPopup
import com.waytous.anticollision.ui.view.ReportStatusPopup
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
import com.waytous.anticollision.utils.LONGITUDE import com.waytous.anticollision.utils.LONGITUDE
...@@ -86,6 +91,14 @@ open class BaseMapFragment : Fragment() { ...@@ -86,6 +91,14 @@ open class BaseMapFragment : Fragment() {
MainViewModel.MainViewModelFactory(MainRepository(requireContext())) MainViewModel.MainViewModelFactory(MainRepository(requireContext()))
} }
lateinit var moreFeaturesPopup: MoreFeaturesPopup
lateinit var workStatusEditPopup: WorkStatusEditPopup
lateinit var reportStatusPopup: ReportStatusPopup
lateinit var reportStatusDialog: FaultCauseDialog
val iconCurrentNormalVehicleBitmap by lazy { val iconCurrentNormalVehicleBitmap by lazy {
BitmapUtils.bitmapFromDrawableRes(requireContext(), R.drawable.my_vehicle_normal) BitmapUtils.bitmapFromDrawableRes(requireContext(), R.drawable.my_vehicle_normal)
} }
...@@ -143,12 +156,32 @@ open class BaseMapFragment : Fragment() { ...@@ -143,12 +156,32 @@ open class BaseMapFragment : Fragment() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
BarUtils.setNavBarVisibility(requireActivity(),false)
layoutMapBoxBinding = LayoutMapBoxBinding.inflate(LayoutInflater.from(requireContext())) layoutMapBoxBinding = LayoutMapBoxBinding.inflate(LayoutInflater.from(requireContext()))
reportStatusDialog = FaultCauseDialog(requireContext(),R.style.DialogStyle)
layoutMapBoxBinding.mapView.run { layoutMapBoxBinding.mapView.run {
logo.enabled = false logo.enabled = false
compass.enabled = false compass.enabled = false
attribution.enabled = false attribution.enabled = false
} }
workStatusEditPopup = WorkStatusEditPopup(context).also {
it.setOutSideDismiss(true)
it.popupGravity = Gravity.TOP or Gravity.CENTER
it.setBackgroundColor(R.color.color_99000000)
}
moreFeaturesPopup = MoreFeaturesPopup(context).also {
it.setOutSideDismiss(true)
it.popupGravity = Gravity.TOP or Gravity.CENTER
it.maskOffsetY = 20
it.setBackgroundColor(R.color.color_99000000)
it.navigationTo(findNavController())
}
reportStatusPopup = ReportStatusPopup(context).also {
it.setOutSideDismiss(true)
it.popupGravity = Gravity.TOP or Gravity.CENTER
it.setBackgroundColor(R.color.color_99000000)
it.itemFault(reportStatusDialog)
}
} }
fun setupMapBox() { fun setupMapBox() {
......
...@@ -6,12 +6,14 @@ import android.view.Gravity ...@@ -6,12 +6,14 @@ import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
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.mapbox.maps.MapView import com.mapbox.maps.MapView
import com.waytous.anticollision.R import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.FragmentHomeBinding import com.waytous.anticollision.databinding.DialogFaultCauseSelectBinding
import com.waytous.anticollision.databinding.FragmentNoVideoHomeBinding
import com.waytous.anticollision.repository.MainRepository import com.waytous.anticollision.repository.MainRepository
import com.waytous.anticollision.ui.BaseMapFragment import com.waytous.anticollision.ui.BaseMapFragment
import com.waytous.anticollision.ui.MainViewModel import com.waytous.anticollision.ui.MainViewModel
...@@ -22,7 +24,7 @@ import com.waytous.anticollision.utils.setTextSize ...@@ -22,7 +24,7 @@ import com.waytous.anticollision.utils.setTextSize
class HomeNoVideoFragment : BaseMapFragment() { class HomeNoVideoFragment : BaseMapFragment() {
private var _binding: FragmentHomeBinding? = null private var _binding: FragmentNoVideoHomeBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!
...@@ -30,11 +32,6 @@ class HomeNoVideoFragment : BaseMapFragment() { ...@@ -30,11 +32,6 @@ class HomeNoVideoFragment : BaseMapFragment() {
private var count = 0 private var count = 0
private lateinit var moreFeaturesPopup: MoreFeaturesPopup
private lateinit var workStatusEditPopup: WorkStatusEditPopup
private lateinit var reportStatusPopup: ReportStatusPopup
private val mapModel: MainViewModel by viewModels { private val mapModel: MainViewModel by viewModels {
MainViewModel.MainViewModelFactory(MainRepository(requireContext())) MainViewModel.MainViewModelFactory(MainRepository(requireContext()))
...@@ -47,25 +44,8 @@ class HomeNoVideoFragment : BaseMapFragment() { ...@@ -47,25 +44,8 @@ class HomeNoVideoFragment : BaseMapFragment() {
): View { ): View {
val homeViewModel = val homeViewModel =
ViewModelProvider(this)[HomeViewModel::class.java] ViewModelProvider(this)[HomeViewModel::class.java]
_binding = FragmentHomeBinding.inflate(inflater, container, false) _binding = FragmentNoVideoHomeBinding.inflate(inflater, container, false)
context ?: return binding.root context ?: return binding.root
workStatusEditPopup = WorkStatusEditPopup(context).also {
it.setOutSideDismiss(true)
it.popupGravity = Gravity.TOP or Gravity.CENTER
it.setBackgroundColor(R.color.color_99000000)
}
moreFeaturesPopup = MoreFeaturesPopup(context).also {
it.setOutSideDismiss(true)
it.popupGravity = Gravity.TOP or Gravity.CENTER
it.maskOffsetY = 20
it.setBackgroundColor(R.color.color_99000000)
it.navigationTo(findNavController())
}
reportStatusPopup = ReportStatusPopup(context).also {
it.setOutSideDismiss(true)
it.popupGravity = Gravity.TOP or Gravity.CENTER
it.setBackgroundColor(R.color.color_99000000)
}
setupMapBox() setupMapBox()
binding.noVideoMapWrapper.addView(layoutMapBoxBinding.root) binding.noVideoMapWrapper.addView(layoutMapBoxBinding.root)
setTodayCarriedNum(18) setTodayCarriedNum(18)
...@@ -81,7 +61,6 @@ class HomeNoVideoFragment : BaseMapFragment() { ...@@ -81,7 +61,6 @@ class HomeNoVideoFragment : BaseMapFragment() {
} }
return binding.root return binding.root
} }
private fun setTodayCarriedNum(num: Int) { private fun setTodayCarriedNum(num: Int) {
val templateString = getString(R.string.today_carried_text, num) val templateString = getString(R.string.today_carried_text, num)
val spannableString = SpannableString(templateString) val spannableString = SpannableString(templateString)
......
...@@ -28,9 +28,6 @@ class HomeVideoFragment : BaseMapFragment() { ...@@ -28,9 +28,6 @@ class HomeVideoFragment : BaseMapFragment() {
private var player2: ExoPlayer? = null private var player2: ExoPlayer? = null
private lateinit var workStatusEditPopup: WorkStatusEditPopup
private lateinit var moreFeaturesPopup: MoreFeaturesPopup
companion object { companion object {
fun newInstance() = HomeVideoFragment() fun newInstance() = HomeVideoFragment()
......
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.DialogFaultCauseSelectBinding
class FaultCauseDialog(context: Context, themeResId: Int) : AlertDialog(context, themeResId) {
private lateinit var binding:DialogFaultCauseSelectBinding
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_fault_cause_select,null)
}
binding = DialogFaultCauseSelectBinding.inflate(inflater)
setContentView(binding.root)
binding.radioGroup1.setOnCheckedChangeListener(FaultCauseItemCheckedListener())
binding.radioGroup2.setOnCheckedChangeListener(FaultCauseItemCheckedListener())
binding.faultCauseConfirm.setOnClickListener { }
binding.faultCauseCancel.setOnClickListener {
dismiss()
}
binding.faultCauseSelectClose.setOnClickListener {
dismiss()
}
}
inner class FaultCauseItemCheckedListener:OnCheckedChangeListener{
override fun onCheckedChanged(group: RadioGroup?, checkedId: Int) {
when(group?.id){
R.id.radioGroup1 ->{
binding.radioGroup2.setOnCheckedChangeListener(null)
binding.radioGroup2.clearCheck()
when(checkedId){
R.id.itemFaultEngine->{
LogUtils.d("发动机故障")
}
R.id.itemFaultMechanical->{
LogUtils.d("机械故障")
}
R.id.itemFaultHydraulicSystem->{
LogUtils.d("液压系统故障")
}
R.id.itemFaultElectrical->{
LogUtils.d("电气系统故障")
}
}
binding.radioGroup2.setOnCheckedChangeListener(this)
}
R.id.radioGroup2 ->{
binding.radioGroup1.setOnCheckedChangeListener(null)
binding.radioGroup1.clearCheck()
when(checkedId){
R.id.itemFaultEdgeReduction->{
LogUtils.d("边减故障")
}
R.id.itemFaultTire->{
LogUtils.d("轮胎故障")
}
R.id.itemFaultEquipmentMaintenance->{
LogUtils.d("设备保养")
}
R.id.itemFaultOtherInputs->{
LogUtils.d("其他录入")
}
}
binding.radioGroup1.setOnCheckedChangeListener(this)
}
}
}
}
}
\ No newline at end of file
package com.waytous.anticollision.ui.view package com.waytous.anticollision.ui.view
import android.content.Context import android.content.Context
import androidx.appcompat.app.AlertDialog
import com.waytous.anticollision.R import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.PopupReportStatusBinding
import razerdp.basepopup.BasePopupWindow import razerdp.basepopup.BasePopupWindow
class ReportStatusPopup(context: Context?) : BasePopupWindow(context) { class ReportStatusPopup(context: Context?) : BasePopupWindow(context) {
private lateinit var binding: PopupReportStatusBinding
init { init {
contentView = createPopupById(R.layout.popup_report_status) contentView = createPopupById(R.layout.popup_report_status)
binding = PopupReportStatusBinding.bind(contentView)
}
fun itemDumping(){
}
fun itemDelay(){
}
fun itemFault(dialog:AlertDialog){
binding.reportDialogFault.setOnClickListener {
dialog.show()
}
}
fun itemStandby(){
} }
} }
\ No newline at end of file
package com.waytous.anticollision.utils
import android.graphics.Rect
import android.view.TouchDelegate
import android.view.View
import android.view.ViewGroup
import androidx.databinding.BindingAdapter
import com.blankj.utilcode.util.SizeUtils
@BindingAdapter("expandTouchArea")
fun expandTouchArea(view: View, size: String) {
view.postDelayed({
val bounds = Rect()
view.getHitRect(bounds)
var left = 0
var top = 0
var right = 0
var bottom = 0
/*
* size 举例 `2` or `2 4` or `2 4 6 8`
*/
val mSize = size.trim()
val ss = mSize.split(" ")
when (ss.size) {
1 -> {
val sdp = SizeUtils.dp2px(((ss[0].toIntOrNull() ?: 0).toFloat()))
left = sdp
top = sdp
right = sdp
bottom = sdp
}
2 -> {
val sdp = SizeUtils.dp2px(((ss[0].toIntOrNull() ?: 0).toFloat()))
val sdp1 = SizeUtils.dp2px(((ss[1].toIntOrNull() ?: 0).toFloat()))
left = sdp
top = sdp1
right = sdp
bottom = sdp1
}
4 -> {
left = (ss[0].toIntOrNull() ?: 0)
top = SizeUtils.dp2px(((ss[1].toIntOrNull() ?: 0).toFloat()))
right = SizeUtils.dp2px(((ss[2].toIntOrNull() ?: 0).toFloat()))
bottom = SizeUtils.dp2px(((ss[3].toIntOrNull() ?: 0).toFloat()))
}
else -> {
return@postDelayed
}
}
bounds.left -= left
bounds.top -= top
bounds.right += right
bounds.bottom += bottom
val mTouchDelegate = TouchDelegate(bounds, view);
val p = view.parent
if (p is ViewGroup) {
p.touchDelegate = mTouchDelegate;
}
}, 100)
}
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<item android:state_pressed="true"> <item android:state_pressed="true">
<layer-list> <layer-list>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle" android:state_focused="true">
<size android:width="@dimen/dp_148" android:height="@dimen/dp_200"/> <size android:width="@dimen/dp_148" android:height="@dimen/dp_200"/>
<solid android:color="@color/color_80ececec" /> <solid android:color="@color/color_80ececec" />
<corners android:radius="16dp" /> <corners android:radius="16dp" />
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</item> </item>
</layer-list> </layer-list>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true" android:state_focused="true">
<layer-list> <layer-list>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="492dp" android:height="84dp"/> <size android:width="@dimen/dp_492" android:height="@dimen/dp_84"/>
<stroke android:width="1dp" android:color="@color/color_1a000000" /> <stroke android:width="@dimen/dp_1" android:color="@color/color_1a000000" />
<corners android:bottomLeftRadius="16dp"/> <corners android:bottomLeftRadius="@dimen/dp_16"/>
</shape> </shape>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="492dp" android:height="84dp"/> <size android:width="@dimen/dp_492" android:height="@dimen/dp_84"/>
<stroke android:width="1dp" android:color="@color/color_1a000000" /> <stroke android:width="@dimen/dp_1" android:color="@color/color_1a000000" />
<corners android:bottomRightRadius="16dp"/> <corners android:bottomRightRadius="@dimen/dp_16"/>
</shape> </shape>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="896dp" android:height="66dp"/> <size android:width="@dimen/dp_896" android:height="@dimen/dp_66"/>
<stroke android:width="1dp" android:color="@color/color_4d3c3c3c" /> <stroke android:width="@dimen/dp_1" android:color="@color/color_4d3c3c3c" />
<corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" /> <corners android:topLeftRadius="@dimen/dp_5" android:topRightRadius="@dimen/dp_5" android:bottomLeftRadius="@dimen/dp_5" android:bottomRightRadius="@dimen/dp_5" />
</shape> </shape>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false"> <item android:drawable="@drawable/background_fault_cause_item_unchecked" android:state_checked="false"/>
<shape android:shape="rectangle"> <item android:drawable="@drawable/background_fault_cause_item_checked" android:state_checked="true"/>
<solid android:color="@color/color_ffececec" />
<corners android:radius="16dp" />
<size android:width="200dp" android:height="136dp"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/color_ff3684f9" />
<corners android:radius="16dp" />
<size android:width="200dp" android:height="136dp"/>
</shape>
</item>
</selector> </selector>
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_ff3684f9" />
<corners android:radius="@dimen/dp_16" />
<size android:width="@dimen/dp_200" android:height="@dimen/dp_136"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_edge_reduction_light"/> <item android:drawable="@drawable/icon_fault_edge_reduction_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_edge_reduction_night"/> <item android:drawable="@drawable/icon_fault_edge_reduction_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_electrical_light"/> <item android:drawable="@drawable/icon_fault_electrical_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_electrical_night"/> <item android:drawable="@drawable/icon_fault_electrical_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_engine_light"/> <item android:drawable="@drawable/icon_fault_engine_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_engine_night"/> <item android:drawable="@drawable/icon_fault_engine_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_equipment_maintenance_light"/> <item android:drawable="@drawable/icon_fault_equipment_maintenance_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_equipment_maintenance_night"/> <item android:drawable="@drawable/icon_fault_equipment_maintenance_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_hydraulic_system_light"/> <item android:drawable="@drawable/icon_fault_hydraulic_system_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_hydraulic_system_night"/> <item android:drawable="@drawable/icon_fault_hydraulic_system_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_mechanical_light"/> <item android:drawable="@drawable/icon_fault_mechanical_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_mechanical_night"/> <item android:drawable="@drawable/icon_fault_mechanical_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_other_inputs_light"/> <item android:drawable="@drawable/icon_fault_other_inputs_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_other_inputs_night"/> <item android:drawable="@drawable/icon_fault_other_inputs_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/icon_fault_tire_light"/> <item android:drawable="@drawable/icon_fault_tire_light" android:state_checked="false"/>
<item android:state_pressed="true" android:drawable="@drawable/icon_fault_tire_night"/> <item android:drawable="@drawable/icon_fault_tire_night" android:state_checked="true"/>
</selector> </selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_ffececec" />
<corners android:radius="@dimen/dp_16" />
<size android:width="@dimen/dp_200" android:height="@dimen/dp_136"/>
</shape>
\ 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:color="@color/color_ff333333" android:state_checked="false"/>
<item android:color="@color/white" android:state_checked="true"/>
</selector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M10,8.08 L2.31,0.39A1.36,1.36 0,0 0,0.39 2.31L8.08,10 0.39,17.69a1.36,1.36 0,0 0,1.92 1.92L10,11.92l7.69,7.69a1.36,1.36 0,0 0,1.92 -1.92L11.92,10l7.69,-7.69A1.36,1.36 0,0 0,17.69 0.39Z"
android:fillColor="#333"/>
</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="#333"/>
</vector>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="984dp"
android:layout_height="636dp"
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_height="@dimen/dp_636"
app:cardCornerRadius="@dimen/dp_16"
android:background="@drawable/drawable_bg_map_box"> android:background="@drawable/drawable_bg_map_box">
<androidx.appcompat.widget.AppCompatTextView <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:layout_marginTop="23dp" <androidx.appcompat.widget.AppCompatTextView
android:text="@string/fault_cause_select" android:id="@+id/faultCauseSelectTitle"
android:textSize="24sp" android:layout_width="wrap_content"
android:textColor="@color/color_ff333333" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="@dimen/dp_23"
app:layout_constraintStart_toStartOf="parent" android:text="@string/fault_cause_select"
app:layout_constraintEnd_toEndOf="parent"/> android:textSize="@dimen/sp_24"
<CheckedTextView android:textColor="@color/color_ff333333"
android:id="@+id/itemFaultEngine" app:layout_constraintTop_toTopOf="parent"
style="@style/FaultCauseTextStyle" app:layout_constraintStart_toStartOf="parent"
android:text="@string/fault_cause_engine" app:layout_constraintEnd_toEndOf="parent"/>
android:background="@drawable/background_fault_cause_item" <androidx.appcompat.widget.AppCompatImageView
android:drawableTop="@drawable/background_fault_cause_item_engine" android:id="@+id/faultCauseSelectClose"
android:layout_marginTop="77dp" android:layout_width="wrap_content"
android:layout_marginStart="44dp" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" android:src="@drawable/icon_close"
app:layout_constraintStart_toStartOf="parent" android:layout_marginEnd="@dimen/dp_45"
app:layout_constraintEnd_toStartOf="@id/itemFaultMechanical"/> android:focusable="true"
<androidx.appcompat.widget.AppCompatTextView android:clickable="true"
android:id="@+id/itemFaultMechanical" app:layout_constraintTop_toTopOf="@id/faultCauseSelectTitle"
style="@style/FaultCauseTextStyle" app:layout_constraintBottom_toBottomOf="@id/faultCauseSelectTitle"
android:text="@string/fault_cause_mechanical" app:layout_constraintEnd_toEndOf="parent"/>
android:background="@drawable/background_fault_cause_item" <RadioGroup
android:drawableTop="@drawable/background_fault_cause_item_mechanical" android:id="@+id/radioGroup1"
android:layout_marginStart="32dp" android:layout_width="@dimen/dp_0"
app:layout_constraintTop_toTopOf="@id/itemFaultEngine" android:layout_height="wrap_content"
app:layout_constraintStart_toEndOf="@id/itemFaultEngine" android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/itemFaultEngine" android:layout_marginStart="@dimen/dp_44"
app:layout_constraintEnd_toStartOf="@id/itemFaultHydraulicSystem"/> android:layout_marginTop="@dimen/dp_20"
<androidx.appcompat.widget.AppCompatTextView android:layout_marginEnd="@dimen/dp_44"
android:id="@+id/itemFaultHydraulicSystem" app:layout_constraintTop_toBottomOf="@id/faultCauseSelectTitle"
style="@style/FaultCauseTextStyle" app:layout_constraintStart_toStartOf="parent"
android:text="@string/fault_cause_hydraulic_system" app:layout_constraintEnd_toEndOf="parent">
android:background="@drawable/background_fault_cause_item" <RadioButton
android:drawableTop="@drawable/background_fault_cause_item_hydraulic_system" android:id="@+id/itemFaultEngine"
android:layout_marginStart="32dp" android:layout_width="@dimen/dp_0"
app:layout_constraintTop_toTopOf="@id/itemFaultMechanical" android:layout_height="@dimen/dp_136"
app:layout_constraintStart_toEndOf="@id/itemFaultMechanical" style="@style/FaultCauseTextStyle"
app:layout_constraintBottom_toBottomOf="@id/itemFaultMechanical" android:drawableTop="@drawable/background_fault_cause_item_engine"
app:layout_constraintEnd_toStartOf="@id/itemFaultElectrical"/> android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:checked="true"
android:text="@string/fault_cause_engine"/>
<RadioButton
android:id="@+id/itemFaultMechanical"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_mechanical"
android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:text="@string/fault_cause_mechanical"/>
<RadioButton
android:id="@+id/itemFaultHydraulicSystem"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_hydraulic_system"
android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:text="@string/fault_cause_hydraulic_system"/>
<RadioButton
android:id="@+id/itemFaultElectrical"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_electrical"
android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:text="@string/fault_cause_electrical"/>
</RadioGroup>
<RadioGroup
android:id="@+id/radioGroup2"
android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginStart="@dimen/dp_44"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginEnd="@dimen/dp_44"
app:layout_constraintTop_toBottomOf="@id/radioGroup1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<RadioButton
android:id="@+id/itemFaultEdgeReduction"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle"
android:drawableTop="@drawable/background_fault_cause_item_edge_reduction"
android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:text="@string/fault_cause_edge_reduction"/>
<RadioButton
android:id="@+id/itemFaultTire"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_tire"
android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:text="@string/fault_cause_tire"/>
<RadioButton
android:id="@+id/itemFaultEquipmentMaintenance"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_equipment_maintenance"
android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:text="@string/fault_cause_equipment_maintenance"/>
<RadioButton
android:id="@+id/itemFaultOtherInputs"
android:layout_width="@dimen/dp_0"
android:layout_height="@dimen/dp_136"
style="@style/FaultCauseTextStyle"
android:layout_marginStart="@dimen/dp_32"
android:drawableTop="@drawable/background_fault_cause_item_other_inputs"
android:background="@drawable/background_fault_cause_item"
android:textColor="@drawable/color_text_btn_4"
android:button="@null"
android:text="@string/fault_cause_other_inputs"/>
</RadioGroup>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatEditText
android:id="@+id/itemFaultElectrical" android:id="@+id/faultCauseEdit"
style="@style/FaultCauseTextStyle" android:layout_width="0dp"
android:layout_marginEnd="44dp" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginTop="@dimen/dp_44"
android:background="@drawable/background_fault_cause_item" android:layout_marginBottom="@dimen/dp_64"
android:drawableTop="@drawable/background_fault_cause_item_electrical" android:background="@drawable/background_fault_cause_edittext"
android:text="@string/fault_cause_electrical" android:gravity="center_vertical"
app:layout_constraintEnd_toEndOf="parent" android:hint="@string/pls_input_cause"
app:layout_constraintStart_toEndOf="@+id/itemFaultHydraulicSystem" android:paddingStart="@dimen/dp_30"
app:layout_constraintTop_toTopOf="@+id/itemFaultHydraulicSystem" /> android:paddingEnd="@dimen/dp_30"
android:textColor="@color/color_ff333333"
<androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/sp_22"
android:id="@+id/itemFaultEdgeReduction" app:layout_constraintBottom_toTopOf="@+id/faultCauseConfirm"
style="@style/FaultCauseTextStyle" app:layout_constraintEnd_toEndOf="@id/radioGroup2"
android:layout_marginTop="28dp" app:layout_constraintStart_toStartOf="@id/radioGroup2"
android:background="@drawable/background_fault_cause_item" app:layout_constraintTop_toBottomOf="@id/radioGroup2" />
android:drawableTop="@drawable/background_fault_cause_item_edge_reduction" <androidx.appcompat.widget.AppCompatTextView
android:text="@string/fault_cause_edge_reduction" android:id="@+id/faultCauseConfirm"
app:layout_constraintEnd_toEndOf="@+id/itemFaultEngine" android:layout_width="@dimen/dp_0"
app:layout_constraintStart_toStartOf="@+id/itemFaultEngine" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/itemFaultEngine" /> android:background="@drawable/background_fault_cause_button1"
<androidx.appcompat.widget.AppCompatTextView android:gravity="center"
android:id="@+id/itemFaultTire" android:text="@string/confirm"
style="@style/FaultCauseTextStyle" android:textSize="@dimen/sp_28"
android:layout_marginStart="32dp" android:textColor="@drawable/color_text_btn_3"
android:background="@drawable/background_fault_cause_item" android:focusable="true"
android:drawableTop="@drawable/background_fault_cause_item_tire" android:clickable="true"
android:text="@string/fault_cause_tire" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/itemFaultEdgeReduction" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/itemFaultEdgeReduction" app:layout_constraintEnd_toStartOf="@id/faultCauseCancel"/>
app:layout_constraintTop_toBottomOf="@id/itemFaultEdgeReduction" /> <androidx.appcompat.widget.AppCompatTextView
<androidx.appcompat.widget.AppCompatTextView android:id="@+id/faultCauseCancel"
android:id="@+id/itemFaultEquipmentMaintenance" android:layout_width="@dimen/dp_0"
style="@style/FaultCauseTextStyle" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:background="@drawable/background_fault_cause_button2"
android:background="@drawable/background_fault_cause_item" android:gravity="center"
android:drawableTop="@drawable/background_fault_cause_item_equipment_maintenance" android:text="@string/cancel"
android:text="@string/fault_cause_equipment_maintenance" android:textSize="@dimen/sp_28"
app:layout_constraintTop_toTopOf="@id/itemFaultTire" android:textColor="@drawable/color_text_btn_3"
app:layout_constraintStart_toEndOf="@id/itemFaultTire" android:focusable="true"
app:layout_constraintTop_toBottomOf="@id/itemFaultTire" /> android:clickable="true"
<androidx.appcompat.widget.AppCompatTextView app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/itemFaultOtherInputs" app:layout_constraintBottom_toBottomOf="parent"
style="@style/FaultCauseTextStyle" app:layout_constraintStart_toEndOf="@id/faultCauseConfirm"/>
android:layout_marginStart="32dp" </androidx.constraintlayout.widget.ConstraintLayout>
android:background="@drawable/background_fault_cause_item" </androidx.cardview.widget.CardView>
android:drawableTop="@drawable/background_fault_cause_item_other_inputs" \ No newline at end of file
android:text="@string/fault_cause_other_inputs"
app:layout_constraintTop_toTopOf="@id/itemFaultEquipmentMaintenance"
app:layout_constraintStart_toEndOf="@id/itemFaultEquipmentMaintenance"
app:layout_constraintTop_toBottomOf="@id/itemFaultEquipmentMaintenance" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/faultCauseEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/background_fault_cause_edittext"
android:gravity="center_vertical"
android:paddingStart="30dp"
android:paddingEnd="30dp"
android:layout_marginTop="44dp"
android:hint="@string/pls_input_cause"
android:textColor="@color/color_ff333333"
android:textSize="22sp"
app:layout_constraintTop_toBottomOf="@id/itemFaultEdgeReduction"
app:layout_constraintStart_toStartOf="@id/itemFaultEdgeReduction"
app:layout_constraintEnd_toEndOf="@id/itemFaultOtherInputs"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/faultCauseConfirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/background_fault_cause_button1"
android:gravity="center"
android:text="@string/confirm"
android:textSize="28sp"
android:textColor="@drawable/color_text_btn_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/faultCauseCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/background_fault_cause_button2"
android:gravity="center"
android:text="@string/cancel"
android:textSize="28sp"
android:textColor="@drawable/color_text_btn_3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
android:id="@+id/more_template_title" android:id="@+id/more_template_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="40dp" android:layout_marginStart="@dimen/dp_40"
android:layout_marginTop="20dp" android:layout_marginTop="@dimen/dp_20"
android:text="@string/toggle_more_text" android:text="@string/toggle_more_text"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
android:textSize="24sp" android:textSize="@dimen/sp_24"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -21,16 +21,16 @@ ...@@ -21,16 +21,16 @@
android:id="@+id/moreFeatureCollect" android:id="@+id/moreFeatureCollect"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/background_more_features_item" android:background="@drawable/background_more_features_item"
android:clickable="true" android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_collect" android:drawableTop="@mipmap/icon_more_item_collect"
android:drawablePadding="2dp" android:drawablePadding="@dimen/dp_2"
android:focusable="true" android:focusable="true"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/more_feature_collect" android:text="@string/more_feature_collect"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
android:textSize="20sp" android:textSize="@dimen/sp_20"
app:layout_constraintStart_toStartOf="@id/more_template_title" app:layout_constraintStart_toStartOf="@id/more_template_title"
app:layout_constraintTop_toBottomOf="@id/more_template_title" /> app:layout_constraintTop_toBottomOf="@id/more_template_title" />
...@@ -38,16 +38,16 @@ ...@@ -38,16 +38,16 @@
android:id="@+id/moreFeatureHealth" android:id="@+id/moreFeatureHealth"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="45dp" android:layout_marginStart="@dimen/dp_45"
android:background="@drawable/background_more_features_item" android:background="@drawable/background_more_features_item"
android:clickable="true" android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_health" android:drawableTop="@mipmap/icon_more_item_health"
android:drawablePadding="2dp" android:drawablePadding="@dimen/dp_2"
android:focusable="true" android:focusable="true"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/more_feature_health" android:text="@string/more_feature_health"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
android:textSize="20sp" android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="@id/moreFeatureCollect" app:layout_constraintBottom_toBottomOf="@id/moreFeatureCollect"
app:layout_constraintStart_toEndOf="@id/moreFeatureCollect" app:layout_constraintStart_toEndOf="@id/moreFeatureCollect"
app:layout_constraintTop_toTopOf="@id/moreFeatureCollect" /> app:layout_constraintTop_toTopOf="@id/moreFeatureCollect" />
...@@ -56,17 +56,17 @@ ...@@ -56,17 +56,17 @@
android:id="@+id/moreFeatureData" android:id="@+id/moreFeatureData"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="45dp" android:layout_marginStart="@dimen/dp_45"
android:layout_marginEnd="40dp" android:layout_marginEnd="@dimen/dp_40"
android:background="@drawable/background_more_features_item" android:background="@drawable/background_more_features_item"
android:clickable="true" android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_data" android:drawableTop="@mipmap/icon_more_item_data"
android:drawablePadding="2dp" android:drawablePadding="@dimen/dp_2"
android:focusable="true" android:focusable="true"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/more_feature_data" android:text="@string/more_feature_data"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
android:textSize="20sp" android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="@id/moreFeatureHealth" app:layout_constraintBottom_toBottomOf="@id/moreFeatureHealth"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/moreFeatureHealth" app:layout_constraintStart_toEndOf="@id/moreFeatureHealth"
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
android:id="@+id/moreFeatureSettings" android:id="@+id/moreFeatureSettings"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="@dimen/dp_16"
android:layout_marginBottom="24dp" android:layout_marginBottom="@dimen/dp_24"
android:background="@drawable/background_more_features_item" android:background="@drawable/background_more_features_item"
android:clickable="true" android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_settings" android:drawableTop="@mipmap/icon_more_item_settings"
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/more_feature_settings" android:text="@string/more_feature_settings"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
android:textSize="20sp" android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/moreFeatureCollect" app:layout_constraintStart_toStartOf="@id/moreFeatureCollect"
app:layout_constraintTop_toBottomOf="@id/moreFeatureCollect" /> app:layout_constraintTop_toBottomOf="@id/moreFeatureCollect" />
...@@ -95,16 +95,16 @@ ...@@ -95,16 +95,16 @@
android:id="@+id/moreFeatureReboot" android:id="@+id/moreFeatureReboot"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="45dp" android:layout_marginStart="@dimen/dp_45"
android:background="@drawable/background_more_features_item" android:background="@drawable/background_more_features_item"
android:clickable="true" android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_reboot" android:drawableTop="@mipmap/icon_more_item_reboot"
android:drawablePadding="2dp" android:drawablePadding="@dimen/dp_2"
android:focusable="true" android:focusable="true"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/more_feature_reboot" android:text="@string/more_feature_reboot"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
android:textSize="20sp" android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="@id/moreFeatureSettings" app:layout_constraintBottom_toBottomOf="@id/moreFeatureSettings"
app:layout_constraintStart_toEndOf="@id/moreFeatureSettings" app:layout_constraintStart_toEndOf="@id/moreFeatureSettings"
app:layout_constraintTop_toTopOf="@id/moreFeatureSettings" /> app:layout_constraintTop_toTopOf="@id/moreFeatureSettings" />
...@@ -113,16 +113,16 @@ ...@@ -113,16 +113,16 @@
android:id="@+id/moreFeaturePowerOff" android:id="@+id/moreFeaturePowerOff"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="45dp" android:layout_marginStart="@dimen/dp_45"
android:background="@drawable/background_more_features_item" android:background="@drawable/background_more_features_item"
android:clickable="true" android:clickable="true"
android:drawableTop="@mipmap/icon_more_item_power_off" android:drawableTop="@mipmap/icon_more_item_power_off"
android:drawablePadding="2dp" android:drawablePadding="@dimen/dp_2"
android:focusable="true" android:focusable="true"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="@string/more_feature_power_off" android:text="@string/more_feature_power_off"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
android:textSize="20sp" android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="@id/moreFeatureReboot" app:layout_constraintBottom_toBottomOf="@id/moreFeatureReboot"
app:layout_constraintEnd_toEndOf="@id/moreFeatureData" app:layout_constraintEnd_toEndOf="@id/moreFeatureData"
app:layout_constraintStart_toEndOf="@id/moreFeatureReboot" app:layout_constraintStart_toEndOf="@id/moreFeatureReboot"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
android:id="@+id/navigation_home" android:id="@+id/navigation_home"
android:name="com.waytous.anticollision.ui.home.HomeNoVideoFragment" android:name="com.waytous.anticollision.ui.home.HomeNoVideoFragment"
android:label="@string/title_home" android:label="@string/title_home"
tools:layout="@layout/fragment_home" > tools:layout="@layout/fragment_no_video_home" >
<action <action
android:id="@+id/action_navigation_home_to_collectFragment" android:id="@+id/action_navigation_home_to_collectFragment"
app:destination="@id/collectFragment" /> app:destination="@id/collectFragment" />
......
...@@ -47,6 +47,19 @@ ...@@ -47,6 +47,19 @@
<item name="android:maxLength">8</item> <item name="android:maxLength">8</item>
<item name="android:textSize">10sp</item> <item name="android:textSize">10sp</item>
</style> </style>
<style name="FaultCauseTextStyle" parent="Theme.HTAnticollision">
<item name="android:layout_width">@dimen/dp_200</item>
<item name="android:layout_height">@dimen/dp_136</item>
<item name="background">@drawable/background_fault_cause_item</item>
<item name="android:textColor">@drawable/color_text_btn</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:drawablePadding">@dimen/dp_3</item>
<item name="android:paddingTop">@dimen/dp_30</item>
<item name="android:textSize">@dimen/sp_22</item>
<item name="android:button">@null</item>
<item name="android:clickable">true</item>
<item name="android:focusable">true</item>
</style>
<style name="OtherVehicleSpeed" parent="Theme.HTAnticollision"> <style name="OtherVehicleSpeed" parent="Theme.HTAnticollision">
<item name="android:textColor">@color/color_ffebf0ff</item> <item name="android:textColor">@color/color_ffebf0ff</item>
</style> </style>
......
...@@ -389,10 +389,13 @@ ...@@ -389,10 +389,13 @@
<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_600">600dp</dimen> <dimen name="dp_600">600dp</dimen>
<dimen name="dp_636">636dp</dimen>
<dimen name="dp_652">652dp</dimen> <dimen name="dp_652">652dp</dimen>
<dimen name="dp_640">640dp</dimen> <dimen name="dp_640">640dp</dimen>
<dimen name="dp_712">712dp</dimen> <dimen name="dp_712">712dp</dimen>
<dimen name="dp_720">720dp</dimen> <dimen name="dp_720">720dp</dimen>
<dimen name="dp_896">896dp</dimen>
<dimen name="dp_984">984dp</dimen>
<!-- font size,you can add if there is no one --> <!-- font size,you can add if there is no one -->
<dimen name="sp_6">6sp</dimen> <dimen name="sp_6">6sp</dimen>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<item name="android:textColor">@color/home_text_color</item> <item name="android:textColor">@color/home_text_color</item>
<item name="android:ellipsize">end</item> <item name="android:ellipsize">end</item>
<item name="singleLine">true</item> <item name="singleLine">true</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">@dimen/sp_20</item>
</style> </style>
<style name="ReminderInfoTextStyle" parent="Theme.HTAnticollision"> <style name="ReminderInfoTextStyle" parent="Theme.HTAnticollision">
<item name="background">@drawable/drawable_bg_reminder_info1</item> <item name="background">@drawable/drawable_bg_reminder_info1</item>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<item name="singleLine">true</item> <item name="singleLine">true</item>
<item name="android:ems">8</item> <item name="android:ems">8</item>
<item name="android:maxLength">8</item> <item name="android:maxLength">8</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">@dimen/sp_20</item>
</style> </style>
<style name="MapBoxButtonStyle" parent="Theme.HTAnticollision"> <style name="MapBoxButtonStyle" parent="Theme.HTAnticollision">
<item name="android:adjustViewBounds">true</item> <item name="android:adjustViewBounds">true</item>
...@@ -52,16 +52,13 @@ ...@@ -52,16 +52,13 @@
<item name="android:focusable">true</item> <item name="android:focusable">true</item>
</style> </style>
<style name="FaultCauseTextStyle" parent="Theme.HTAnticollision"> <style name="FaultCauseTextStyle" parent="Theme.HTAnticollision">
<item name="android:layout_width">200dp</item> <item name="android:layout_width">@dimen/dp_200</item>
<item name="android:layout_height">136dp</item> <item name="android:layout_height">@dimen/dp_136</item>
<item name="background">@drawable/background_fault_cause_item</item> <item name="android:layout_weight">1</item>
<item name="android:textColor">@drawable/color_text_btn</item> <item name="android:gravity">center</item>
<item name="android:gravity">center_horizontal</item> <item name="android:drawablePadding">@dimen/dp_3</item>
<item name="android:drawablePadding">3dp</item> <item name="android:paddingTop">@dimen/dp_30</item>
<item name="android:paddingTop">30dp</item> <item name="android:textSize">@dimen/sp_22</item>
<item name="android:textSize">22sp</item>
<item name="android:clickable">true</item>
<item name="android:focusable">true</item>
</style> </style>
<style name="OtherVehicleSpeed" parent="Theme.HTAnticollision"> <style name="OtherVehicleSpeed" parent="Theme.HTAnticollision">
<item name="android:textColor">@color/color_1352C5</item> <item name="android:textColor">@color/color_1352C5</item>
...@@ -69,4 +66,14 @@ ...@@ -69,4 +66,14 @@
<style name="OtherVehicleDistance" parent="Theme.HTAnticollision"> <style name="OtherVehicleDistance" parent="Theme.HTAnticollision">
<item name="android:textColor">@color/color_fff06313</item> <item name="android:textColor">@color/color_fff06313</item>
</style> </style>
<style name="DialogStyle" parent="Theme.HTAnticollision">
!-- 是否漂现在activity上 -->
<item name="android:windowIsFloating">true</item>
<!-- 是否隐藏标题 -->
<item name="android:windowNoTitle">true</item>
<!-- 是否允许背景变暗 -->
<item name="android:backgroundDimEnabled">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="hideNavigationIcon">true</item>
</style>
</resources> </resources>
\ No newline at end of file
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