xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加车信提前看板显示

Browse Source 
调整条件限速，常规限速提前看板，详细看板
调整道路名详细信息
This commit is contained in:
squallzhjch
2023-06-27 16:11:11 +08:00
parent fd2c5d0358
commit 6921e4c0b0
67 changed files with 1364 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/main/res/layout/activity_main.xml
View File

@@ -74,61 +74,6 @@
app:layout_constraintLeft_toLeftOf="@id/main_activity_top_sign_recyclerview"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/main_activity_sign_more_info_bg"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginLeft="260dp"
android:layout_marginTop="40dp"
android:background="@drawable/main_sign_moreinfo_bg"
android:minHeight="140dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/main_activity_top_sign_recyclerview" />
<TextView
android:id="@+id/main_activity_sign_more_info_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:drawableLeft="@drawable/icon_main_moreinfo_text_left"
android:drawablePadding="4dp"
android:text="条件点限速"
android:textColor="@color/orange"
app:layout_constraintLeft_toLeftOf="@id/main_activity_sign_more_info_bg"
app:layout_constraintTop_toTopOf="@id/main_activity_sign_more_info_bg" />
<TextView
android:id="@+id/main_activity_sign_more_info_text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:text="条件点限速"
android:textColor="@color/white"
app:layout_constraintRight_toRightOf="@id/main_activity_sign_more_info_bg"
app:layout_constraintTop_toBottomOf="@id/main_activity_sign_more_info_title" />
<TextView
android:id="@+id/main_activity_sign_more_info_text2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:singleLine="false"
android:text="条件点限速"
android:textColor="@color/white"
app:layout_constraintLeft_toLeftOf="@id/main_activity_sign_more_info_bg"
app:layout_constraintRight_toRightOf="@id/main_activity_sign_more_info_bg"
app:layout_constraintTop_toBottomOf="@id/main_activity_sign_more_info_text1" />
<androidx.constraintlayout.widget.Group
android:id="@+id/main_activity_sign_more_info_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="main_activity_sign_more_info_bg,main_activity_sign_more_info_text2,main_activity_sign_more_info_text1,main_activity_sign_more_info_title" />
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/main_activity_flow"
android:layout_width="0dp"

25
app/src/main/res/layout/adapter_electronic_eye.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="5dp"
android:paddingBottom="5dp"
tools:context="com.navinfo.omqs.ui.fragment.signMoreInfo.ElectronicEyeInfoAdapter">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="3"
android:textColor="@color/white" />
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/title"
android:layout_weight="2"
android:textColor="@color/white" />
</LinearLayout>

21
app/src/main/res/layout/adapter_sign.xml
View File

@@ -29,6 +29,16 @@
android:textColor="#2F2F2F"
android:textSize="16sp" />
<TextView
android:id="@+id/sign_second_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:gravity="center"
android:layout_marginTop="10dp"
android:layout_toRightOf="@id/sign_main_icon"
android:text=""
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/sign_bottom_text"
android:layout_width="wrap_content"
@@ -46,10 +56,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/sign_bottom_text"
android:layout_alignRight="@id/sign_main_bg"
android:layout_marginRight="15dp"
android:gravity="center"
android:text="其他信息"
android:layout_alignRight="@id/sign_main_bg"
android:textColor="@color/white"
android:textSize="14sp" />
@@ -65,11 +75,12 @@
<ImageView
android:id="@+id/sign_main_fast_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="172dp"
android:layout_marginTop="4dp"
android:layout_alignParentTop="true"
android:background="@drawable/icon_evaluation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:visibility="gone"
android:background="@drawable/icon_evaluation" />
</RelativeLayout>

41
app/src/main/res/layout/adapter_sign_laneinfo.xml Normal file
View File

@@ -0,0 +1,41 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="193dp"
android:layout_height="78dp"
android:background="@drawable/bg_sign_laneinfo"
android:orientation="vertical"
tools:context="com.navinfo.omqs.ui.activity.map.SignAdapter">
<LinearLayout
android:id="@+id/sign_more_icons_layout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp" />
<TextView
android:id="@+id/sign_bottom_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="15dp"
android:layout_marginBottom="5dp"
android:gravity="center"
android:text="道路名"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/sign_bottom_right_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/sign_bottom_text"
android:layout_alignParentRight="true"
android:layout_marginRight="15dp"
android:gravity="center"
android:text="其他信息"
android:textColor="@color/white"
android:textSize="14sp" />
</RelativeLayout>

17
app/src/main/res/layout/fragment_sign_roadname.xml → app/src/main/res/layout/fragment_sign_info.xml
View File

@@ -1,36 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/main_sign_moreinfo_bg"
android:padding="8dp"
tools:context=".ui.fragment.sign.RoadNameInfoFragment">
tools:context=".ui.fragment.signMoreInfo.SignMoreInfoFragment">
<TextView
android:id="@+id/roadname_title"
android:id="@+id/sign_info_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/icon_main_moreinfo_text_left"
android:drawablePadding="4dp"
android:text="条件点限速"
android:text="电子眼"
android:textColor="@color/orange" />
<ImageView
android:id="@+id/roadname_cancel"
android:id="@+id/sign_info_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/roadname_title"
android:layout_alignBottom="@id/roadname_title"
android:layout_alignTop="@id/sign_info_title"
android:layout_alignBottom="@id/sign_info_title"
android:layout_alignParentRight="true"
android:src="@drawable/baseline_cancel_24" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/roadname_recyclerview"
android:id="@+id/sign_info_recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/roadname_title"
android:layout_below="@id/sign_info_title"
android:layout_marginTop="5dp" />
</RelativeLayout>