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

1.适配g30和g40

Browse Source 
2.国内经纬度自定义用户位置图标，国外经纬度使用谷歌地图自带的用户位置图标
This commit is contained in:
yezhiqiu
2026-03-16 15:47:12 +08:00
parent 5e5679672f
commit 13035c6037
40 changed files with 394 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 391 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 770 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 734 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable/icon_pair_tracker_image1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
app/src/main/res/drawable/icon_pair_tracker_image2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

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

@@ -26,18 +26,17 @@
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/shape24_white_bg"
android:paddingHorizontal="@dimen/dp_22"
android:paddingBottom="@dimen/dp_56">
android:paddingVertical="@dimen/dp_40">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_charge_power_on_gif"
android:layout_width="@dimen/dp_255"
android:layout_height="@dimen/dp_170"
android:layout_centerHorizontal="true" />
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_charge_power_on_gif"-->
<!-- android:layout_width="@dimen/dp_255"-->
<!-- android:layout_height="@dimen/dp_170"-->
<!-- android:layout_centerHorizontal="true" />-->
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_charge_power_on_step_one"
style="@style/my_TextView_style_v2"
android:layout_below="@id/iv_charge_power_on_gif"
android:text="@string/txt_step_one"
android:textColor="@color/select_color3"
android:textSize="@dimen/textSize12"
@@ -58,7 +57,7 @@
android:id="@+id/tv_charge_power_on_step_two"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_charge_power_on_step_one"
android:layout_marginTop="@dimen/dp_44"
android:layout_marginTop="@dimen/dp_38"
android:text="@string/txt_step_two"
android:textColor="@color/select_color3"
android:textSize="@dimen/textSize12"

27
app/src/main/res/layout/activity_add_new_tracker3.xml
View File

@@ -36,26 +36,13 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<View
android:id="@+id/v_add_new_tracker3_solid_view"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_1"
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_20" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="@dimen/dp_160"
android:layout_height="@dimen/dp_160"
android:layout_alignTop="@id/v_add_new_tracker3_solid_view"
android:layout_alignEnd="@id/v_add_new_tracker3_solid_view"
android:src="@drawable/icon_pair_tracker_image1" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="@dimen/dp_160"
android:layout_height="@dimen/dp_160"
android:layout_alignStart="@id/v_add_new_tracker3_solid_view"
android:layout_alignTop="@id/v_add_new_tracker3_solid_view"
android:src="@drawable/icon_pair_tracker_image2" />
android:layout_marginTop="@dimen/dp_24"
android:src="@drawable/icon_pair_tracker_image" />
<androidx.appcompat.widget.AppCompatImageView
@@ -63,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_200"
android:layout_marginTop="@dimen/dp_140"
android:layout_marginEnd="@dimen/dp_18"
android:src="@drawable/icon_refresh" />

2
app/src/main/res/layout/activity_add_new_tracker4.xml
View File

@@ -41,7 +41,7 @@
android:layout_height="@dimen/dp_200"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_30"
android:src="@drawable/icon_pair_tracker_image2" />
android:src="@drawable/icon_pair_tracker_image" />
<com.abbidot.tracker.widget.VerifyEditText
android:id="@+id/vet_add_new_tracker4_edit_text"

9
app/src/main/res/layout/activity_add_paired_success.xml
View File

@@ -21,15 +21,16 @@
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_pair_success_device_image"
android:layout_width="@dimen/dp_130"
android:layout_height="@dimen/dp_90"
android:layout_height="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_50"
android:src="@drawable/icon_tracker_device_small" />
<com.abbidot.tracker.widget.TypefaceTextView
style="@style/my_TextView_style_v2"
android:layout_width="match_parent"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginBottom="@dimen/dp_8"
android:text="@string/txt_id_number"
android:textColor="@color/select_color3"
@@ -67,11 +68,11 @@
android:id="@+id/il_pair_success_bluetooth_tips"
layout="@layout/layout_ble_connect_state"
android:layout_width="wrap_content"
android:visibility="invisible"
android:layout_height="wrap_content"
android:layout_above="@id/btn_payment_success_continue"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_38" />
android:layout_marginTop="@dimen/dp_38"
android:visibility="invisible" />
<com.abbidot.tracker.widget.TypefaceButton
android:id="@+id/btn_pair_success_activate"

2
app/src/main/res/layout/activity_debug.xml
View File

@@ -23,7 +23,7 @@
android:id="@+id/switch_only_google_map"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_38"
android:layout_marginBottom="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_6"
android:background="@drawable/selector_shape6_gray_bg_pressed"
app:qmui_accessory_type="switcher" />

5
app/src/main/res/layout/fragment_home_track.xml
View File

@@ -19,9 +19,8 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_home_pet_track_pet_head"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_80"
android:src="@drawable/icon_tracker_device_small" />
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_home_pet_track_id"

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

@@ -12,6 +12,7 @@
<com.abbidot.tracker.widget.TypefaceTextView
style="@style/my_TextView_style_v2"
android:layout_width="0dp"
android:id="@+id/tv_device_light_switch_title"
android:layout_weight="1"
android:drawableStart="@drawable/icon_light_svg"
android:text="@string/txt_light"

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

@@ -8,6 +8,7 @@
android:paddingHorizontal="@dimen/dp_30">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_add_new_tracker3_device_image"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_10"
@@ -17,8 +18,7 @@
android:id="@+id/tv_add_new_tracker3_device_out_id_item"
style="@style/my_TextView_style_v2"
android:text="a0c0c1"
android:textAllCaps="true"
android:textSize="@dimen/textSize20"
android:textSize="@dimen/textSize18"
app:typeface="@string/roboto_regular_font" />
<View

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

@@ -1068,5 +1068,6 @@
<string name="txt_locating">Locating&#8230;</string>
<string name="txt_auto_subscription_years">(Renew at $%s/%s years thereafter)</string>
<string name="txt_auto_subscription_months">(Renew at $%s/%s months thereafter)</string>
<string name="txt_tone">Tone</string>
</resources>