Skip to content

H
HTAnticollision
Commit b7114453 authored by 马乐's avatar 马乐
Browse files
Options

1.优化状态栏UI

2.优化采图页面UI
parent 5c819d33
Show whitespace changes
Inline Side-by-side
Showing with 382 additions and 265 deletions
app/src/main/java/com/waytous/anticollision/ui/collect/CollectFragment.kt
View file @ b7114453
package com.waytous.anticollision.ui.collect package com.waytous.anticollision.ui.collect
import android.app.Dialog
import android.os.Bundle import android.os.Bundle
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.fragment.app.Fragment import android.widget.AdapterView
import android.widget.AdapterView.OnItemSelectedListener
import androidx.appcompat.widget.AppCompatImageView
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.afollestad.materialdialogs.MaterialDialog import com.blankj.utilcode.util.LogUtils
import com.waytous.anticollision.R import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.FragmentCollectBinding import com.waytous.anticollision.databinding.FragmentCollectBinding
import com.waytous.anticollision.databinding.FragmentCollectTabCollectBinding
import com.waytous.anticollision.databinding.FragmentCollectTabSettingsBinding
import com.waytous.anticollision.ui.BaseMapFragment
class CollectFragment : Fragment() { class CollectFragment : BaseMapFragment() {
companion object{ companion object{
const val TAB_ITEM_COLLECT = 0x01 const val TAB_ITEM_COLLECT = 0x01
...@@ -19,9 +23,21 @@ class CollectFragment : Fragment() { ...@@ -19,9 +23,21 @@ class CollectFragment : Fragment() {
} }
private var _binding: FragmentCollectBinding? = null private var _binding: FragmentCollectBinding? = null
private lateinit var tabCollectBinding: FragmentCollectTabCollectBinding
private lateinit var tabSettingsBinding: FragmentCollectTabSettingsBinding
private val binding get() = _binding!! private val binding get() = _binding!!
private lateinit var dialogFaultCause:Dialog private val iconCalibrates by lazy {
listOf(tabCollectBinding.vehicleLeftFrontWheel,
tabCollectBinding.vehicleRightFrontWheel,
tabCollectBinding.vehicleLeftBackWheel,
tabCollectBinding.vehicleRightBackWheel,
tabCollectBinding.vehicleGeometricCenter,
tabCollectBinding.vehicleFrontAxleCenter,
tabCollectBinding.vehicleBackAxleCenter)
}
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, inflater: LayoutInflater, container: ViewGroup?,
...@@ -29,10 +45,42 @@ class CollectFragment : Fragment() { ...@@ -29,10 +45,42 @@ class CollectFragment : Fragment() {
): View { ): View {
_binding = FragmentCollectBinding.inflate(inflater, container, false) _binding = FragmentCollectBinding.inflate(inflater, container, false)
context?:return binding.root context?:return binding.root
initTabLayout() setupMapBox()
dialogFaultCause = Dialog(requireContext()).also { binding.collectMapWrapper.addView(layoutMapBoxBinding.root)
it.setContentView(R.layout.dialog_fault_cause_select) tabCollectBinding = FragmentCollectTabCollectBinding.bind(LayoutInflater.from(context).inflate(
R.layout.fragment_collect_tab_collect,
null,
false
)).apply {
collectSpinnerVehicleParts.onItemSelectedListener = object:OnItemSelectedListener{
override fun onItemSelected(
parent: AdapterView<*>?,
view: View?,
position: Int,
id: Long
) {
LogUtils.d("selected position = $position")
iconCalibrates.filterIndexed { index, appCompatImageView ->
LogUtils.d("filterIndexed index = $index")
appCompatImageView.setImageResource(R.drawable.icon_vehicle_uncalibrated)
index == position
}.forEach {
it.setImageResource(R.drawable.icon_vehicle_calibrate)
}
}
override fun onNothingSelected(parent: AdapterView<*>?) {
}
}
} }
tabSettingsBinding = FragmentCollectTabSettingsBinding.bind(LayoutInflater.from(context).inflate(
R.layout.fragment_collect_tab_settings,
null,
false
))
initTabLayout()
binding.collectTabBtnToHome.setOnClickListener { binding.collectTabBtnToHome.setOnClickListener {
findNavController().navigate(R.id.navigation_home) findNavController().navigate(R.id.navigation_home)
} }
...@@ -40,23 +88,13 @@ class CollectFragment : Fragment() { ...@@ -40,23 +88,13 @@ class CollectFragment : Fragment() {
} }
private fun initTabLayout(){ private fun initTabLayout(){
val collectItem = LayoutInflater.from(context).inflate( binding.collectTabContent.addView(tabCollectBinding.root)
R.layout.fragment_collect_tab_collect,
null,
false
)
binding.collectTabContent.addView(collectItem)
val settingsItem = LayoutInflater.from(context).inflate(
R.layout.fragment_collect_tab_settings,
null,
false
)
binding.collectRadioGroup.setOnCheckedChangeListener { _, checkedId -> binding.collectRadioGroup.setOnCheckedChangeListener { _, checkedId ->
binding.collectTabContent.removeAllViews() binding.collectTabContent.removeAllViews()
if (checkedId == R.id.collectTabCollect) { if (checkedId == R.id.collectTabCollect) {
binding.collectTabContent.addView(collectItem) binding.collectTabContent.addView(tabCollectBinding.root)
} else { } else {
binding.collectTabContent.addView(settingsItem) binding.collectTabContent.addView(tabSettingsBinding.root)
} }
} }
} }
......
app/src/main/res/drawable-night/background_status_bar_carried_truck_num.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/dp_76"
android:height="@dimen/dp_30" />
<solid android:color="@color/color_ff3684f9" />
<corners android:radius="@dimen/dp_700" />
</shape>
\ No newline at end of file
app/src/main/res/drawable-night/background_status_bar_matter_status.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="@dimen/dp_76" android:height="@dimen/dp_30"/>
<stroke android:width="@dimen/dp_1" android:color="@color/matter_text_color" />
<corners android:radius="@dimen/dp_700" />
</shape>
\ No newline at end of file
app/src/main/res/drawable-night/background_status_bar_ready_status.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/dp_76"
android:height="@dimen/dp_30" />
<solid android:color="@color/color_ff1f971d" />
<corners android:radius="@dimen/dp_700" />
</shape>
app/src/main/res/drawable-night/background_status_bar_violations_num.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/dp_76"
android:height="@dimen/dp_30" />
<solid android:color="@color/color_fffc5454" />
<corners android:radius="@dimen/dp_700" />
</shape>
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_carried_truck_num.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="84dp"
android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#ff3684f9" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_map_box.xml
View file @ b7114453
<?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"
android:shape="rectangle"> android:shape="rectangle">
<stroke android:width="3dp" android:color="#33ffffff" /> <solid android:color="#33ffffff"/>
<corners android:radius="16dp" /> <corners android:radius="@dimen/dp_16" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_matter_status.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="84dp" android:height="32dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/matter_text_color" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_ready_status.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="84dp"
android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#ff1f971d" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
app/src/main/res/drawable-night/drawable_bg_violations_num.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="84dp"
android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#fffc5454" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/background_collect_btn_back_to_home.xml
View file @ b7114453
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<item android:state_pressed="false"> <item android:state_pressed="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/white" /> <solid android:color="@color/white" />
<corners android:radius="16dp" /> <corners android:radius="@dimen/dp_16" />
<size android:width="256dp" android:height="84dp"/> <size android:width="@dimen/dp_256" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_ff3684f9" /> <solid android:color="@color/color_ff3684f9" />
<corners android:radius="16dp" /> <corners android:radius="@dimen/dp_16" />
<size android:width="256dp" android:height="84dp"/> <size android:width="@dimen/dp_256" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
</selector> </selector>
app/src/main/res/drawable/background_collect_spinner_text.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="@dimen/dp_300" android:height="@dimen/dp_54"/>
<stroke android:width="1dp" android:color="#ffc5c5c5" />
<solid android:color="#ccffffff" />
<corners android:radius="@dimen/dp_10"/>
</shape>
app/src/main/res/drawable/background_collect_tab_btn_end.xml
View file @ b7114453
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<item android:state_pressed="false"> <item android:state_pressed="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_fffc5454" /> <solid android:color="@color/color_fffc5454" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_ccfc5454" /> <solid android:color="@color/color_ccfc5454" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
</selector> </selector>
app/src/main/res/drawable/background_collect_tab_btn_pause.xml
View file @ b7114453
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<item android:state_pressed="false"> <item android:state_pressed="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_ffffd210" /> <solid android:color="@color/color_ffffd210" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_ccffd210" /> <solid android:color="@color/color_ccffd210" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
</selector> </selector>
app/src/main/res/drawable/background_collect_tab_btn_tap.xml
View file @ b7114453
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<item android:state_pressed="false"> <item android:state_pressed="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/white" /> <solid android:color="@color/white" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_ccffffff" /> <solid android:color="@color/color_ccffffff" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
</selector> </selector>
app/src/main/res/drawable/background_collect_tab_btn_upload.xml
View file @ b7114453
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<item android:state_pressed="false"> <item android:state_pressed="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_ff47a625" /> <solid android:color="@color/color_ff47a625" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/color_cc47a625" /> <solid android:color="@color/color_cc47a625" />
<corners android:radius="70dp" /> <corners android:radius="@dimen/dp_70" />
<size android:width="140dp" android:height="84dp"/> <size android:width="@dimen/dp_140" android:height="@dimen/dp_84"/>
</shape> </shape>
</item> </item>
</selector> </selector>
app/src/main/res/drawable/background_collect_tab_text.xml
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="300dp" android:height="50dp"> <size android:width="@dimen/dp_300" android:height="@dimen/dp_50"/>
<shape android:shape="rectangle"> <solid android:color="#ffffffff" />
<stroke android:width="1dp" android:color="#ffc5c5c5" /> <corners android:radius="@dimen/dp_10"/>
<solid android:color="#ccffffff" /> </shape>
<corners android:topLeftRadius="10dp" android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" />
</shape>
</item>
</layer-list>
app/src/main/res/drawable/background_spinner.xml
View file @ b7114453
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<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:state_pressed="false">
<layer-list> <layer-list>
<item android:width="300dp" android:height="50dp" android:drawable="@drawable/background_collect_tab_text"/> <item android:width="@dimen/dp_300" android:height="@dimen/dp_54" android:drawable="@drawable/background_collect_spinner_text"/>
<item android:drawable="@mipmap/icon_spinner_expanded_light" android:left="236dp"/> <item android:drawable="@mipmap/icon_spinner_expanded_light" android:left="@dimen/dp_249"/>
</layer-list> </layer-list>
</item> </item>
<item android:state_pressed="true"> <item android:state_pressed="true">
<layer-list> <layer-list>
<item android:width="300dp" android:height="50dp" android:drawable="@drawable/background_collect_tab_text"/> <item android:width="@dimen/dp_300" android:height="@dimen/dp_54" android:drawable="@drawable/background_collect_spinner_text"/>
<item android:drawable="@mipmap/icon_spinner_retracted_light" android:left="236dp"/> <item android:drawable="@mipmap/icon_spinner_retracted_light" android:left="@dimen/dp_249"/>
</layer-list> </layer-list>
</item> </item>
</selector> </selector>
app/src/main/res/drawable/background_status_bar_carried_truck_num.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/dp_76"
android:height="@dimen/dp_30" />
<solid android:color="@color/color_ff3684f9" />
<corners android:radius="@dimen/dp_700" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/background_status_bar_matter_status.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="@dimen/dp_76" android:height="@dimen/dp_30"/>
<stroke android:width="@dimen/dp_1" android:color="@color/matter_text_color" />
<corners android:radius="@dimen/dp_700" />
</shape>
app/src/main/res/drawable/background_status_bar_ready_status.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/dp_76"
android:height="@dimen/dp_30" />
<solid android:color="@color/color_ff1f971d" />
<corners android:radius="@dimen/dp_700" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/background_status_bar_violations_num.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="@dimen/dp_76"
android:height="@dimen/dp_30" />
<solid android:color="@color/color_fffc5454" />
<corners android:radius="@dimen/dp_700" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/background_vehicle_parts.xml
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="300dp" android:height="372dp"> <size android:width="300dp" android:height="372dp"/>
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffc5c5c5" /> <stroke android:width="1dp" android:color="#ffc5c5c5" />
<solid android:color="#4dffffff" /> <solid android:color="#4dffffff" />
<corners android:topLeftRadius="10dp" android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" /> <corners android:topLeftRadius="10dp" android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" />
</shape> </shape>
</item>
</layer-list>
app/src/main/res/drawable/drawable_bg_carried_truck_num.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="84dp"
android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#ff3684f9" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/drawable_bg_map_box.xml
View file @ b7114453
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#ffffffff" /> <solid android:color="#ffffffff" />
<corners android:radius="16dp" /> <corners android:radius="@dimen/dp_16" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/drawable_bg_matter_status.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="84dp" android:height="32dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/matter_text_color" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
app/src/main/res/drawable/drawable_bg_ready_status.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="84dp"
android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#ff1f971d" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
app/src/main/res/drawable/drawable_bg_violations_num.xml deleted 100644 → 0
View file @ 5c819d33
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:width="84dp"
android:height="32dp">
<shape android:shape="rectangle">
<solid android:color="#fffc5454" />
<corners android:radius="700dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/icon_vehicle_calibrate.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="@dimen/dp_24" android:height="@dimen/dp_24"/>
<solid android:color="@color/color_ff3f87f6"/>
<corners android:radius="@dimen/dp_12"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/icon_vehicle_uncalibrated.xml 0 → 100644
View file @ b7114453
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="@dimen/dp_24" android:height="@dimen/dp_24"/>
<solid android:color="@color/color_ffc2c2c2"/>
<corners android:radius="@dimen/dp_12"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/fragment_collect.xml
View file @ b7114453
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<RadioGroup <RadioGroup
android:id="@+id/collectRadioGroup" android:id="@+id/collectRadioGroup"
android:layout_width="300dp" android:layout_width="@dimen/dp_300"
android:layout_height="50dp" android:layout_height="@dimen/dp_50"
android:layout_marginStart="18dp" android:layout_marginStart="@dimen/dp_18"
android:layout_marginTop="15dp" android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/background_collect_tab_text" android:background="@drawable/background_collect_tab_text"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -42,18 +42,17 @@ ...@@ -42,18 +42,17 @@
android:id="@+id/collectTabContent" android:id="@+id/collectTabContent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="18dp" android:layout_marginTop="@dimen/dp_18"
app:layout_constraintTop_toBottomOf="@id/collectRadioGroup" app:layout_constraintTop_toBottomOf="@id/collectRadioGroup"
app:layout_constraintStart_toStartOf="@id/collectRadioGroup"/> app:layout_constraintStart_toStartOf="@id/collectRadioGroup"/>
<include <FrameLayout
android:id="@+id/noVideoMapWrapper" android:id="@+id/collectMapWrapper"
layout="@layout/layout_map_box" layout="@layout/layout_map_box"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="15dp" android:layout_marginStart="@dimen/dp_15"
android:layout_marginBottom="113dp" android:layout_marginEnd="@dimen/dp_18"
android:layout_marginEnd="18dp" app:layout_constraintBottom_toBottomOf="@id/collectTabContent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/collectRadioGroup" app:layout_constraintStart_toEndOf="@id/collectRadioGroup"
app:layout_constraintTop_toTopOf="@id/collectRadioGroup" /> app:layout_constraintTop_toTopOf="@id/collectRadioGroup" />
...@@ -61,30 +60,32 @@ ...@@ -61,30 +60,32 @@
android:id="@+id/collectTabToggleMore" android:id="@+id/collectTabToggleMore"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="18dp" android:layout_marginStart="@dimen/dp_18"
android:layout_marginBottom="15dp" android:layout_marginTop="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_15"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/background_more_btn" android:background="@drawable/background_more_btn"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/toggle_more" android:contentDescription="@string/toggle_more"
android:focusable="true" android:focusable="true"
app:layout_constraintTop_toBottomOf="@id/collectTabContent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="@id/collectTabContent" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/collectTabBtnToHome" android:id="@+id/collectTabBtnToHome"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="18dp" android:layout_marginStart="@dimen/dp_18"
android:drawableLeft="@drawable/background_btn_home_drawable" android:drawableLeft="@drawable/background_btn_home_drawable"
android:background="@drawable/background_collect_btn_back_to_home" android:background="@drawable/background_collect_btn_back_to_home"
android:textColor="@drawable/color_text_btn" android:textColor="@drawable/color_text_btn"
android:clickable="true" android:clickable="true"
android:paddingStart="54dp" android:paddingStart="@dimen/dp_54"
android:drawablePadding="5dp" android:drawablePadding="@dimen/dp_3"
android:contentDescription="@string/toggle_more" android:contentDescription="@string/toggle_more"
android:gravity="center_vertical" android:gravity="center_vertical"
android:focusable="true" android:focusable="true"
android:textSize="28sp" android:textSize="@dimen/sp_28"
android:text="@string/back_to_home" android:text="@string/back_to_home"
app:layout_constraintTop_toTopOf="@id/collectTabToggleMore" app:layout_constraintTop_toTopOf="@id/collectTabToggleMore"
app:layout_constraintStart_toEndOf="@id/collectTabToggleMore" app:layout_constraintStart_toEndOf="@id/collectTabToggleMore"
...@@ -94,30 +95,30 @@ ...@@ -94,30 +95,30 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_collect_tab_btn_upload" android:background="@drawable/background_collect_tab_btn_upload"
android:layout_marginEnd="18dp" android:layout_marginEnd="@dimen/dp_18"
android:layout_marginBottom="15dp"
android:gravity="center" android:gravity="center"
android:text="@string/upload" android:text="@string/upload"
android:textColor="@drawable/color_text_btn_1" android:textColor="@drawable/color_text_btn_1"
android:textSize="26sp" android:textSize="@dimen/sp_26"
android:focusable="true" android:focusable="true"
android:clickable="true" android:clickable="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="@id/collectTabToggleMore"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintBottom_toBottomOf="@id/collectTabToggleMore"
app:layout_constraintEnd_toEndOf="@id/collectMapWrapper"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/collectTabBtnToEnd" android:id="@+id/collectTabBtnToEnd"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_collect_tab_btn_end" android:background="@drawable/background_collect_tab_btn_end"
android:layout_marginEnd="100dp" android:layout_marginEnd="@dimen/dp_100"
android:layout_marginBottom="15dp"
android:gravity="center" android:gravity="center"
android:text="@string/end" android:text="@string/end"
android:textColor="@drawable/color_text_btn_1" android:textColor="@drawable/color_text_btn_1"
android:textSize="26sp" android:textSize="@dimen/sp_26"
android:focusable="true" android:focusable="true"
android:clickable="true" android:clickable="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="@id/collectTabToggleMore"
app:layout_constraintBottom_toBottomOf="@id/collectTabToggleMore"
app:layout_constraintEnd_toStartOf="@id/collectTabBtnToUpload"/> app:layout_constraintEnd_toStartOf="@id/collectTabBtnToUpload"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/collectTabBtnTap" android:id="@+id/collectTabBtnTap"
...@@ -125,14 +126,14 @@ ...@@ -125,14 +126,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_collect_tab_btn_tap" android:background="@drawable/background_collect_tab_btn_tap"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:layout_marginBottom="15dp"
android:gravity="center" android:gravity="center"
android:text="@string/tap" android:text="@string/tap"
android:textColor="@drawable/color_text_btn_2" android:textColor="@drawable/color_text_btn_2"
android:textSize="26sp" android:textSize="@dimen/sp_26"
android:focusable="true" android:focusable="true"
android:clickable="true" android:clickable="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="@id/collectTabToggleMore"
app:layout_constraintBottom_toBottomOf="@id/collectTabToggleMore"
app:layout_constraintEnd_toStartOf="@id/collectTabBtnToEnd"/> app:layout_constraintEnd_toStartOf="@id/collectTabBtnToEnd"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/collectTabBtnPause" android:id="@+id/collectTabBtnPause"
...@@ -140,13 +141,13 @@ ...@@ -140,13 +141,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_collect_tab_btn_pause" android:background="@drawable/background_collect_tab_btn_pause"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:layout_marginBottom="15dp"
android:gravity="center" android:gravity="center"
android:text="@string/pause" android:text="@string/pause"
android:textColor="@drawable/color_text_btn_2" android:textColor="@drawable/color_text_btn_2"
android:textSize="26sp" android:textSize="@dimen/sp_26"
android:focusable="true" android:focusable="true"
android:clickable="true" android:clickable="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="@id/collectTabToggleMore"
app:layout_constraintBottom_toBottomOf="@id/collectTabToggleMore"
app:layout_constraintEnd_toStartOf="@id/collectTabBtnTap"/> app:layout_constraintEnd_toStartOf="@id/collectTabBtnTap"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_collect_tab_collect.xml
View file @ b7114453
...@@ -9,23 +9,23 @@ ...@@ -9,23 +9,23 @@
<Spinner <Spinner
android:id="@+id/collectSpinnerRange" android:id="@+id/collectSpinnerRange"
android:background="@drawable/background_spinner" android:background="@drawable/background_spinner"
android:layout_width="300dp" android:layout_width="@dimen/dp_300"
android:layout_height="50dp" android:layout_height="@dimen/dp_54"
android:entries="@array/collectRange" android:entries="@array/collectRange"
android:spinnerMode="dropdown" android:spinnerMode="dropdown"
android:textSize="20sp" android:textSize="@dimen/sp_20"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="300dp" android:layout_width="@dimen/dp_300"
android:layout_height="50dp" android:layout_height="@dimen/dp_54"
android:layout_marginTop="24dp" android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/background_collect_tab_text"> android:background="@drawable/background_collect_spinner_text">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/collectMinus" android:id="@+id/collectMinus"
android:layout_width="22dp" android:layout_width="@dimen/dp_22"
android:layout_height="22dp" android:layout_height="@dimen/dp_22"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/dp_18"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@mipmap/icon_minus_light" android:src="@mipmap/icon_minus_light"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -35,10 +35,9 @@ ...@@ -35,10 +35,9 @@
android:id="@+id/collectInterval" android:id="@+id/collectInterval"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="16dp" android:layout_marginEnd="@dimen/dp_16"
android:text="1" android:textSize="@dimen/sp_24"
android:textSize="24sp"
android:gravity="center" android:gravity="center"
app:layout_constraintStart_toEndOf="@id/collectMinus" app:layout_constraintStart_toEndOf="@id/collectMinus"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -46,9 +45,9 @@ ...@@ -46,9 +45,9 @@
app:layout_constraintEnd_toStartOf="@id/collectAdd"/> app:layout_constraintEnd_toStartOf="@id/collectAdd"/>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/collectAdd" android:id="@+id/collectAdd"
android:layout_width="22dp" android:layout_width="@dimen/dp_22"
android:layout_height="22dp" android:layout_height="@dimen/dp_22"
android:layout_marginEnd="16dp" android:layout_marginEnd="@dimen/dp_18"
android:src="@mipmap/icon_add_light" android:src="@mipmap/icon_add_light"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -57,37 +56,95 @@ ...@@ -57,37 +56,95 @@
<Spinner <Spinner
android:id="@+id/collectSpinnerBoundary" android:id="@+id/collectSpinnerBoundary"
android:background="@drawable/background_spinner" android:background="@drawable/background_spinner"
android:layout_width="300dp" android:layout_width="@dimen/dp_300"
android:layout_height="50dp" android:layout_height="@dimen/dp_54"
android:layout_marginTop="24dp" android:layout_marginTop="@dimen/dp_24"
android:entries="@array/collectBoundary" android:entries="@array/collectBoundary"
android:textSize="20sp" android:textSize="@dimen/sp_20"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
tools:ignore="SmallSp" tools:ignore="SmallSp"
android:spinnerMode="dropdown" /> android:spinnerMode="dropdown" />
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="300dp" android:layout_width="@dimen/dp_300"
android:layout_height="372dp" android:layout_height="@dimen/dp_372"
android:layout_marginTop="24dp" android:layout_marginTop="@dimen/dp_24"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/background_vehicle_parts"> android:background="@drawable/background_vehicle_parts">
<Spinner <Spinner
android:id="@+id/collectSpinnerVehicleParts" android:id="@+id/collectSpinnerVehicleParts"
android:background="@drawable/background_spinner" android:background="@drawable/background_spinner"
android:layout_width="300dp" android:layout_width="@dimen/dp_300"
android:layout_height="50dp" android:layout_height="@dimen/dp_54"
android:entries="@array/collectVehicleParts" android:entries="@array/collectVehicleParts"
android:textSize="20sp" android:textSize="@dimen/sp_20"
android:textColor="@color/home_text_color" android:textColor="@color/home_text_color"
tools:ignore="SmallSp" tools:ignore="SmallSp"
android:spinnerMode="dropdown" /> android:spinnerMode="dropdown" />
<androidx.appcompat.widget.AppCompatImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/collectVehiclePart" android:layout_width="@dimen/dp_170"
android:layout_width="170dp" android:layout_height="@dimen/dp_246"
android:layout_height="250dp" android:layout_marginTop="@dimen/dp_32"
android:layout_marginTop="16dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:src="@mipmap/icon_vehicle_part_default" android:background="@mipmap/icon_vehicle_part_default">
/> <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/vehicleLeftFrontWheel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icon_vehicle_calibrate"
android:layout_marginTop="@dimen/dp_66"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/vehicleRightFrontWheel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icon_vehicle_uncalibrated"
android:layout_marginTop="@dimen/dp_66"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/vehicleFrontAxleCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icon_vehicle_uncalibrated"
android:layout_marginTop="@dimen/dp_78"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/vehicleGeometricCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icon_vehicle_uncalibrated"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/vehicleBackAxleCenter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_58"
app:srcCompat="@drawable/icon_vehicle_uncalibrated"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/vehicleLeftBackWheel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icon_vehicle_uncalibrated"
android:layout_marginBottom="@dimen/dp_45"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/vehicleRightBackWheel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/icon_vehicle_uncalibrated"
android:layout_marginBottom="@dimen/dp_45"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
app/src/main/res/layout/fragment_no_video_home.xml
View file @ b7114453
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@drawable/drawable_bg_matter_status" android:background="@drawable/background_status_bar_matter_status"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="@string/default_matter_type" android:text="@string/default_matter_type"
...@@ -57,12 +57,12 @@ ...@@ -57,12 +57,12 @@
app:layout_constraintTop_toBottomOf="@id/defaultDriverName" /> app:layout_constraintTop_toBottomOf="@id/defaultDriverName" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/readyType" android:id="@+id/statusBarReadyType"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="7dp" android:layout_marginStart="7dp"
android:background="@drawable/drawable_bg_ready_status" android:background="@drawable/background_status_bar_ready_status"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="@string/default_ready_type" android:text="@string/default_ready_type"
......
app/src/main/res/layout/layout_map_box.xml
View file @ b7114453
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:cardCornerRadius="@dimen/dp_12"> app:cardCornerRadius="@dimen/dp_16">
<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">
......
app/src/main/res/layout/layout_status_bar.xml
View file @ b7114453
...@@ -2,45 +2,46 @@ ...@@ -2,45 +2,46 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="36dp"> android:layout_height="@dimen/dp_36">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/mine_logo" android:id="@+id/statusBarLogo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:src="@mipmap/default_logo_light" android:src="@mipmap/default_logo_light"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView <View
android:id="@+id/statusBarDivider" android:id="@+id/statusBarDivider"
android:layout_width="1dp" android:layout_width="@dimen/dp_1"
android:layout_height="match_parent" android:layout_height="@dimen/dp_16"
android:layout_marginStart="10dp" android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="6dp" android:background="@drawable/drawable_divide_line"
android:layout_marginBottom="6dp"
android:src="@drawable/drawable_divide_line"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/mine_logo" app:layout_constraintStart_toEndOf="@id/statusBarLogo"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/statusBarName"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/myStatusName" android:id="@+id/statusBarName"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginStart="10dp" android:layout_marginStart="@dimen/dp_10"
android:maxEms="8" android:maxEms="8"
android:maxLength="8" android:maxLength="8"
android:text="矿卡车载管理系统" android:textStyle="bold"
android:text="@string/status_bar_name"
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/statusBarDivider" app:layout_constraintStart_toEndOf="@id/statusBarDivider"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/driverInfo" android:id="@+id/statusBarDriverInfo"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vehicleNumber" android:id="@+id/statusBarVehicleNumber"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -58,76 +59,84 @@ ...@@ -58,76 +59,84 @@
android:text="@string/default_vehicle_number" android:text="@string/default_vehicle_number"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/statusBarDriverName"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/driverName" android:id="@+id/statusBarDriverName"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="@dimen/dp_15"
android:maxEms="4" android:maxEms="4"
android:maxLength="4" android:maxLength="4"
android:text="@string/default_driver_name" android:text="@string/default_driver_name"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/vehicleNumber" app:layout_constraintStart_toEndOf="@id/statusBarVehicleNumber"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/matterType" android:id="@+id/statusBarMatterType"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginStart="@dimen/dp_15"
android:background="@drawable/drawable_bg_matter_status" android:background="@drawable/background_status_bar_matter_status"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="@string/default_matter_type" android:text="@string/default_matter_type"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/driverName" app:layout_constraintStart_toEndOf="@id/statusBarDriverName"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/statusBarReadyType"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/readyType" android:id="@+id/statusBarReadyType"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="@dimen/dp_7"
android:background="@drawable/drawable_bg_ready_status" android:background="@drawable/background_status_bar_ready_status"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="@string/default_ready_type" android:text="@string/default_ready_type"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/matterType" app:layout_constraintStart_toEndOf="@id/statusBarMatterType"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/statusBarCarriedTruckNum"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/carriedTruckNum" android:id="@+id/statusBarCarriedTruckNum"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="@dimen/dp_7"
android:background="@drawable/drawable_bg_carried_truck_num" android:background="@drawable/background_status_bar_carried_truck_num"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="16" android:text="16"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/readyType" app:layout_constraintStart_toEndOf="@id/statusBarReadyType"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/statusBarViolationsNum" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/violationsNum" android:id="@+id/statusBarViolationsNum"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:background="@drawable/drawable_bg_violations_num" android:background="@drawable/background_status_bar_violations_num"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="3" android:text="3"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/carriedTruckNum" app:layout_constraintStart_toEndOf="@id/statusBarCarriedTruckNum"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextClock <TextClock
......
app/src/main/res/values/colors.xml
View file @ b7114453
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<color name="color_99000000">#99000000</color> <color name="color_99000000">#99000000</color>
<color name="color_fffc5454">#fffc5454</color> <color name="color_fffc5454">#fffc5454</color>
<color name="color_ccfc5454">#ccfc5454</color> <color name="color_ccfc5454">#ccfc5454</color>
<color name="color_ff1f971d">#ff1f971d</color>
<color name="color_ff3684f9">#ff3684f9</color> <color name="color_ff3684f9">#ff3684f9</color>
<color name="color_993c3c3c">#993c3c3c</color> <color name="color_993c3c3c">#993c3c3c</color>
<color name="color_ff3f87f6">#ff3f87f6</color> <color name="color_ff3f87f6">#ff3f87f6</color>
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
<color name="color_ffececec">#ffececec</color> <color name="color_ffececec">#ffececec</color>
<color name="color_80ececec">#80ececec</color> <color name="color_80ececec">#80ececec</color>
<color name="color_ffcacaca">#ffcacaca</color> <color name="color_ffcacaca">#ffcacaca</color>
<color name="color_ffc2c2c2">#ffc2c2c2</color>
<color name="color_ff1c1c1c">#ff1c1c1c</color> <color name="color_ff1c1c1c">#ff1c1c1c</color>
<color name="color_4d3c3c3c">#4d3c3c3c</color> <color name="color_4d3c3c3c">#4d3c3c3c</color>
<color name="color_1a000000">#1a000000</color> <color name="color_1a000000">#1a000000</color>
......
app/src/main/res/values/dimens.xml
View file @ b7114453
...@@ -378,6 +378,7 @@ ...@@ -378,6 +378,7 @@
<dimen name="dp_360">360dp</dimen> <dimen name="dp_360">360dp</dimen>
<dimen name="dp_365">365dp</dimen> <dimen name="dp_365">365dp</dimen>
<dimen name="dp_370">370dp</dimen> <dimen name="dp_370">370dp</dimen>
<dimen name="dp_372">372dp</dimen>
<dimen name="dp_376">376dp</dimen> <dimen name="dp_376">376dp</dimen>
<dimen name="dp_400">400dp</dimen> <dimen name="dp_400">400dp</dimen>
<dimen name="dp_410">410dp</dimen> <dimen name="dp_410">410dp</dimen>
...@@ -393,6 +394,7 @@ ...@@ -393,6 +394,7 @@
<dimen name="dp_636">636dp</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_700">700dp</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_896">896dp</dimen>
...@@ -419,6 +421,7 @@ ...@@ -419,6 +421,7 @@
<dimen name="sp_23">23sp</dimen> <dimen name="sp_23">23sp</dimen>
<dimen name="sp_24">24sp</dimen> <dimen name="sp_24">24sp</dimen>
<dimen name="sp_25">25sp</dimen> <dimen name="sp_25">25sp</dimen>
<dimen name="sp_26">26sp</dimen>
<dimen name="sp_28">28sp</dimen> <dimen name="sp_28">28sp</dimen>
<dimen name="sp_30">30sp</dimen> <dimen name="sp_30">30sp</dimen>
<dimen name="sp_32">32sp</dimen> <dimen name="sp_32">32sp</dimen>
......
app/src/main/res/values/strings.xml
View file @ b7114453
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<string name="title_notifications">Notifications</string> <string name="title_notifications">Notifications</string>
<string name="map_box_public_key">pk.eyJ1IjoibWFybGxlciIsImEiOiJjbGVhMXlmeXIwdmRzM29vNmM4aDA1M202In0.tfLD_AOs1OPmg5rLERcbfw</string> <string name="map_box_public_key">pk.eyJ1IjoibWFybGxlciIsImEiOiJjbGVhMXlmeXIwdmRzM29vNmM4aDA1M202In0.tfLD_AOs1OPmg5rLERcbfw</string>
<string name="waytous_logo">waytous</string> <string name="waytous_logo">waytous</string>
<string name="status_bar_name">矿卡车载管理系统</string>
<string name="loading">Loading…</string> <string name="loading">Loading…</string>
<string name="text_progress">%1$d</string> <string name="text_progress">%1$d</string>
<string name="emergency">emergency</string> <string name="emergency">emergency</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