ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.增加默认谷歌地图导航

Browse Source 
2.优化人和宠物位置切换
This commit is contained in:
yezhiqiu
2026-04-09 09:47:27 +08:00
parent 16956f1086
commit 862c9c9a06
20 changed files with 272 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-xhdpi/ico_map_navigati_image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 549 B

BIN
app/src/main/res/drawable-xhdpi/icon_white_bg_gray_delete.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 386 B

BIN
app/src/main/res/drawable-xxhdpi/ico_map_navigati_image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 762 B

BIN
app/src/main/res/drawable-xxhdpi/icon_white_bg_gray_delete.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 520 B

BIN
app/src/main/res/drawable-xxxhdpi/ico_map_navigati_image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1011 B

BIN
app/src/main/res/drawable-xxxhdpi/icon_white_bg_gray_delete.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 704 B

224
app/src/main/res/layout/fragment_map_v3.xml
View File

@@ -1,130 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.fragment.map.MapV3Fragment">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fc_home_map_fragment"
<include
android:id="@+id/ll_home_map_top_pet"
layout="@layout/layout_top_pet_data_small"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_home_map_device_battery_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible">
android:layout_margin="@dimen/dp_8" />
<include
android:id="@+id/il_home_map_device_battery_layout"
layout="@layout/layout_map_device_battery" />
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:id="@+id/rl_home_map_top_layout"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_8">
android:layout_height="match_parent">
<include
android:id="@+id/ll_home_map_top_pet"
layout="@layout/layout_top_pet_data_small"
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fc_home_map_fragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8" />
android:layout_height="match_parent" />
<include
android:id="@+id/il_home_map_device_msg"
layout="@layout/item_home_map_device_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/ll_home_map_top_pet"
android:layout_centerInParent="true"
android:layout_marginTop="@dimen/dp_6"
android:visibility="gone" />
<com.abbidot.tracker.widget.NonSwipeRecyclerView
android:id="@+id/rv_home_map_device_state"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ll_home_map_top_pet"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_2"
android:layoutDirection="rtl" />
<include
android:id="@+id/il_home_map_pet_location"
layout="@layout/layout_pet_location_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/dp_38"
android:visibility="invisible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_home_map_refresh_location"
style="@style/map_image_yellow_btn_style"
android:layout_above="@id/il_home_map_pet_location"
android:layout_alignEnd="@id/rv_home_map_device_state"
android:layout_marginBottom="@dimen/dp_18"
android:tint="@color/grey_color" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/home_map_refresh_btn"
style="@style/map_image_yellow_btn_style"
android:layout_above="@id/iv_home_map_refresh_location"
android:layout_alignEnd="@id/iv_home_map_refresh_location"
android:layout_marginBottom="@dimen/dp_8" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/home_map_bluetooth_btn"
style="@style/map_image_white_btn_style"
android:layout_alignBottom="@id/iv_home_map_refresh_location"
android:padding="@dimen/dp_8"
android:src="@drawable/icon_map_bluetooth" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_home_map_ble_con_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/home_map_bluetooth_btn"
android:layout_alignEnd="@id/home_map_bluetooth_btn"
android:src="@drawable/icon_map_offline" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/home_map_live_btn"
android:id="@+id/ll_home_map_device_battery_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/home_map_bluetooth_btn"
android:layout_marginBottom="@dimen/dp_8"
android:background="@drawable/shape38_gray_alpha_circle_bg"
android:orientation="vertical"
android:paddingHorizontal="@dimen/dp_14"
android:paddingVertical="@dimen/dp_16"
android:visibility="gone">
android:visibility="invisible">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_home_map_live_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_gray_cir_ring"
android:padding="@dimen/dp_6"
android:src="@drawable/icon_red_dot"
android:tint="@color/grey_color" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_home_map_live_title"
style="@style/my_TextView_style_v2"
android:layout_marginTop="@dimen/dp_2"
android:text="@string/txt_live"
android:textColor="@color/grey_color"
android:textSize="@dimen/textSize12"
android:textStyle="bold" />
<include
android:id="@+id/il_home_map_device_battery_layout"
layout="@layout/layout_map_device_battery" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
</FrameLayout>
<RelativeLayout
android:id="@+id/rl_home_map_top_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_8">
<include
android:id="@+id/il_home_map_device_msg"
layout="@layout/item_home_map_device_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_6"
android:visibility="gone" />
<com.abbidot.tracker.widget.NonSwipeRecyclerView
android:id="@+id/rv_home_map_device_state"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_2"
android:layoutDirection="rtl" />
<include
android:id="@+id/il_home_map_pet_location"
layout="@layout/layout_pet_location_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/dp_38"
android:visibility="invisible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_home_map_refresh_location"
style="@style/map_image_yellow_btn_style"
android:layout_above="@id/il_home_map_pet_location"
android:layout_alignEnd="@id/rv_home_map_device_state"
android:layout_marginBottom="@dimen/dp_18"
android:tint="@color/grey_color" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/home_map_refresh_btn"
style="@style/map_image_yellow_btn_style"
android:layout_above="@id/iv_home_map_refresh_location"
android:layout_alignEnd="@id/iv_home_map_refresh_location"
android:layout_marginBottom="@dimen/dp_8" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/home_map_bluetooth_btn"
style="@style/map_image_white_btn_style"
android:layout_alignBottom="@id/iv_home_map_refresh_location"
android:padding="@dimen/dp_8"
android:src="@drawable/icon_map_bluetooth" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_home_map_ble_con_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/home_map_bluetooth_btn"
android:layout_alignEnd="@id/home_map_bluetooth_btn"
android:src="@drawable/icon_map_offline" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/home_map_live_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/home_map_bluetooth_btn"
android:layout_marginBottom="@dimen/dp_8"
android:background="@drawable/shape38_gray_alpha_circle_bg"
android:orientation="vertical"
android:paddingHorizontal="@dimen/dp_14"
android:paddingVertical="@dimen/dp_16"
android:visibility="gone">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_home_map_live_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_gray_cir_ring"
android:padding="@dimen/dp_6"
android:src="@drawable/icon_red_dot"
android:tint="@color/grey_color" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_home_map_live_title"
style="@style/my_TextView_style_v2"
android:layout_marginTop="@dimen/dp_2"
android:text="@string/txt_live"
android:textColor="@color/grey_color"
android:textSize="@dimen/textSize12"
android:textStyle="bold" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
</FrameLayout>
</androidx.appcompat.widget.LinearLayoutCompat>

