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

1.修复编辑wifi zone名称时，部分机型输入法会挡住输入框

Browse Source 
2.GPS的“Weak signal”替换“No signal”状态
3.隐藏APP中的里程和总里程显示
4.新增手机无网络，开启APP后，手机网络恢复，APP自动获取内容
5.添加/编辑wifi时，不显示复位按钮；位置不可拖动，不显示宠物
6.修改toast白底黑字样式
7.直播禁用，采用不可点击状态，而不是隐藏按钮，点击提示文案：Live works on cellular only
8. 修改不能添加或者解绑宠物，添加设备自动绑定宠物“My Pet”
9.解绑设备改为不需要蓝牙解绑并优化ui
This commit is contained in:
yezhiqiu
2025-12-18 18:29:58 +08:00
parent 3a7cb0251f
commit 5b489a2519
36 changed files with 479 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/drawable/icon_gray_cir_ring.xml Normal file
View File

@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:strokeWidth="1"
android:pathData="M11,11m-10.5,0a10.5,10.5 0,1 1,21 0a10.5,10.5 0,1 1,-21 0"
android:fillColor="#00000000"
android:strokeColor="@color/grey_color"/>
</vector>

15
app/src/main/res/drawable/shape38_gray_alpha_circle_bg.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape android:shape="rectangle">
<solid android:color="@color/white_color1" />
<corners android:radius="@dimen/dp_38" />
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/permission_no_check_color" />
<corners android:radius="@dimen/dp_38" />
</shape>
</item>
</selector>

4
app/src/main/res/drawable/shape_white_alpha_circle_bg.xml → app/src/main/res/drawable/shape38_green_alpha_circle_bg.xml
View File

@@ -3,13 +3,13 @@
<item android:state_pressed="false">
<shape android:shape="rectangle">
<solid android:color="@color/yellow_color30" />
<corners android:radius="@dimen/dp_38"/>
<corners android:radius="@dimen/dp_38" />
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/btn_yellow_color" />
<corners android:radius="@dimen/dp_38"/>
<corners android:radius="@dimen/dp_38" />
</shape>
</item>
</selector>

2
app/src/main/res/drawable/shape40_black70_toast_bg.xml
View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black70" />
<solid android:color="@color/main_back" />
<corners android:radius="@dimen/dp_40" />
</shape>

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

@@ -39,6 +39,7 @@
layout="@layout/layout_data_board_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_16" />
<include

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

@@ -123,7 +123,7 @@
android:id="@+id/btn_next_delete_tracker1"
style="@style/my_RoundRect_Button_style"
android:layout_weight="1"
android:text="@string/register_txt_next"
android:text="@string/txt_delete"
app:qmui_radius="@dimen/dp_24"
app:typeface="@string/roboto_bold_font" />
</androidx.appcompat.widget.LinearLayoutCompat>

10
app/src/main/res/layout/activity_edit_power_zone.xml
View File

@@ -36,14 +36,16 @@
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_36" />
android:layout_marginBottom="@dimen/dp_36"
android:visibility="gone" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_edit_wifi_zone_map_type_btn"
style="@style/map_image_white_btn_style"
android:layout_above="@id/iv_edit_wifi_zone_refresh_btn"
android:layout_alignEnd="@id/iv_edit_wifi_zone_refresh_btn"
android:layout_marginBottom="@dimen/dp_12"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_36"
android:background="@drawable/shape_white_circle_bg" />
</RelativeLayout>

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

@@ -171,6 +171,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_below="@id/ll_more_active_time_calories"
android:layout_alignStart="@id/more_active_time_view"
android:layout_alignEnd="@id/more_active_time_view"
@@ -310,7 +311,7 @@
style="@style/my_TextView_style_v2"
android:drawableStart="@drawable/icon_active_time"
android:drawablePadding="@dimen/dp_6"
android:text="@string/txt_total_data"
android:text="@string/txt_total_time"
android:textSize="@dimen/textSize14"
app:typeface="@string/roboto_regular_font" />
@@ -351,6 +352,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:visibility="gone"
android:background="@drawable/shape8_white_gray_bg"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_12"

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

@@ -75,7 +75,7 @@
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_58"
android:background="@drawable/shape_white_alpha_circle_bg"
android:background="@drawable/shape38_green_alpha_circle_bg"
android:orientation="vertical"
android:paddingHorizontal="@dimen/dp_36"
android:paddingVertical="@dimen/dp_6"

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

@@ -86,23 +86,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/home_map_refresh_btn"
android:background="@drawable/shape_white_alpha_circle_bg"
android:background="@drawable/shape38_gray_alpha_circle_bg"
android:orientation="vertical"
android:paddingHorizontal="@dimen/dp_14"
android:paddingVertical="@dimen/dp_16"
android:visibility="invisible">
android:paddingVertical="@dimen/dp_16">
<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_black_cir_ring"
android:background="@drawable/icon_gray_cir_ring"
android:padding="@dimen/dp_6"
android:src="@drawable/icon_red_dot" />
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>

3
app/src/main/res/layout/item_my_tracker_v2_layout.xml
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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="match_parent"
android:layout_height="wrap_content">
@@ -138,6 +136,7 @@
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_my_tracker_v2_link_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/rl_my_tracker_v2_device"

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

@@ -4,7 +4,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.appcompat.widget.LinearLayoutCompat
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
@@ -15,6 +15,7 @@
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_device_battery_info"
style="@style/my_TextView_style_v2"
android:layout_marginBottom="@dimen/dp_8"
android:background="@drawable/shape8_white_bg"
android:drawableStart="@drawable/icon_low_battery_image"
android:drawablePadding="@dimen/dp_4"
@@ -26,9 +27,10 @@
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:src="@drawable/icon_white_trigon" />
</androidx.appcompat.widget.LinearLayoutCompat>
</FrameLayout>
<androidx.appcompat.widget.AppCompatImageView

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

@@ -7,6 +7,6 @@
android:paddingHorizontal="@dimen/dp_18"
android:paddingVertical="@dimen/dp_8"
android:text="@string/app_name"
android:textColor="@color/white"
android:textColor="@color/tab_select"
android:textSize="15dp"
app:typeface="@string/roboto_regular_font" />

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

@@ -1053,5 +1053,9 @@
<string name="txt_powered_off">Powered off</string>
<string name="txt_near">Near %s</string>
<string name="txt_charging">Charging</string>
<string name="txt_total_time">Total Time</string>
<string name="txt_live_works_cellular">Live works on cellular only</string>
<string name="txt_unbind_device">Unbind Device</string>
<string name="txt_edit_profile">Edit Profile</string>
</resources>