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

Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	app/src/main/res/layout/text_item_select.xml
This commit is contained in:
qiji4215
2023-05-26 09:59:24 +08:00
parent 6af2479dbd 4e997b8632
commit e86b0696b6
50 changed files with 803 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,14 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/main_activity_top_sign_recyclerview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/main_activity_person_center"
@@ -136,9 +144,8 @@
<ImageButton
android:id="@+id/main_activity_fragment_switch"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginRight="-10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/selector_fragment_switch"
android:elevation="2dp"
android:onClick="@{()->mainActivity.onSwitchFragment()}"
@@ -259,8 +266,8 @@
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="323dp"
android:layout_height="match_parent"
android:layout_marginTop="30dp"
android:layout_gravity="left"
android:layout_marginTop="30dp"
app:navGraph="@navigation/left_drawer_nav_graph" />
</androidx.drawerlayout.widget.DrawerLayout>

54
app/src/main/res/layout/adapter_top_sign.xml Normal file
View File

@@ -0,0 +1,54 @@
<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:layout_width="70dp"
android:layout_height="match_parent"
tools:context="com.navinfo.omqs.ui.activity.map.TopSignAdapter">
<TextView
android:id="@+id/top_sign_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginBottom="0.5dp"
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="名称"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/top_sign_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/top_sign_name"
android:layout_alignLeft="@id/top_sign_name"
android:layout_alignRight="@id/top_sign_name"
android:layout_centerHorizontal="true"
android:gravity="center"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="道路名"
android:textColor="@color/white"
android:textSize="18sp" />
<View
android:id="@+id/top_sign_left_line"
android:layout_width="0.5dp"
android:layout_height="wrap_content"
android:layout_alignTop="@id/top_sign_text"
android:layout_alignBottom="@id/top_sign_text"
android:background="#0C122B"
android:visibility="gone" />
<View
android:id="@+id/top_sign_right_line"
android:layout_width="0.5dp"
android:layout_height="wrap_content"
android:layout_alignTop="@id/top_sign_text"
android:layout_alignBottom="@id/top_sign_text"
android:layout_alignParentRight="true"
android:background="#0C122B"
android:visibility="gone" />
</RelativeLayout>

23
app/src/main/res/layout/fragment_phenomenon.xml
View File

@@ -18,31 +18,30 @@
<!-- android:paddingBottom="30dp"-->
<!-- android:src="@drawable/btn_back_xml" />-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_middle_recyclerview"
android:layout_width="0dp"
android:layout_height="35dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/phenomenon_right_recyclerview"
app:layout_constraintTop_toTopOf="parent" />
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/phenomenon_middle_recyclerview"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="35dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toLeftOf="@id/phenomenon_right_recyclerview"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_left_recyclerview"
android:layout_width="0dp"
android:layout_width="148dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/phenomenon_right_recyclerview"
app:layout_constraintTop_toBottomOf="@id/phenomenon_middle_recyclerview" />
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/phenomenon_right_recyclerview"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/phenomenon_left_recyclerview"
app:layout_constraintRight_toRightOf="parent" />
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <LinearLayout-->
<!-- android:id="@+id/group"-->

14
app/src/main/res/layout/text_item_select.xml
View File

@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_layout"
android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@drawable/selector_adapter_item_select_bg">
<TextView
android:id="@+id/item_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:padding = "3dp"
android:layout_margin="4dp"
android:gravity="center"
android:textColor="@color/black"
android:textSize="@dimen/default_font_size">
android:padding="4dp"
android:drawablePadding="10dp"
android:drawableLeft="@drawable/selector_text_drawable_left_white_blue"
android:textColor="@color/selector_black_blue_color"
android:textSize="14sp"/>
</TextView>

19
app/src/main/res/layout/text_item_select2.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selector_adapter_item_select_bg">
<TextView
android:id="@+id/item_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:gravity="center_vertical"
android:padding="4dp"
android:textColor="@color/selector_black_blue_color"
android:textSize="14sp"/>
</RelativeLayout>