Skip to content

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

1.调整主页UI适配

parent ab6415ae
Show whitespace changes
Inline Side-by-side
Showing with 403 additions and 196 deletions
app/src/main/java/com/waytous/anticollision/ui/home/HomeFragment.kt
View file @ a13f3891
...@@ -4,7 +4,6 @@ import android.os.Bundle ...@@ -4,7 +4,6 @@ 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 android.widget.TextView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.blankj.utilcode.util.LogUtils import com.blankj.utilcode.util.LogUtils
...@@ -14,17 +13,14 @@ import com.mapbox.maps.MapView ...@@ -14,17 +13,14 @@ import com.mapbox.maps.MapView
import com.mapbox.maps.MapboxMap import com.mapbox.maps.MapboxMap
import com.mapbox.maps.Style import com.mapbox.maps.Style
import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData
import com.mapbox.maps.extension.style.layers.generated.lineLayer
import com.mapbox.maps.extension.style.layers.properties.generated.LineCap
import com.mapbox.maps.extension.style.layers.properties.generated.LineJoin
import com.mapbox.maps.extension.style.sources.TileSet
import com.mapbox.maps.extension.style.sources.generated.geoJsonSource import com.mapbox.maps.extension.style.sources.generated.geoJsonSource
import com.mapbox.maps.extension.style.style import com.mapbox.maps.extension.style.style
import com.mapbox.maps.plugin.Plugin import com.mapbox.maps.plugin.Plugin
import com.mapbox.maps.plugin.annotation.annotations
import com.mapbox.maps.plugin.annotation.generated.CircleAnnotationOptions
import com.mapbox.maps.plugin.annotation.generated.createCircleAnnotationManager
import com.mapbox.maps.plugin.delegates.listeners.OnMapLoadErrorListener import com.mapbox.maps.plugin.delegates.listeners.OnMapLoadErrorListener
import com.mapbox.maps.plugin.logo.LogoPlugin import com.mapbox.maps.plugin.logo.LogoPlugin
import com.mapbox.maps.renderer.RendererError
import com.mapbox.maps.renderer.RendererSetupErrorListener
import com.waytous.anticollision.databinding.FragmentHomeBinding import com.waytous.anticollision.databinding.FragmentHomeBinding
class HomeFragment : Fragment() { class HomeFragment : Fragment() {
...@@ -48,7 +44,9 @@ class HomeFragment : Fragment() { ...@@ -48,7 +44,9 @@ class HomeFragment : Fragment() {
val mapView: MapView = binding.mapView val mapView: MapView = binding.mapView
val logoPlugin = mapView.getPlugin<LogoPlugin>(Plugin.MAPBOX_LOGO_PLUGIN_ID) val logoPlugin = mapView.getPlugin<LogoPlugin>(Plugin.MAPBOX_LOGO_PLUGIN_ID)
logoPlugin?.enabled = false logoPlugin?.enabled = false
mapBox = mapView.getMapboxMap() mapBox = mapView.getMapboxMap().also {
logoPlugin?.enabled = false
}
mapBox.setCamera( mapBox.setCamera(
CameraOptions.Builder() CameraOptions.Builder()
.center( .center(
...@@ -67,19 +65,7 @@ class HomeFragment : Fragment() { ...@@ -67,19 +65,7 @@ class HomeFragment : Fragment() {
mapView.addRendererSetupErrorListener { mapView.addRendererSetupErrorListener {
error -> LogUtils.e("RendererSetupErrorListener:${error}") error -> LogUtils.e("RendererSetupErrorListener:${error}")
} }
mapView.getMapboxMap().loadStyle(style(Style.SATELLITE_STREETS){
+geoJsonSource(GEOJSON_SOURCE_ID)
{
url("asset://xian.geojson")
}
// +lineLayer("linelayer", GEOJSON_SOURCE_ID) {
// lineCap(LineCap.ROUND)
// lineJoin(LineJoin.ROUND)
// lineOpacity(0.7)
// lineWidth(8.0)
// lineColor("#888")
// }
})
return root return root
} }
......
app/src/main/java/com/waytous/anticollision/ui/video/VideoHomeFragment.kt
View file @ a13f3891
package com.waytous.anticollision.ui.video package com.waytous.anticollision.ui.video
import androidx.lifecycle.ViewModelProvider
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import android.text.SpannableString
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.databinding.BindingAdapter
import androidx.databinding.adapters.VideoViewBindingAdapter
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import com.mapbox.maps.MapView
import com.mapbox.maps.MapboxMap
import com.waytous.anticollision.R import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.FragmentVideoHomeBinding
import com.waytous.anticollision.utils.setTextSize
class VideoHomeFragment : Fragment() { class VideoHomeFragment : Fragment() {
private lateinit var binding:FragmentVideoHomeBinding
private lateinit var mapView:MapView
companion object { companion object {
fun newInstance() = VideoHomeFragment() fun newInstance() = VideoHomeFragment()
} }
private lateinit var viewModel: VideoHomeViewModel private val viewModel: VideoHomeViewModel by viewModels()
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View? {
return inflater.inflate(R.layout.fragment_video_home, container, false) binding = FragmentVideoHomeBinding.inflate(inflater, container, false)
context?:return binding.root
val templateString = getString(R.string.current_speed,36)
val spannableString = SpannableString(templateString)
binding.speedText.setTextSize(spannableString,templateString)
mapView = binding.root.findViewById(R.id.mapView)
return binding.root
} }
override fun onActivityCreated(savedInstanceState: Bundle?) { private fun initMapBox(){
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(this)[VideoHomeViewModel::class.java]
// TODO: Use the ViewModel
} }
} }
\ No newline at end of file
app/src/main/java/com/waytous/anticollision/utils/Extensions.kt
View file @ a13f3891
package com.waytous.anticollision.utils package com.waytous.anticollision.utils
import android.text.Spannable
import android.text.SpannableString
import android.text.style.AbsoluteSizeSpan
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
...@@ -34,6 +38,12 @@ enum class Error(val reason:String = "success") { ...@@ -34,6 +38,12 @@ enum class Error(val reason:String = "success") {
JT808DecodeError("jt808 codec decode error") JT808DecodeError("jt808 codec decode error")
} }
fun TextView.setTextSize(spannableString: SpannableString,content:String){
val absoluteSizeSpan = AbsoluteSizeSpan(40,true)
spannableString.setSpan(absoluteSizeSpan,0,content.indexOf("km"),Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
text = spannableString
}
fun AppCompatActivity.checkSelfPermissionCompat(permission: String) = fun AppCompatActivity.checkSelfPermissionCompat(permission: String) =
ActivityCompat.checkSelfPermission(this, permission) ActivityCompat.checkSelfPermission(this, permission)
...@@ -44,3 +54,4 @@ fun AppCompatActivity.requestPermissionsCompat(permissionsArray: Array<String>, ...@@ -44,3 +54,4 @@ fun AppCompatActivity.requestPermissionsCompat(permissionsArray: Array<String>,
requestCode: Int) { requestCode: Int) {
ActivityCompat.requestPermissions(this, permissionsArray, requestCode) ActivityCompat.requestPermissions(this, permissionsArray, requestCode)
} }
app/src/main/res/drawable-night/background_location_truck.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_map_location_truck_night"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_map_location_truck_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable-night/background_more_btn.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_more_night"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_more_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable-night/background_sos_btn.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_sos"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_sos_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable-night/background_zoom_in.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_map_zoom_in_night"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_map_zoom_in_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable-night/background_zoom_out.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_map_zoom_out_night"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_map_zoom_out_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_map_box.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="1dp" android:color="#33ffffff" />
<corners android:radius="16dp" />
</shape>
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_matter_status.xml
View file @ a13f3891
...@@ -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">
<stroke android:width="1dp" android:color="@color/matter_text_color" /> <stroke android:width="1dp" android:color="@color/matter_text_color" />
<corners android:topLeftRadius="350dp" android:topRightRadius="350dp" android:bottomLeftRadius="350dp" android:bottomRightRadius="350dp" /> <corners android:radius="700dp" />
</shape> </shape>
app/src/main/res/drawable-night/drawable_bg_ready_status.xml
View file @ a13f3891
...@@ -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="#ff1f971d" /> <solid android:color="#ff1f971d" />
<corners android:topLeftRadius="350dp" android:topRightRadius="350dp" android:bottomLeftRadius="350dp" android:bottomRightRadius="350dp" /> <corners android:radius="700dp" />
</shape> </shape>
app/src/main/res/drawable-night/drawable_bg_reminder_info.xml
View file @ a13f3891
<?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="106dp" android:height="44dp"> android:shape="rectangle">
<shape android:shape="rectangle"> <stroke
<stroke android:width="1dp" android:color="#ff3c3c3c" /> android:width="1dp"
<corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" /> android:color="#ff3c3c3c" />
</shape> <corners android:radius="10dp" />
</item> </shape>
</layer-list> \ No newline at end of file
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_speed_txt.xml
View file @ a13f3891
<?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"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="47dp" android:height="47dp"> <item android:width="96dp" android:height="96dp">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<stroke android:width="2dp" android:color="#ff3684f9" /> <stroke android:width="2dp" android:color="#ff3684f9" />
<corners android:topLeftRadius="30dp" android:topRightRadius="30dp" android:bottomLeftRadius="30dp" android:bottomRightRadius="30dp" /> <corners android:radius="48dp" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>
app/src/main/res/drawable-night/drawable_bg_violations_num.xml
View file @ a13f3891
...@@ -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="#fffc5454" /> <solid android:color="#fffc5454" />
<corners android:topLeftRadius="350dp" android:topRightRadius="350dp" android:bottomLeftRadius="350dp" android:bottomRightRadius="350dp" /> <corners android:radius="700dp" />
</shape> </shape>
app/src/main/res/drawable-night/drawable_loading_progress.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!--3个层的顺序即为显示时的叠加顺序-->
<!--背景色-->
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<solid android:color="#fff2f2f2" />
<corners android:radius="5dp" />
<item android:name="android:shadowColor">#17000000</item>
<item android:name="android:shadowDx">0</item>
<item android:name="android:shadowDy">1</item>
</shape>
</item>
<!--一级进度条的颜色，也可以直接替换成图片-->
<item android:id="@android:id/progress">
<clip>
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ff008aee" android:endColor="#ff0052d8" android:angle="180" />
<corners android:radius="5dp" />
<item android:name="android:shadowColor">#4d000000</item>
<item android:name="android:shadowDx">0</item>
<item android:name="android:shadowDy">1</item>
</shape>
</clip>
</item>
</layer-list>
app/src/main/res/drawable-night/zoom_divider_line.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ff3c3c3c"/>
</shape>
app/src/main/res/drawable/background_location_truck.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_map_location_truck"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_map_location_truck_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/background_more_btn.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_more_light">
<layer-list>
<item android:width="96dp" android:height="96dp">
<shape android:shape="rectangle">
<solid android:color="#ffffffff" />
<corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" />
</shape>
</item>
</layer-list>
</item>
<item android:state_pressed="true" android:drawable="@mipmap/icon_more_pressed">
<layer-list>
<item android:width="96dp" android:height="96dp">
<shape android:shape="rectangle">
<solid android:color="#ffffffff" />
<corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" />
</shape>
</item>
</layer-list>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable/background_sos_btn.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_sos"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_sos_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/background_zoom_in.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_map_zoom_in"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_map_zoom_in_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/background_zoom_out.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_map_zoom_out"/>
<item android:state_pressed="true" android:drawable="@mipmap/icon_map_zoom_out_pressed"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/drawable_bg_map_box.xml
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android"
<item android:width="465dp" android:height="318dp"> android:shape="rectangle">
<shape android:shape="rectangle"> <stroke android:width="1dp" android:color="#ffffffff" />
<stroke android:width="2dp" android:color="#33ffffff" /> <corners android:radius="16dp" />
<solid android:color="#ff000000" /> </shape>
<corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" /> \ No newline at end of file
</shape>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable/drawable_bg_matter_status.xml
View file @ a13f3891
...@@ -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">
<stroke android:width="1dp" android:color="@color/matter_text_color" /> <stroke android:width="1dp" android:color="@color/matter_text_color" />
<corners android:topLeftRadius="350dp" android:topRightRadius="350dp" android:bottomLeftRadius="350dp" android:bottomRightRadius="350dp" /> <corners android:radius="700dp" />
</shape> </shape>
app/src/main/res/drawable/drawable_bg_ready_status.xml
View file @ a13f3891
...@@ -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="#ff1f971d" /> <solid android:color="#ff1f971d" />
<corners android:topLeftRadius="350dp" android:topRightRadius="350dp" android:bottomLeftRadius="350dp" android:bottomRightRadius="350dp" /> <corners android:radius="700dp" />
</shape> </shape>
app/src/main/res/drawable/drawable_bg_reminder_info.xml
View file @ a13f3891
<?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="106dp" android:height="44dp"> android:shape="rectangle">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffc1c1c1" /> <stroke android:width="1dp" android:color="#ffc1c1c1" />
<corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" /> <corners android:radius="10dp" />
</shape> </shape>
</item> \ No newline at end of file
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/drawable_bg_speed_txt.xml
View file @ a13f3891
<?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"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="47dp" android:height="47dp"> <item android:width="96dp" android:height="96dp">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<stroke android:width="2dp" android:color="#ff3684f9" /> <stroke android:width="2dp" android:color="#ff3684f9" />
<corners android:topLeftRadius="30dp" android:topRightRadius="30dp" android:bottomLeftRadius="30dp" android:bottomRightRadius="30dp" /> <corners android:radius="48dp" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>
app/src/main/res/drawable/drawable_bg_violations_num.xml
View file @ a13f3891
...@@ -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="#fffc5454" /> <solid android:color="#fffc5454" />
<corners android:topLeftRadius="350dp" android:topRightRadius="350dp" android:bottomLeftRadius="350dp" android:bottomRightRadius="350dp" /> <corners android:radius="700dp" />
</shape> </shape>
app/src/main/res/drawable/drawable_scan_preview.xml deleted 100644 → 0
View file @ ab6415ae
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="103dp" android:height="103dp">
<shape android:shape="rectangle">
<solid android:color="#ffffffff" />
<corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>
</item>
<item android:width="61dp" android:height="66dp" android:top="17dp" android:left="19.5dp">
<shape android:shape="rectangle">
<solid android:color="#ffd8d8d8" />
<corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>
</item>
<item android:width="33dp" android:height="34dp" android:left="33.dp" android:top="1.5dp">
<shape android:shape="rectangle">
<solid android:color="#ffd8d8d8" />
<corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>
</item>
<item android:width="50dp" android:height="42dp" android:left="1.5dp" android:top="1.5dp">
<shape android:shape="rectangle">
<solid android:color="#ffff0000" />
</shape>
</item>
<item android:width="50dp" android:height="42dp" android:left="51.5dp" android:top="1.5dp">
<shape android:shape="rectangle">
<solid android:color="#ffffcb00" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/ic_home_black_24dp.xml deleted 100644 → 0
View file @ ab6415ae
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
</vector>
app/src/main/res/drawable/zoom_divider_line.xml 0 → 100644
View file @ a13f3891
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffcacaca"/>
</shape>
app/src/main/res/layout/activity_main.xml
View file @ a13f3891
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/myStatusBar" android:id="@+id/myStatusBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="18dp" android:layout_height="36dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
...@@ -17,16 +17,17 @@ ...@@ -17,16 +17,17 @@
android:id="@+id/mine_logo" android:id="@+id/mine_logo"
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="15dp"
android:layout_marginTop="4.5dp" android:layout_marginTop="8dp"
android:src="@mipmap/default_logo" 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" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/statusBarDivider"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5.5dp" android:layout_marginStart="10dp"
android:src="@drawable/drawable_divide_line" 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/mine_logo"
...@@ -37,13 +38,13 @@ ...@@ -37,13 +38,13 @@
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="10dp"
android:maxEms="8" android:maxEms="8"
android:maxLength="8" android:maxLength="8"
android:text="矿卡车载管理系统" android:text="矿卡车载管理系统"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/mine_logo" app:layout_constraintStart_toEndOf="@id/statusBarDivider"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
tools:ignore="SmallSp" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -63,86 +64,82 @@ ...@@ -63,86 +64,82 @@
android:text="KK-001" android:text="KK-001"
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" />
tools:ignore="SmallSp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/driverName" android:id="@+id/driverName"
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:maxEms="4" android:maxEms="4"
android:maxLength="4" android:maxLength="4"
android:text="上官云" android:text="上官云"
android:layout_marginStart="7dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/vehicleNumber" app:layout_constraintStart_toEndOf="@+id/vehicleNumber"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
tools:ignore="SmallSp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/matterType" android:id="@+id/matterType"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:background="@drawable/drawable_bg_matter_status" android:layout_width="76dp"
android:layout_width="38dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:background="@drawable/drawable_bg_matter_status"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="六上" android:text="六上"
android:layout_marginStart="7dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/driverName" app:layout_constraintStart_toEndOf="@+id/driverName"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
tools:ignore="SmallSp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/readyType" android:id="@+id/readyType"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:background="@drawable/drawable_bg_ready_status" android:layout_width="76dp"
android:layout_width="38dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@drawable/drawable_bg_ready_status"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="就绪" android:text="就绪"
android:layout_marginStart="3.5dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/matterType"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:ignore="SmallSp" /> app:layout_constraintStart_toEndOf="@id/matterType"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/carriedTruckNum" android:id="@+id/carriedTruckNum"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:background="@drawable/drawable_bg_carried_truck_num" android:layout_width="76dp"
android:layout_width="38dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@drawable/drawable_bg_carried_truck_num"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="16" android:text="16"
android:layout_marginStart="3.5dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/matterType" app:layout_constraintStart_toEndOf="@+id/readyType"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
tools:ignore="SmallSp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/violationsNum" android:id="@+id/violationsNum"
style="@style/StatusBarTextStyle" style="@style/StatusBarTextStyle"
android:background="@drawable/drawable_bg_violations_num" android:layout_width="76dp"
android:layout_width="38dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:background="@drawable/drawable_bg_violations_num"
android:maxEms="2" android:maxEms="2"
android:maxLength="2" android:maxLength="2"
android:text="3" android:text="3"
android:layout_marginStart="3.5dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/matterType" app:layout_constraintStart_toEndOf="@+id/carriedTruckNum"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
tools:ignore="SmallSp" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<TextClock <TextClock
android:id="@+id/systemTimeStamp" android:id="@+id/systemTimeStamp"
style="@style/StatusBarTextStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/StatusBarTextStyle" android:layout_marginEnd="15dp"
android:layout_marginEnd="8dp"
android:format24Hour="yyyy.MM.dd HH:mm:ss"
android:format12Hour="yyyy.MM.dd hh:mm:ss" android:format12Hour="yyyy.MM.dd hh:mm:ss"
android:format24Hour="yyyy.MM.dd HH:mm:ss"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -154,6 +151,7 @@ ...@@ -154,6 +151,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:defaultNavHost="true" app:defaultNavHost="true"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/myStatusBar" app:layout_constraintTop_toBottomOf="@+id/myStatusBar"
......
app/src/main/res/layout/fragment_video_home.xml
View file @ a13f3891
<?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.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".ui.video.VideoHomeFragment"> tools:context=".ui.video.VideoHomeFragment">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/workingState" android:id="@+id/workingAvatar"
android:layout_width="48dp" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="wrap_content"
android:src="@mipmap/normal_status" android:layout_marginStart="12dp"
android:adjustViewBounds="true"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:layout_marginStart="8dp" android:adjustViewBounds="true"
android:src="@mipmap/icon_avatar_normal"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/speedText" android:id="@+id/speedText"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_marginStart="12dp"
android:background="@drawable/drawable_bg_speed_txt" android:background="@drawable/drawable_bg_speed_txt"
android:layout_width="48dp"
android:layout_height="48dp"
android:textColor="@color/home_text_color"
android:gravity="center" android:gravity="center"
android:layout_marginStart="6dp" android:text="@string/current_speed"
app:layout_constraintStart_toEndOf="@id/workingState" android:textColor="@color/home_text_color"
app:layout_constraintTop_toTopOf="@id/workingState"/> android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/workingAvatar"
app:layout_constraintTop_toTopOf="@id/workingAvatar"
tools:ignore="SmallSp" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/receivedCommTime" android:id="@+id/receivedCommTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="17dp" android:layout_height="36dp"
android:textColor="@color/home_text_color" android:layout_marginStart="18dp"
android:layout_marginTop="6dp"
android:gravity="center" android:gravity="center"
android:layout_marginStart="9dp"
android:layout_marginTop="3dp"
android:text="2023/3/10 08:12:34" android:text="2023/3/10 08:12:34"
android:textSize="12sp" android:textColor="@color/home_text_color"
android:textSize="24sp"
app:layout_constraintStart_toEndOf="@id/speedText" app:layout_constraintStart_toEndOf="@id/speedText"
app:layout_constraintTop_toTopOf="@id/speedText"/> app:layout_constraintTop_toTopOf="@id/speedText" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/loadingArea" android:id="@+id/loadingArea"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="21dp" android:layout_height="40dp"
android:textColor="@color/home_text_color" android:layout_marginTop="12dp"
android:gravity="center" android:gravity="center"
android:layout_marginTop="3.5dp"
android:text="装载区01" android:text="装载区01"
android:textSize="15sp" android:textColor="@color/home_text_color"
android:textSize="30sp"
app:layout_constraintStart_toStartOf="@id/receivedCommTime" app:layout_constraintStart_toStartOf="@id/receivedCommTime"
app:layout_constraintTop_toBottomOf="@id/receivedCommTime"/> app:layout_constraintTop_toBottomOf="@id/receivedCommTime" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/toFlag" android:id="@+id/toFlag"
android:layout_width="10sp" android:layout_width="wrap_content"
android:layout_height="5dp" android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:gravity="center" android:gravity="center"
android:layout_marginTop="8dp" android:src="@mipmap/icon_arrow_light"
android:layout_marginStart="8dp" app:layout_constraintBottom_toBottomOf="@id/loadingArea"
android:textSize="15sp"
app:layout_constraintStart_toEndOf="@id/loadingArea" app:layout_constraintStart_toEndOf="@id/loadingArea"
app:layout_constraintTop_toTopOf="@id/loadingArea"/> app:layout_constraintTop_toTopOf="@id/loadingArea"/>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/unloadingArea" android:id="@+id/unloadingArea"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="21dp" android:layout_height="40dp"
android:textColor="@color/home_text_color" android:layout_marginStart="16dp"
android:gravity="center" android:gravity="center"
android:layout_marginStart="8dp"
android:text="卸载区01" android:text="卸载区01"
android:textSize="15sp" android:textColor="@color/home_text_color"
android:textSize="30sp"
app:layout_constraintStart_toEndOf="@id/toFlag" app:layout_constraintStart_toEndOf="@id/toFlag"
app:layout_constraintTop_toTopOf="@id/loadingArea"/> app:layout_constraintTop_toTopOf="@id/loadingArea" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/reminderInfoText" android:id="@+id/reminderInfoText"
android:layout_width="106dp"
android:layout_height="44dp"
style="@style/ReminderInfoTextStyle" style="@style/ReminderInfoTextStyle"
android:layout_width="212dp"
android:layout_height="88dp"
android:layout_marginStart="24dp"
android:text="当前无提示信息" android:text="当前无提示信息"
app:layout_constraintStart_toEndOf="@id/unloadingArea" app:layout_constraintStart_toEndOf="@id/unloadingArea"
app:layout_constraintTop_toTopOf="@id/receivedCommTime" app:layout_constraintTop_toTopOf="@id/receivedCommTime"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<include
android:id="@+id/videoHomeMapLayout"
layout="@layout/layout_map_box"
android:layout_width="758dp"
android:layout_height="508dp"
android:layout_marginStart="12dp"
android:layout_marginTop="18dp"
android:layout_marginBottom="14dp"
app:layout_constraintBottom_toTopOf="@id/toggleMore"
app:layout_constraintEnd_toEndOf="@id/reminderInfoText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/workingAvatar"
/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/toggleMore"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginBottom="15dp"
android:adjustViewBounds="true"
android:background="@drawable/background_more_btn"
android:clickable="true"
android:focusable="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/layout_map_box.xml
View file @ a13f3891
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
<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"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:mapbox="http://schemas.android.com/apk/res-auto" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="0dp"
android:layout_height="match_parent"
android:background="@drawable/drawable_bg_map_box" android:background="@drawable/drawable_bg_map_box"
tools:context=".ui.MainActivity"> tools:context=".ui.MainActivity">
...@@ -16,13 +15,87 @@ ...@@ -16,13 +15,87 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
mapbox:mapbox_resourcesAccessToken="@string/map_box_public_key" /> app:mapbox_resourcesAccessToken="@string/map_box_public_key"
app:mapbox_scaleBarBorderWidth="0dp"
app:mapbox_scaleBarGravity="bottom|end"
app:mapbox_scaleBarHeight="2dp"
app:mapbox_scaleBarIsMetricUnits="true"
app:mapbox_scaleBarMarginBottom="15dp"
app:mapbox_scaleBarMarginRight="12dp"
app:mapbox_scaleBarRatio="0.1"
app:mapbox_scaleBarTextBarMargin="10dp"
app:mapbox_scaleBarTextBorderWidth="5dp"
app:mapbox_scaleBarTextColor="@color/home_text_color"
app:mapbox_scaleBarTextSize="9sp"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/sos"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginTop="12dp"
android:adjustViewBounds="true"
android:contentDescription="@string/sos"
android:src="@drawable/background_sos_btn"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/emergency"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/emergency_stop" android:layout_marginStart="11dp"
android:layout_marginStart="10.5dp" android:layout_marginBottom="10dp"
android:layout_marginBottom="11.5dp" android:adjustViewBounds="true"
android:contentDescription="@string/emergency"
android:src="@mipmap/icon_driving_state_emergency"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/zoomLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:layout_marginEnd="12dp"
android:orientation="vertical"
app:divider="@drawable/zoom_divider_line"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/zoomOut"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/zoom_out"
android:src="@drawable/background_zoom_out" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/zoomIn"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/zoom_in"
android:src="@drawable/background_zoom_in" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/locationTruck"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:adjustViewBounds="true"
android:contentDescription="@string/location_truck"
android:src="@drawable/background_location_truck"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/toggleSafetyRange"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:adjustViewBounds="true"
android:contentDescription="@string/toggle_safety_range"
android:src="@mipmap/icon_map_enable_safety_range_light"
app:layout_constraintEnd_toEndOf="@id/locationTruck"
app:layout_constraintStart_toStartOf="@id/locationTruck"
app:layout_constraintTop_toBottomOf="@id/locationTruck" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/navigation/mobile_navigation.xml
View file @ a13f3891
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/mobile_navigation" android:id="@+id/mobile_navigation"
app:startDestination="@id/videoHomeFragment"> app:startDestination="@id/navigation_video_Home">
<fragment <fragment
android:id="@+id/navigation_home" android:id="@+id/navigation_home"
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:label="@string/title_home" android:label="@string/title_home"
tools:layout="@layout/fragment_home" /> tools:layout="@layout/fragment_home" />
<fragment <fragment
android:id="@+id/videoHomeFragment" android:id="@+id/navigation_video_Home"
android:name="com.waytous.anticollision.ui.video.VideoHomeFragment" android:name="com.waytous.anticollision.ui.video.VideoHomeFragment"
android:label="fragment_video_home" android:label="fragment_video_home"
tools:layout="@layout/fragment_video_home" /> tools:layout="@layout/fragment_video_home" />
......
app/src/main/res/values-night/themes.xml
View file @ a13f3891
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!-- 启动页 --> <!-- 启动页 -->
<style name="SplashTheme" parent="Theme.HTAnticollision"> <style name="SplashTheme" parent="Theme.HTAnticollision">
<!--给window窗口设置背景图--> <!--给window窗口设置背景图-->
<item name="android:windowBackground">@drawable/background_main</item> <item name="android:windowBackground">@mipmap/background_main_night</item>
<!--设置顶部状态栏是否为透明--> <!--设置顶部状态栏是否为透明-->
<item name="android:windowTranslucentStatus">false</item> <item name="android:windowTranslucentStatus">false</item>
......
app/src/main/res/values/strings.xml
View file @ a13f3891
...@@ -7,4 +7,12 @@ ...@@ -7,4 +7,12 @@
<string name="waytous_logo">waytous</string> <string name="waytous_logo">waytous</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="sos">sos</string>
<string name="zoom_in">zoomIn</string>
<string name="zoom_out">zoomOut</string>
<string name="location_truck">location truck</string>
<string name="toggle_safety_range">toggle safety range</string>
<string name="zoom_divider_line">zoom divider line</string>
<string name="current_speed">%1d\nkm/h</string>
</resources> </resources>
\ No newline at end of file
app/src/main/res/values/themes.xml
View file @ a13f3891
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<!-- 启动页 --> <!-- 启动页 -->
<style name="SplashTheme" parent="Theme.HTAnticollision"> <style name="SplashTheme" parent="Theme.HTAnticollision">
<!--给window窗口设置背景图--> <!--给window窗口设置背景图-->
<item name="android:windowBackground">@drawable/background_main</item> <item name="android:windowBackground">@mipmap/background_main_light</item>
<!--设置顶部状态栏是否为透明--> <!--设置顶部状态栏是否为透明-->
<item name="android:windowTranslucentStatus">false</item> <item name="android:windowTranslucentStatus">false</item>
...@@ -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">10sp</item> <item name="android:textSize">20sp</item>
</style> </style>
<style name="ReminderInfoTextStyle" parent="Theme.HTAnticollision"> <style name="ReminderInfoTextStyle" parent="Theme.HTAnticollision">
<item name="background">@drawable/drawable_bg_reminder_info</item> <item name="background">@drawable/drawable_bg_reminder_info</item>
...@@ -44,6 +44,6 @@ ...@@ -44,6 +44,6 @@
<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">10sp</item> <item name="android:textSize">20sp</item>
</style> </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