Skip to content

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

1.增加工作状态popupwindow

parent a8206caa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 282 additions and 131 deletions
app/build.gradle
View file @ 5eeab42d
...@@ -56,11 +56,11 @@ dependencies { ...@@ -56,11 +56,11 @@ dependencies {
implementation 'io.netty:netty-buffer:4.1.87.Final' implementation 'io.netty:netty-buffer:4.1.87.Final'
implementation 'io.github.toggery:jt808-codec:2.0.3' implementation 'io.github.toggery:jt808-codec:2.0.3'
implementation 'com.blankj:utilcodex:1.31.1' implementation 'com.blankj:utilcodex:1.31.1'
implementation 'com.blankj:utilcodex:1.31.1'
implementation 'org.jetbrains.kotlin:kotlin-reflect:1.7.20' implementation 'org.jetbrains.kotlin:kotlin-reflect:1.7.20'
implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2' implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
implementation 'com.github.mik3y:usb-serial-for-android:3.5.1' implementation 'com.github.mik3y:usb-serial-for-android:3.5.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'io.github.razerdp:BasePopup:3.2.1'
// implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1' // implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1'
implementation 'com.google.android.exoplayer:exoplayer:2.17.1' implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
......
app/src/main/java/com/waytous/anticollision/ui/MainActivity.kt
View file @ 5eeab42d
...@@ -17,12 +17,13 @@ class MainActivity : AppCompatActivity() { ...@@ -17,12 +17,13 @@ class MainActivity : AppCompatActivity() {
//设置下布局向上移动状态栏的高度 //设置下布局向上移动状态栏的高度
BarUtils.setStatusBarColor(this, ColorUtils.getColor(R.color.status_bg_color)) BarUtils.setStatusBarColor(this, ColorUtils.getColor(R.color.status_bg_color))
//设置隐藏虚拟按键 //设置隐藏虚拟按键
BarUtils.setNavBarVisibility(this,false); BarUtils.setNavBarVisibility(this,false)
BarUtils.setStatusBarVisibility(this,false)
supportActionBar?.hide() supportActionBar?.hide()
// ImmersionBar.with(this) ImmersionBar.with(this)
// .statusBarAlpha(0.0f) .statusBarAlpha(0.0f)
// .statusBarDarkFont(true) .statusBarDarkFont(true)
// .fitsSystemWindows(true) .fitsSystemWindows(true)
binding = ActivityMainBinding.inflate(layoutInflater) binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
} }
......
app/src/main/java/com/waytous/anticollision/ui/video/VideoHomeFragment.kt
View file @ 5eeab42d
...@@ -5,6 +5,7 @@ import android.graphics.BitmapFactory ...@@ -5,6 +5,7 @@ import android.graphics.BitmapFactory
import android.net.Uri import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.text.SpannableString import android.text.SpannableString
import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
...@@ -46,6 +47,7 @@ import com.mapbox.maps.plugin.logo.logo ...@@ -46,6 +47,7 @@ import com.mapbox.maps.plugin.logo.logo
import com.mapbox.maps.viewannotation.ViewAnnotationManager import com.mapbox.maps.viewannotation.ViewAnnotationManager
import com.waytous.anticollision.R import com.waytous.anticollision.R
import com.waytous.anticollision.databinding.FragmentVideoHomeBinding import com.waytous.anticollision.databinding.FragmentVideoHomeBinding
import com.waytous.anticollision.ui.view.WorkStatusEditPopup
import com.waytous.anticollision.utils.getBitmapFromVectorDrawable import com.waytous.anticollision.utils.getBitmapFromVectorDrawable
import com.waytous.anticollision.utils.setTextSize import com.waytous.anticollision.utils.setTextSize
import java.io.File import java.io.File
...@@ -64,6 +66,12 @@ class VideoHomeFragment : Fragment() { ...@@ -64,6 +66,12 @@ class VideoHomeFragment : Fragment() {
private lateinit var pointAnnotation: PointAnnotation private lateinit var pointAnnotation: PointAnnotation
private var player1: ExoPlayer? = null
private var player2: ExoPlayer? = null
private lateinit var workStatusEditPopup: WorkStatusEditPopup
companion object { companion object {
fun newInstance() = VideoHomeFragment() fun newInstance() = VideoHomeFragment()
...@@ -83,8 +91,16 @@ class VideoHomeFragment : Fragment() { ...@@ -83,8 +91,16 @@ class VideoHomeFragment : Fragment() {
): View? { ): View? {
binding = FragmentVideoHomeBinding.inflate(inflater, container, false) binding = FragmentVideoHomeBinding.inflate(inflater, container, false)
context ?: return binding.root context ?: return binding.root
workStatusEditPopup = WorkStatusEditPopup(context).also {
it.setOutSideDismiss(true)
it.popupGravity = Gravity.TOP or Gravity.CENTER
it.setBackgroundColor(R.color.color_99000000)
}
val templateString = getString(R.string.current_speed, 36) val templateString = getString(R.string.current_speed, 36)
val spannableString = SpannableString(templateString) val spannableString = SpannableString(templateString)
binding.workStatusEdit.setOnClickListener {
workStatusEditPopup.showPopupWindow(binding.currentWorkStatusLayout)
}
binding.speedText.setTextSize(spannableString, templateString) binding.speedText.setTextSize(spannableString, templateString)
mapView = binding.root.findViewById<MapView?>(R.id.mapView).also { mapView = binding.root.findViewById<MapView?>(R.id.mapView).also {
it.logo.enabled = false it.logo.enabled = false
...@@ -100,7 +116,7 @@ class VideoHomeFragment : Fragment() { ...@@ -100,7 +116,7 @@ class VideoHomeFragment : Fragment() {
val locationComponentPlugin = mapView.location val locationComponentPlugin = mapView.location
mapView.getMapboxMap().loadStyle( mapView.getMapboxMap().loadStyle(
style(styleUri = Style.SATELLITE_STREETS) { style(styleUri = Style.MAPBOX_STREETS) {
+geoJsonSource(GEOJSON_SOURCE_ID) { +geoJsonSource(GEOJSON_SOURCE_ID) {
url("asset://xian.geojson") url("asset://xian.geojson")
} }
...@@ -166,7 +182,7 @@ class VideoHomeFragment : Fragment() { ...@@ -166,7 +182,7 @@ class VideoHomeFragment : Fragment() {
private fun initPlayer() { private fun initPlayer() {
val uri1 = Uri.fromFile(File(activity!!.filesDir, "飞书20230420-181456.mp4")) val uri1 = Uri.fromFile(File(activity!!.filesDir, "飞书20230420-181456.mp4"))
val player1:ExoPlayer? = activity?.let { player1 = activity?.let {
ExoPlayer.Builder(it).build().apply { ExoPlayer.Builder(it).build().apply {
setMediaItem(MediaItem.Builder().setUri(uri1).build()) setMediaItem(MediaItem.Builder().setUri(uri1).build())
} }
...@@ -174,7 +190,7 @@ class VideoHomeFragment : Fragment() { ...@@ -174,7 +190,7 @@ class VideoHomeFragment : Fragment() {
binding.videoView1.player = player1 binding.videoView1.player = player1
player1?.prepare() player1?.prepare()
val uri2 = Uri.fromFile(File(activity!!.filesDir, "飞书20230420-181512.mp4")) val uri2 = Uri.fromFile(File(activity!!.filesDir, "飞书20230420-181512.mp4"))
val player2:ExoPlayer? = activity?.let { player2 = activity?.let {
ExoPlayer.Builder(it).build().apply { ExoPlayer.Builder(it).build().apply {
setMediaItem(MediaItem.Builder().setUri(uri2).build()) setMediaItem(MediaItem.Builder().setUri(uri2).build())
} }
...@@ -186,6 +202,8 @@ class VideoHomeFragment : Fragment() { ...@@ -186,6 +202,8 @@ class VideoHomeFragment : Fragment() {
} }
override fun onDestroyView() { override fun onDestroyView() {
player1?.release()
player2?.release()
super.onDestroyView() super.onDestroyView()
} }
} }
\ No newline at end of file
app/src/main/java/com/waytous/anticollision/ui/view/WorkStatusEditPopup.kt 0 → 100644
View file @ 5eeab42d
package com.waytous.anticollision.ui.view
import android.content.Context
import com.waytous.anticollision.R
import razerdp.basepopup.BasePopupWindow
class WorkStatusEditPopup(context: Context?) : BasePopupWindow(context) {
init {
contentView = createPopupById(R.layout.popup_work_status_edit)
}
}
\ No newline at end of file
app/src/main/res/drawable-night/background_more_btn.xml
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_more_night"/> <item android:state_pressed="false">
<item android:state_pressed="true" android:drawable="@mipmap/icon_more_pressed"/> <layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
<corners android:radius="16dp" />
</shape>
</item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_more_night" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list>
</item>
<item android:state_pressed="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
<corners android:radius="16dp" />
</shape>
</item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_more_pressed" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list>
</item>
</selector> </selector>
\ No newline at end of file
app/src/main/res/drawable-night/background_report_btn.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
<corners android:radius="16dp" />
</shape>
</item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_submit_night" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list>
</item>
<item android:state_pressed="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
<corners android:radius="16dp" />
</shape>
</item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_submit_pressed" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable-night/background_work_status_edit_btn.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp" android:color="#333684f9" />
<corners android:radius="10dp" />
</shape>
app/src/main/res/drawable-night/background_work_status_edit_popup.xml 0 → 100644
View file @ 5eeab42d
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="609dp"
android:height="282dp"
android:viewportWidth="609"
android:viewportHeight="282">
<path
android:pathData="M0,14A14,14 0,0 1,14 0H595a14,14 0,0 1,14 14V258a14,14 0,0 1,-14 14H14A14,14 0,0 1,0 258Z"
android:fillColor="#1c1c1c"/>
<path
android:pathData="M304.57,282l-8.18,-10h16.37Z"
android:fillColor="#1d1d1d"/>
</vector>
app/src/main/res/drawable-night/background_work_status_item.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:width="1dp" android:color="#ffececec" />
<corners android:radius="10dp" />
</shape>
app/src/main/res/drawable-night/background_working_status.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#993c3c3c" />
<corners android:radius="16dp" />
</shape>
\ No newline at end of file
app/src/main/res/drawable-night/drawable_bg_map_box.xml
View file @ 5eeab42d
<?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="1dp" android:color="#33ffffff" /> <stroke android:width="3dp" android:color="#33ffffff" />
<corners android:radius="16dp" /> <corners android:radius="16dp" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable-v23/drawable_bg_reminder_info.xml deleted 100644 → 0
View file @ a8206caa
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="106dp" android:height="44dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffc1c1c1" />
<corners android:topLeftRadius="5dp" android:topRightRadius="5dp" android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable-v23/drawable_divide_line.xml deleted 100644 → 0
View file @ a8206caa
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="1dp" android:height="8dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffcfcfcf" />
<corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable-v23/drawable_scan_preview.xml deleted 100644 → 0
View file @ a8206caa
<?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-v24/drawable_divide_line.xml deleted 100644 → 0
View file @ a8206caa
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="1dp" android:height="8dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="#ffcfcfcf" />
<corners android:topLeftRadius="0dp" android:topRightRadius="0dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
</shape>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted 100644 → 0
View file @ a8206caa
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
\ No newline at end of file
app/src/main/res/drawable/background_more_btn.xml
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@mipmap/icon_more_light"> <item android:state_pressed="false">
<layer-list> <layer-list>
<item android:width="96dp" android:height="96dp"> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#ffffffff" /> <solid android:color="#ffffff" />
<corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" /> <corners android:radius="16dp" />
</shape> </shape>
</item> </item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_more_light" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list> </layer-list>
</item> </item>
<item android:state_pressed="true" android:drawable="@mipmap/icon_more_pressed"> <item android:state_pressed="true">
<layer-list> <layer-list>
<item android:width="96dp" android:height="96dp"> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#ffffffff" /> <solid android:color="#ffffff" />
<corners android:topLeftRadius="8dp" android:topRightRadius="8dp" android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" /> <corners android:radius="16dp" />
</shape> </shape>
</item> </item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_more_pressed" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list> </layer-list>
</item> </item>
</selector> </selector>
\ No newline at end of file
app/src/main/res/drawable/background_report_btn.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
<corners android:radius="16dp" />
</shape>
</item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_submit_light" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list>
</item>
<item android:state_pressed="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#ffffff" />
<corners android:radius="16dp" />
</shape>
</item>
<item android:bottom="25dp" android:drawable="@mipmap/icon_submit_pressed" android:left="25dp" android:right="25dp" android:top="25dp" />
</layer-list>
</item>
</selector>
\ No newline at end of file
app/src/main/res/drawable/background_work_status_edit_btn.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp" android:color="#333684f9" />
<corners android:radius="10dp" />
</shape>
app/src/main/res/drawable/background_work_status_edit_popup.xml 0 → 100644
View file @ 5eeab42d
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="609dp"
android:height="282dp"
android:viewportWidth="609"
android:viewportHeight="282">
<path
android:pathData="M0,14A14,14 0,0 1,14 0H595a14,14 0,0 1,14 14V258a14,14 0,0 1,-14 14H14A14,14 0,0 1,0 258Z"
android:fillColor="#fffefe"/>
<path
android:pathData="M304.57,282l-8.18,-10h16.37Z"
android:fillColor="#fffefd"/>
</vector>
app/src/main/res/drawable/background_work_status_item.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:width="1dp" android:color="#ffececec" />
<corners android:radius="10dp" />
</shape>
app/src/main/res/drawable/background_working_status.xml 0 → 100644
View file @ 5eeab42d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#ffffffff" />
<corners android:radius="16dp" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/drawable_bg_map_box.xml
View file @ 5eeab42d
<?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="1dp" android:color="#ffffffff" /> <stroke android:width="3dp" android:color="#ffffffff" />
<corners android:radius="16dp" /> <corners android:radius="16dp" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @ 5eeab42d
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@mipmap/background_main_light">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/myStatusBar" android:id="@+id/myStatusBar"
...@@ -26,8 +27,10 @@ ...@@ -26,8 +27,10 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/statusBarDivider" android:id="@+id/statusBarDivider"
android:layout_width="1dp" android:layout_width="1dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
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"
...@@ -151,10 +154,10 @@ ...@@ -151,10 +154,10 @@
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:layout_constraintBottom_toBottomOf="parent"
app:navGraph="@navigation/mobile_navigation" /> app:navGraph="@navigation/mobile_navigation" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_video_home.xml
View file @ 5eeab42d
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
android:src="@mipmap/icon_arrow_light" android:src="@mipmap/icon_arrow_light"
app:layout_constraintBottom_toBottomOf="@id/loadingArea" app:layout_constraintBottom_toBottomOf="@id/loadingArea"
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"
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
android:layout_width="212dp" android:layout_width="212dp"
android:layout_height="88dp" android:layout_height="88dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:background="@drawable/drawable_bg_reminder_info"
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"
...@@ -95,16 +96,16 @@ ...@@ -95,16 +96,16 @@
<include <include
android:id="@+id/videoHomeMapLayout" android:id="@+id/videoHomeMapLayout"
layout="@layout/layout_map_box" layout="@layout/layout_map_box"
android:layout_width="758dp" android:layout_width="0dp"
android:layout_height="508dp" android:layout_height="0dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="18dp" android:layout_marginTop="18dp"
android:layout_marginBottom="14dp" android:layout_marginBottom="14dp"
app:layout_constraintBottom_toTopOf="@id/toggleMore" app:layout_constraintBottom_toTopOf="@id/toggleMore"
app:layout_constraintEnd_toEndOf="@id/reminderInfoText" app:layout_constraintEnd_toEndOf="@id/reminderInfoText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/workingAvatar" app:layout_constraintTop_toBottomOf="@id/workingAvatar" />
/>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/toggleMore" android:id="@+id/toggleMore"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -114,30 +115,90 @@ ...@@ -114,30 +115,90 @@
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:focusable="true"
android:contentDescription="@string/toggle_more" android:contentDescription="@string/toggle_more"
android:focusable="true"
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/currentWorkStatusLayout"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:background="@drawable/background_working_status"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/toggleMore"
app:layout_constraintEnd_toStartOf="@id/guideline2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/toggleMore">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/currentWorkStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="9dp"
android:layout_marginTop="7dp"
android:layout_marginBottom="7dp"
android:drawableStart="@mipmap/icon_current_status_empty_light"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:text="@string/work_status_empty"
android:textColor="@color/home_text_color"
android:textSize="28sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/workStatusEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:background="@drawable/background_work_status_edit_btn"
android:clickable="true"
android:focusable="true"
android:paddingStart="10dp"
android:paddingTop="4dp"
android:paddingEnd="10dp"
android:paddingBottom="4dp"
android:text="@string/work_status_edit"
android:textColor="#ff3684f9"
android:textSize="24sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/reportStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/background_report_btn"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/report_status"
app:layout_constraintBottom_toBottomOf="@id/toggleMore"
app:layout_constraintEnd_toEndOf="@id/reminderInfoText"
app:layout_constraintTop_toTopOf="@id/toggleMore" />
<com.google.android.exoplayer2.ui.StyledPlayerView <com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/videoView1" android:id="@+id/videoView1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:use_controller="false"
app:resize_mode="fill"
app:layout_constraintStart_toStartOf="@id/guideline2"
app:layout_constraintBottom_toBottomOf="@id/guideline3" app:layout_constraintBottom_toBottomOf="@id/guideline3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/guideline2"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:resize_mode="fill"
app:use_controller="false" />
<com.google.android.exoplayer2.ui.StyledPlayerView <com.google.android.exoplayer2.ui.StyledPlayerView
android:id="@+id/videoView2" android:id="@+id/videoView2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:use_controller="false" app:layout_constraintBottom_toBottomOf="parent"
app:resize_mode="fill" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/guideline2" app:layout_constraintStart_toStartOf="@id/guideline2"
app:layout_constraintTop_toTopOf="@id/guideline3" app:layout_constraintTop_toTopOf="@id/guideline3"
app:layout_constraintEnd_toEndOf="parent" app:resize_mode="fill"
app:layout_constraintBottom_toBottomOf="parent"/> app:use_controller="false" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2" android:id="@+id/guideline2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/popup_work_status_edit.xml 0 → 100644
View file @ 5eeab42d
This diff is collapsed.
app/src/main/res/values/colors.xml
View file @ 5eeab42d
...@@ -12,4 +12,5 @@ ...@@ -12,4 +12,5 @@
<color name="status_bg_color">#ebefefef</color> <color name="status_bg_color">#ebefefef</color>
<color name="home_text_color">#ff333333</color> <color name="home_text_color">#ff333333</color>
<color name="matter_text_color">#ffc1c1c1</color> <color name="matter_text_color">#ffc1c1c1</color>
<color name="color_99000000">#99000000</color>
</resources> </resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 5eeab42d
...@@ -16,4 +16,14 @@ ...@@ -16,4 +16,14 @@
<string name="zoom_divider_line">zoom divider line</string> <string name="zoom_divider_line">zoom divider line</string>
<string name="current_speed">%1d\nkm/h</string> <string name="current_speed">%1d\nkm/h</string>
<string name="toggle_more">toggle more</string> <string name="toggle_more">toggle more</string>
<string name="work_status_edit">修改</string>
<string name="work_status_mark">当前</string>
<string name="work_status_title">修改工作状态</string>
<string name="work_status_load">装载</string>
<string name="work_status_empty">空载</string>
<string name="work_status_loading">待载</string>
<string name="work_status_reload">重载</string>
<string name="work_status_unload">卸载</string>
<string name="work_status_unloading">待卸</string>
<string name="report_status">report status</string>
</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