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

1.Account页面消息移动到pet页面

Browse Source 
2.map页和直播页的消息显示状态和宠物头像顶部显示状态共存
This commit is contained in:
yezhiqiu
2025-12-12 18:15:22 +08:00
parent d87679408f
commit 3a7cb0251f
16 changed files with 223 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 384 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 531 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 705 B

45
app/src/main/res/layout/fragment_account_v2.xml
View File

@@ -11,32 +11,33 @@
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
<include
android:id="@+id/ll_home_account_top_user"
layout="@layout/layout_top_pet_data_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/dp_8">
android:layout_marginHorizontal="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8" />
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingHorizontal="@dimen/dp_8">-->
<include
android:id="@+id/ll_home_account_top_user"
layout="@layout/layout_top_pet_data_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_account_message_count_text"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@drawable/message_shape_bg"
android:gravity="center"
android:text="99"
android:textColor="@color/white"
android:textSize="@dimen/textSize10"
android:visibility="gone" />
</RelativeLayout>
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- android:id="@+id/home_account_message_count_text"-->
<!-- android:layout_width="@dimen/dp_18"-->
<!-- android:layout_height="@dimen/dp_18"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_marginTop="@dimen/dp_8"-->
<!-- android:layout_marginEnd="@dimen/dp_8"-->
<!-- android:background="@drawable/message_shape_bg"-->
<!-- android:gravity="center"-->
<!-- android:text="99"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="@dimen/textSize10"-->
<!-- android:visibility="gone" />-->
<!-- </RelativeLayout>-->
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"

29
app/src/main/res/layout/fragment_pet_v2.xml
View File

@@ -6,13 +6,32 @@
android:orientation="vertical"
tools:context=".ui.fragment.pet.PetV2Fragment">
<include
android:id="@+id/il_home_pet_top_bar"
layout="@layout/layout_top_pet_data_small"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8" />
android:paddingHorizontal="@dimen/dp_8">
<include
android:id="@+id/il_home_pet_top_bar"
layout="@layout/layout_top_pet_data_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/home_pet_message_count_text"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@drawable/message_shape_bg"
android:gravity="center"
android:text="99"
android:textColor="@color/white"
android:textSize="@dimen/textSize10"
android:visibility="gone" />
</RelativeLayout>
<RadioGroup
android:id="@+id/rg_switch_pet_track"

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

@@ -21,10 +21,9 @@
<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_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:src="@drawable/ic_delete_easyy_photos"
android:tint="@color/gray_color3" />
android:src="@drawable/icon_white_bg_gray_delete" />
</FrameLayout>

7
app/src/main/res/layout/layout_map_device_battery.xml
View File

@@ -33,10 +33,9 @@
<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_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:src="@drawable/ic_delete_easyy_photos"
android:tint="@color/gray_color3" />
android:src="@drawable/icon_white_bg_gray_delete" />
</FrameLayout>