4
app/src/main/res/layout/fragment_route_v2.xml
View File

@@ -41,7 +41,6 @@
<com.abbidot.tracker.widget.VerticalTopToBottomSeekBar
android:id="@+id/vsb_map_route_line"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_height="320dp"
android:layout_gravity="center_vertical|end"
android:layout_marginBottom="@dimen/dp_18"
@@ -49,7 +48,8 @@
android:maxHeight="@dimen/dp_12"
android:progress="0"
android:progressDrawable="@drawable/shape_seek_bar_style"
android:thumb="@drawable/shape_black_circle_bg" />
android:thumb="@drawable/shape_black_circle_bg"
android:visibility="gone" />
</androidx.cardview.widget.CardView>
<RelativeLayout

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

@@ -11,7 +11,8 @@
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_pet_location_reverse_geocode"
style="@style/my_TextView_style_v2"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_42"
android:drawablePadding="@dimen/dp_2"
android:textSize="@dimen/textSize16"
app:typeface="@string/roboto_regular_font" />
@@ -21,9 +22,18 @@
android:id="@+id/tv_pet_location_update_time"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_pet_location_reverse_geocode"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_12"
android:textColor="@color/select_color3"
android:textSize="@dimen/textSize12"
app:typeface="@string/roboto_regular_font" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_pet_location_navigation_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="@drawable/selector_transparent_pressed"
android:src="@drawable/ico_map_navigati_image" />
</RelativeLayout>