1.map和直播页增加用户和宠物虚线设置

2.优化帮助页面
3.支付页面去掉税的计算
4.GPS: Off 改为GPS: Sleep;
5.map页增加位置更新时间格式：当更新滞后超过2倍的上报间隔时，才显示
(2h 35m ago)”，显示休眠中时，不显示“(2h 35m ago）
6.运动数据改为查看30天数据
7.历史轨迹限制只能看30天数据

app/src/main/res/values/colors.xml

@@ -379,4 +379,5 @@
     <color name="light_yellow_color">#F9FFE8</color>
     <color name="grey_color_91">#B0B0B0</color>
     <color name="grey_color_92">#758E94</color>
+    <color name="orange_color5">#FF996E</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -847,8 +847,8 @@
     <string name="txt_reminder">Reminder</string>
     <string name="txt_yesterday">Yesterday</string>
     <string name="txt_power_on_off">Power On/Off</string>
-    <string name="txt_power_on_off_tip">Fully charge the tracker, then remove the cable. When the green light flashes, the tracker is powered on.</string>
-    <string name="txt_active_tracker_tip">Select and complete your subscription, then click to activate the tracker on the app. Once activated, the tracker can be used for GPS tracking and cellular network connectivity.</string>
+    <string name="txt_power_on_off_tip">Charge and unplug to turn on Flashing green light = on</string>
+    <string name="txt_active_tracker_tip">Choose a subscription Tap to activate the tracker Enable GPS and cellular tracking</string>
     <string name="txt_active_tracker">Active Tracker</string>
     <string name="txt_check_tracker_status_tip">(The GPS and cellular network conditions can vary depending on the environment. Before placing it on your pet, check various locations around you to evaluate the GPS and network status.)</string>
     <string name="txt_check_tracker_status">Check Tracker Status</string>
@@ -859,11 +859,11 @@
     <string name="txt_tracker_battery_tip5">(Shorter network intervals drain the Tracker\'s battery faster. By default, the network reconnects every 15 minutes.)</string>
     <string name="txt_tracker_battery_tip6">When Live mode is activated, the Tracker enters a rapid positioning and networking state, usually within 15–20 seconds. This mode drains the battery the quickest, so it\'s best reserved for emergency situations.</string>
     <string name="txt_tracker_battery_life">Tracker Battery Life</string>
-    <string name="txt_create_fence_tip1">1.Fence Settings: Select "Pet" > "My Pet Fence". Click "Manage" > "+ Add new" to create or edit a fence for Safe Zone or No-go Zone.</string>
-    <string name="txt_create_fence_tip2">2.Define Boundary: Choose a location on the map, adjust the fence\'s radius or shape.</string>
-    <string name="txt_create_fence_tip3">3.Save Settings: Save to activate the geofence.</string>
+    <string name="txt_create_fence_tip1">Go to Pet > My Pet Fence > Manage > + Add New</string>
+    <string name="txt_create_fence_tip2">Choose location and adjust radius or shapeSave fence to activate it</string>
+    <string name="txt_create_fence_tip3">Alerts when pet enters or leaves the zone</string>
     <string name="txt_create_fence_tip4">4.Turn on Notifications: Go to \'Account\' > \'Settings\'. Click \'Notifications\' and turn on</string>
-    <string name="txt_create_pet_fence">Creating My Pet Fence</string>
+    <string name="txt_create_pet_fence">Create a Pet Fence</string>
     <string name="txt_tracker_sleeping_mode">Tracker in Sleeping Mode</string>
     <string name="txt_low_power">(Super Low power usage)</string>
     <string name="txt_in_wifi_zone">Tracker in WiFi Zone</string>
@@ -1010,8 +1010,8 @@
     <string name="txt_sure_delete_card">Sure to delete this card?</string>
     <string name="txt_account_exists_log_in">Account exists. Log in now?</string>
     <string name="txt_time_out_of_range">Selected date is out of range</string>
-    <string name="txt_power_on_off_install_tip">Shake to wake your tracker next time.</string>
-    <string name="txt_check_tracker_status_top_tip">Turn on the tracker, open the app, go to \'Pet\' > \'Tracker\' on the dashboard, then tap \'Network\', \'GPS\', \'Battery\', \'WiFi zone\', \'Bluetooth\', or \'Light\' to check connectivity, signal, or battery status.</string>
+    <string name="txt_power_on_off_install_tip">Shake to turn on Flashing green light confirms on</string>
+    <string name="txt_check_tracker_status_top_tip">Go to Pet > Tracker Check Network GPS Battery WiFi Zone Bluetooth LED GPS and cellular signals may vary by location Test in different locations before use</string>
     <string name="txt_on_charging">Tracker is on charging</string>
     <string name="txt_active_subscribed">Subscribed</string>
     <string name="txt_send">Send</string>
@@ -1090,5 +1090,20 @@
     <string name="txt_standard_refund_dec">After the initial 48-hour period, users may request a refund within 30 days of purchase.\n\t1.All subscription plans (3-Month, 1-Year, 2-Year) are eligible\n\t2.Refund requests are subject to review and approval\n\t3.Refunds may be partially adjusted based on usage and service consumption\n</string>
     <string name="txt_no_refund_dec">Subscriptions older than 30 days are non-refundable.</string>
     <string name="txt_no_refund">No Refund After 30 Days</string>
+    <string name="txt_display_dashed_line">Display Dashed Line</string>
+    <string name="txt_first_use">First use</string>
+    <string name="txt_daily_use">Daily use</string>
+    <string name="txt_sleep_mode">Sleep Mode</string>
+    <string name="txt_sleep_mode_help">15 minutes no movement → sleep mode Auto wake on movement Battery updates every 24 hours</string>
+    <string name="txt_wifi_zone_home">WiFi Zone（Home)</string>
+    <string name="txt_wifi_zone_home_help">Connect to home WiFi GPS off → save battery Update every ~60 minutes</string>
+    <string name="txt_gps_update_help">Pet > Tracker > GPS Update Select 3–15 min Short interval = higher battery use Default: 5 min</string>
+    <string name="txt_set_fence_type">Set Fence type</string>
+    <string name="txt_fence_type_help">Safe Zone or No-go Zone</string>
+    <string name="txt_set_boundary">Set boundary</string>
+    <string name="txt_enable_set_notify">Enable alerts in Account > Settings > Notifications</string>
+    <string name="txt_edit_delete_fence">Edit or delete fence in Manage</string>
+    <string name="txt_total">Total</string>
+    <string name="txt_location_ago">(%s ago)</string>
 
 </resources>