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

增加保险订单详情，优化图表x轴动态变化超过1440min问题

Browse Source
This commit is contained in:
yezhiqiu
2025-10-27 15:27:43 +08:00
parent 0b8561316c
commit e81b62159a
18 changed files with 319 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/drawable/shape20_light_yellow_bg.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--白色的圆角背景-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/grey_color_90" />
<corners android:radius="@dimen/dp_20" />
</shape>

84
app/src/main/res/layout/item_annual_care_history_layout.xml Normal file
View File

@@ -0,0 +1,84 @@
<?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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape20_light_yellow_bg"
android:paddingHorizontal="@dimen/dp_20"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_24">
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_order_id"
style="@style/my_TextView_style_v2"
android:text="@string/txt_order_id"
android:textSize="@dimen/textSize12"
app:typeface="@string/roboto_regular_font" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_state"
style="@style/my_TextView_style_v2"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_6"
android:text="@string/app_name"
android:textSize="@dimen/textSize14"
app:typeface="@string/roboto_regular_font" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_active_time_title"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_subscription_annual_care_state"
android:layout_marginTop="@dimen/dp_4"
android:text="@string/txt_active_time1"
android:textSize="@dimen/textSize14"
android:textStyle="bold" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_active_time"
style="@style/my_TextView_style_v2"
android:layout_alignTop="@id/tv_subscription_annual_care_active_time_title"
android:layout_marginStart="@dimen/dp_4"
android:layout_toEndOf="@id/tv_subscription_annual_care_active_time_title"
android:text="@string/app_name"
android:textSize="@dimen/textSize14"
app:typeface="@string/roboto_regular_font" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_expiry_time_title"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_subscription_annual_care_active_time_title"
android:layout_marginTop="@dimen/dp_6"
android:text="@string/txt_expiry_time"
android:textSize="@dimen/textSize14"
android:textStyle="bold" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_expiry_time"
style="@style/my_TextView_style_v2"
android:layout_alignTop="@id/tv_subscription_annual_care_expiry_time_title"
android:layout_marginStart="@dimen/dp_4"
android:layout_toEndOf="@id/tv_subscription_annual_care_expiry_time_title"
android:text="@string/app_name"
android:textSize="@dimen/textSize14"
app:typeface="@string/roboto_regular_font" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_price"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_subscription_annual_care_expiry_time_title"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_6"
android:text="@string/txt_money_unit"
android:textSize="@dimen/textSize16"
android:textStyle="bold" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscription_annual_care_package"
style="@style/my_TextView_style_v2"
android:layout_alignTop="@id/tv_subscription_annual_care_price"
android:layout_alignBottom="@id/tv_subscription_annual_care_price"
android:text="@string/txt_year_care"
android:textSize="@dimen/textSize14"
android:textStyle="bold" />
</RelativeLayout>

2
app/src/main/res/values-de/strings.xml
View File

@@ -865,7 +865,7 @@
<string name="txt_expired">Abgelaufen</string>
<string name="txt_upgrade_plan">Tarif upgraden</string>
<string name="txt_residual_value">Restwert</string>
<string name="txt_month_unit">/%s Monat</string>
<string name="txt_month_unit">/Monat x%s</string>
<string name="txt_auto_subscription_year">(Verlängerung zu $%s jährlich danach)</string>
<string name="txt_auto_subscription_year1">(Verlängerung zu</string>
<string name="txt_auto_subscription_year2">jährlich danach)</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -908,7 +908,7 @@
<string name="txt_expired">已过期</string>
<string name="txt_upgrade_plan">升级您的套餐</string>
<string name="txt_residual_value">剩余价值</string>
<string name="txt_month_unit">/%s月</string>
<string name="txt_month_unit">/月 x%s</string>
<string name="txt_auto_subscription_year">（此后按每年 $%s 续订）</string>
<string name="txt_auto_subscription_year1">(此后按</string>
<string name="txt_auto_subscription_year2">/年续费)</string>

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

@@ -370,4 +370,5 @@
<color name="device_msg_color1">#FFE0E0</color>
<color name="permission_no_check_color">#EEEFEF</color>
<color name="grey_color_64">#64000000</color>
<color name="grey_color_90">#F9FFE3</color>
</resources>

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

@@ -1046,5 +1046,8 @@
<string name="txt_renewal_years">Renewal: $%s/%s years on %s</string>
<string name="txt_renewal_months">Renewal: $%s/%s months on %s</string>
<string name="txt_replacement_year">1 replacement/year, any reason</string>
<string name="txt_expiry_time">Expiry Time:</string>
<string name="txt_year_care">%s Year Care</string>
<string name="txt_fence_saved">Saved. Active when online.</string>
</resources>