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

map和直播页面改版

Browse Source
This commit is contained in:
yezhiqiu
2025-11-27 18:22:51 +08:00
parent 11b6ba16bd
commit 314508e924
27 changed files with 2057 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 331 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 302 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 420 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 468 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 B

8
app/src/main/res/drawable/shape16_light_green_color_bg.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/green_color10" />
<corners android:radius="@dimen/dp_16" />
</shape>

145
app/src/main/res/layout/activity_live_v3.xml Normal file
View File

@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat 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="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.activity.map.LiveActivityV2">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fc_live_v2_map_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_live_v3_map_device_battery_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible">
<include
android:id="@+id/il_live_v3_map_device_battery_layout"
layout="@layout/layout_map_device_battery" />
</androidx.appcompat.widget.LinearLayoutCompat>
<include
android:id="@+id/ll_live_v2_map_top_pet"
layout="@layout/layout_top_pet_data_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_40" />
<com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
android:id="@+id/ll_live_v2_state_layout"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_34"
android:layout_below="@id/ll_live_v2_map_top_pet"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_8"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_12"
android:visibility="gone"
app:qmui_backgroundColor="@color/select_color2"
app:qmui_radius="@dimen/dp_28">
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/lav_live_v2_state_anim"
android:layout_width="@dimen/dp_40"
android:layout_height="wrap_content"
android:visibility="gone"
app:lottie_loop="true" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_live_v2_state_content"
style="@style/my_TextView_style_v2"
android:text="@string/txt_starting_live"
android:textColor="@color/select_color"
android:textSize="@dimen/textSize12"
app:typeface="@string/roboto_regular_font" />
</com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
<include
android:id="@+id/il_live_v3_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_live_v2_state_layout"
android:layout_centerInParent="true"
android:layout_marginTop="@dimen/dp_6"
android:visibility="gone" />
<com.abbidot.tracker.widget.NonSwipeRecyclerView
android:id="@+id/rv_map_live_v2_device_state"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ll_live_v2_map_top_pet"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginEnd="@dimen/dp_12"
android:layoutDirection="rtl" />
<include
android:id="@+id/il_live_v2_bluetooth_find_device"
layout="@layout/layout_bluetooth_find_device"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone" />
<include
android:id="@+id/il_live_v3_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_marginHorizontal="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_4"
android:visibility="invisible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_map_live_v2_refresh_btn"
style="@style/map_image_yellow_btn_style"
android:layout_above="@id/il_live_v3_map_pet_location"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_16" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_map_live_v2_bluetooth_btn"
style="@style/map_image_white_btn_style"
android:layout_alignTop="@id/iv_map_live_v2_refresh_btn"
android:layout_alignBottom="@id/iv_map_live_v2_refresh_btn"
android:layout_marginStart="@dimen/dp_12"
android:padding="@dimen/dp_8"
android:src="@drawable/icon_map_bluetooth" />
<include
android:id="@+id/il_map_live_v2_issue_layout"
layout="@layout/layout_live_issue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone" />
</RelativeLayout>
<include
android:id="@+id/il_live_v2_operate_layout"
layout="@layout/layout_live_v2_data_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white" />
</androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -10,10 +10,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.abbidot.tracker.widget.MapMarkerInfoView
android:id="@+id/mi_home_map_address_view"
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">
<include
android:id="@+id/il_home_map_device_battery_layout"
layout="@layout/layout_map_device_battery" />
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
@@ -29,13 +36,15 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_home_map_device_msg"
<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_8" />
android:layout_marginTop="@dimen/dp_6"
android:visibility="gone" />
<com.abbidot.tracker.widget.NonSwipeRecyclerView
android:id="@+id/rv_home_map_device_state"
@@ -53,7 +62,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/dp_40" />
android:layout_marginBottom="@dimen/dp_38"
android:visibility="invisible" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/home_map_bluetooth_btn"
@@ -80,7 +90,7 @@
android:orientation="vertical"
android:paddingHorizontal="@dimen/dp_14"
android:paddingVertical="@dimen/dp_16"
android:visibility="visible">
android:visibility="invisible">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"

19
app/src/main/res/layout/item_home_map_device_msg.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_255"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center">
@@ -9,11 +9,22 @@
<com.abbidot.tracker.widget.TypefaceButton
android:id="@+id/tv_device_msg_content"
style="@style/my_TextView_style_v2"
android:background="@color/orange_color3"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
android:background="@color/device_msg_color1"
android:paddingHorizontal="@dimen/dp_18"
android:paddingVertical="@dimen/dp_12"
android:textColor="@color/data_black_color"
android:textSize="@dimen/textSize12"
app:qmui_radius="@dimen/dp_28" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_device_msg_close_btn"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_gravity="end"
android:src="@drawable/ic_delete_easyy_photos"
android:tint="@color/gray_color3" />
</FrameLayout>

42
app/src/main/res/layout/layout_map_device_battery.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_8"
android:gravity="center"
android:orientation="vertical">
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_device_battery_info"
style="@style/my_TextView_style_v2"
android:background="@drawable/shape8_white_bg"
android:drawableStart="@drawable/icon_low_battery_image"
android:drawablePadding="@dimen/dp_4"
android:padding="@dimen/dp_10"
android:text="@string/txt_powered_off"
android:textSize="@dimen/textSize12"
app:typeface="@string/roboto_regular_font" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_white_trigon" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_device_close_btn"
android:layout_width="@dimen/dp_16"
android:layout_height="@dimen/dp_16"
android:layout_gravity="end"
android:src="@drawable/ic_delete_easyy_photos"
android:tint="@color/gray_color3" />
</FrameLayout>

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

@@ -18,6 +18,7 @@
<com.abbidot.tracker.widget.TypefaceTextView
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"

5
app/src/main/res/values/strings.xml
View File

@@ -796,7 +796,7 @@
<string name="txt_hours">hours</string>
<string name="txt_search_device">Searching…</string>
<string name="txt_no_search_device">Keep tracker on and nearby to scan.</string>
<string name="txt_battery_less_than">Battery less than %s%%</string>
<string name="txt_battery_less_than">Less than %s%%</string>
<string name="txt_outside">Outside</string>
<string name="txt_inside">Inside</string>
<string name="txt_7days_avg">7 Days Avg.</string>
@@ -1050,5 +1050,8 @@
<string name="txt_show_crash">The program has an exception and is about to exit</string>
<string name="txt_activate_subscribe">Activate Subscription</string>
<string name="txt_powered_off">Powered off</string>
<string name="txt_near">Near %s</string>
<string name="txt_charging">Charging</string>
</resources>