diff --git a/.idea/misc.xml b/.idea/misc.xml
index a16b5fb..0822f21 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 435d040..6c31c49 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -279,10 +279,6 @@
             android:name=".ui.activity.device.wifi.AddWifiPowerZone1Activity"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.activity.subscribe.SubscriptionDetailActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.activity.set.FirstPermissionsActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeHistoryCNAdapter.kt b/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeHistoryCNAdapter.kt
index 9c111f5..4865c9f 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeHistoryCNAdapter.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeHistoryCNAdapter.kt
@@ -19,13 +19,13 @@ class RechargeHistoryCNAdapter(ctx: Context, list: MutableList<RechargeHistoryBe
     override fun getItemLayoutId(viewType: Int) = R.layout.item_recharge_history_cn
 
     override fun bindData(holder: RecyclerViewHolder?, position: Int, item: RechargeHistoryBean) {
-        holder!!.setText(R.id.recharge_history_cn_pay_time, item.payTime)
-        val totalString = String.format(mContext.getString(R.string.txt_total_money),
-                "+${mContext.getString(R.string.txt_month_until)}${item.cost}")
-        holder.setText(R.id.recharge_history_cn_pay_money, totalString)
-        holder.setText(R.id.recharge_history_cn_meal_name, item.feePackage)
-        val deviceName = String.format(mContext.getString(R.string.txt_tracker_name),
-                item.deviceOutId)
-        holder.setText(R.id.recharge_history_cn_device_name, deviceName)
+//        holder!!.setText(R.id.recharge_history_cn_pay_time, item.payTime)
+//        val totalString = String.format(mContext.getString(R.string.txt_total_money),
+//                "+${mContext.getString(R.string.txt_month_until)}${item.cost}")
+//        holder.setText(R.id.recharge_history_cn_pay_money, totalString)
+//        holder.setText(R.id.recharge_history_cn_meal_name, item.feePackage)
+//        val deviceName = String.format(mContext.getString(R.string.txt_tracker_name),
+//                item.deviceOutId)
+//        holder.setText(R.id.recharge_history_cn_device_name, deviceName)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/data/HistoryDataActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/data/HistoryDataActivity.kt
index 8ee3ec2..ddfd26f 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/data/HistoryDataActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/data/HistoryDataActivity.kt
@@ -46,7 +46,7 @@ class HistoryDataActivity :
         mViewBinding.activeHistoryDataBar.titleTopBarLayout.setBackgroundResource(
             R.color.sleep_time_gray_color
         )
-        setTopBarTitle(R.string.data_active_history)
+        setTopBarTitle(R.string.app_name)
 
         mPet = Util.getParcelableAdaptive(intent, ConstantString.Pet, PetBean::class.java)!!
         mHistoryDataList = mutableListOf()
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/FencesAddActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/FencesAddActivity.kt
index 155481c..e4de2d7 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/FencesAddActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/FencesAddActivity.kt
@@ -123,7 +123,7 @@ class FencesAddActivity : BaseActivity<ActivityFencesAddBinding>(ActivityFencesA
 
             //编辑
             if (isEdit) {
-                setTopBarTitle(R.string.txt_edit_fences)
+                setTopBarTitle(R.string.app_name)
                 mRightImageButton = addRightImageButton(R.drawable.ico_delete)
                 setOnClickListenerViews(mRightImageButton)
 
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodPayPalActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodPayPalActivity.kt
index 93608be..631fbd6 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodPayPalActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodPayPalActivity.kt
@@ -13,7 +13,6 @@ import com.abbidot.baselibrary.eventbus.XEventBus
 import com.abbidot.baselibrary.list.BaseRecyclerAdapter
 import com.abbidot.baselibrary.util.LogUtil
 import com.abbidot.tracker.R
-import com.abbidot.tracker.deprecated.adapter.SelectPaymentMethodAdapter
 import com.abbidot.tracker.base.BaseActivity
 import com.abbidot.tracker.bean.CreditCardBean
 import com.abbidot.tracker.bean.MenuTxtBean
@@ -24,6 +23,7 @@ import com.abbidot.tracker.constant.ConstantString
 import com.abbidot.tracker.constant.GetResultCallback
 import com.abbidot.tracker.database.MyDatabase
 import com.abbidot.tracker.databinding.ActivitySelectPaymentMethodBinding
+import com.abbidot.tracker.deprecated.adapter.SelectPaymentMethodAdapter
 import com.abbidot.tracker.deprecated.ui.activity.vm.BraintreePalViewModel
 import com.abbidot.tracker.diff.PaymentMethodDiffCallBack
 import com.abbidot.tracker.util.Util
@@ -76,7 +76,7 @@ class PaymentMethodPayPalActivity :
 
     override fun initData() {
         super.initData()
-        setTopBarTitle(R.string.txt_pay_order_method)
+        setTopBarTitle(R.string.app_name)
 
         intent.extras?.apply {
             mRechargeDeviceBean = Util.getParcelableAdaptive(
@@ -280,7 +280,7 @@ class PaymentMethodPayPalActivity :
         }
 
         if (selectPaymentMethodIndex == -1) {
-            showToast(R.string.txt_select_payment_method)
+            showToast(R.string.app_name)
             return
         }
         mSelectPaymentMethodIndex = selectPaymentMethodIndex
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodStripeActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodStripeActivity.kt
index 05c1930..11effbb 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodStripeActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/PaymentMethodStripeActivity.kt
@@ -82,7 +82,7 @@ class PaymentMethodStripeActivity :
 
     override fun initData() {
         super.initData()
-        setTopBarTitle(R.string.txt_pay_order_method)
+        setTopBarTitle(R.string.app_name)
 
         intent.extras?.apply {
             mRechargeDeviceBean = Util.getParcelableAdaptive(
@@ -197,7 +197,7 @@ class PaymentMethodStripeActivity :
                     0 -> payPalSuccess()
                     1 -> payPalFail()
                     -1 -> {
-                        showToast(R.string.txt_user_canceled_paypal, true)
+                        showToast(R.string.app_name, true)
                     }
                 }
             }
@@ -351,7 +351,7 @@ class PaymentMethodStripeActivity :
         }
 
         if (selectPaymentMethodIndex == -1) {
-            showToast(R.string.txt_select_payment_method)
+            showToast(R.string.app_name)
             return
         }
         mSelectPaymentMethodIndex = selectPaymentMethodIndex
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeAmountCNActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeAmountCNActivity.kt
index 519be7a..b1dd168 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeAmountCNActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeAmountCNActivity.kt
@@ -33,7 +33,7 @@ class RechargeAmountCNActivity :
 
     override fun initData() {
         super.initData()
-        setTopBarTitle(R.string.txt_pay_amount)
+        setTopBarTitle(R.string.app_name)
 
         //充值设备数据
         mRechargeDeviceBean = Util.getParcelableAdaptive(
@@ -83,7 +83,7 @@ class RechargeAmountCNActivity :
     private fun submitOrder() {
         val index = mRechargeAmountCNAdapter.getSelectIndex()
         if (index == -1) {
-            showToast(R.string.txt_pay_amount)
+            showToast(R.string.app_name)
             return
         }
         val intent = Intent(mContext, RechargeOrderDetailCNActivity::class.java)
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeDeviceDetailCNActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeDeviceDetailCNActivity.kt
index bbff7c6..9a126c1 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeDeviceDetailCNActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeDeviceDetailCNActivity.kt
@@ -42,7 +42,7 @@ class RechargeDeviceDetailCNActivity : BaseActivity<ActivityRechargeDeviceDetail
                 val intent = Intent(mContext, RechargeHistoryCNActivity::class.java)
                 intent.putExtra(ConstantString.DeviceId, mDeviceId)
                 startActivity(intent)
-            }, getString(R.string.txt_card_history))
+            }, getString(R.string.app_name))
             detailText = ""
         }
 
@@ -102,10 +102,6 @@ class RechargeDeviceDetailCNActivity : BaseActivity<ActivityRechargeDeviceDetail
                     if (TextUtils.isEmpty(rechargeDeviceBean.period)) {
                         rechargeDeviceBean.period = "0"
                     }
-                    val subscriptionPlanString =
-                        String.format(getString(R.string.txt_surplus_day_how),
-                                rechargeDeviceBean.surplusDays)
-                    it.tvDescriptionSurplusDayContent.text = subscriptionPlanString
                     it.tvDescriptionExpiryDateContent.text = rechargeDeviceBean.overdueDate
                 }
                 break
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeHistoryCNActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeHistoryCNActivity.kt
index bae8cdf..f4b43b7 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeHistoryCNActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeHistoryCNActivity.kt
@@ -25,7 +25,7 @@ class RechargeHistoryCNActivity :
 
     override fun initData() {
         super.initData()
-        setTopBarTitle(R.string.txt_card_history)
+        setTopBarTitle(R.string.app_name)
 
         val deviceId = intent.extras?.getString(ConstantString.DeviceId, "").toString()
 
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt
index 5ccb36a..37d4629 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeOrderDetailCNActivity.kt
@@ -59,7 +59,7 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
 
     override fun initData() {
         super.initData()
-        setTopBarTitle(R.string.txt_pay_order_title)
+        setTopBarTitle(R.string.app_name)
 
         mRechargeDeviceBean = Util.getParcelableAdaptive(
             intent,
@@ -73,7 +73,7 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
             ViewUtil.instance.setShapeRadius(rechargeOrderDetailCnDevice.root, 6)
 //            ViewUtil.instance.setShapeRadius(rechargeOrderDetailCnAmount.root, 6)
             rechargeOrderDetailCnPayWay.let {
-                it.text = getString(R.string.txt_select_payment_method)
+                it.text = getString(R.string.app_name)
                 it.detailTextView.visibility = View.VISIBLE
                 it.detailTextView.background =
                     ContextCompat.getDrawable(mContext, R.drawable.pic_wechatpay)
@@ -200,8 +200,8 @@ class RechargeOrderDetailCNActivity : BaseActivity<ActivityRechargeOrderDetailCn
 
     private fun setSetMeal() {
         mSetMealBean?.apply {
-            val str = getString(R.string.txt_month_until) + "\t$accountFee"
-            mViewBinding.tvNeedPayMoneyCn.text = str
+//            val str = getString(R.string.txt_month_until) + "\t$accountFee"
+//            mViewBinding.tvNeedPayMoneyCn.text = str
 //            mViewBinding.rechargeOrderDetailCnAmount.let {
 //                if (hotType == ConstantInt.Type1) {
 //                    it.rechargeAmountNormalHotImage.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/ui/fragment/login/BindPhoneCNFragment.kt b/app/src/main/java/com/abbidot/tracker/deprecated/ui/fragment/login/BindPhoneCNFragment.kt
index c7db58f..3622549 100644
--- a/app/src/main/java/com/abbidot/tracker/deprecated/ui/fragment/login/BindPhoneCNFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/ui/fragment/login/BindPhoneCNFragment.kt
@@ -34,8 +34,8 @@ class BindPhoneCNFragment :
     override fun initData() {
         super.initData()
         val activity = activity as LoginRegisterCNActivity
-        activity.setTopTitle(getString(R.string.login_txt_login_first))
-        activity.setTopContent(getString(R.string.login_txt_login_bind_phone))
+        activity.setTopTitle(getString(R.string.app_name))
+        activity.setTopContent(getString(R.string.app_name))
 
         mViewBinding.apply {
             setOnClickListenerViews(llBindPhoneGetPhoneCode.btnGetCode, btnBindBindPhoneCn)
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/InviteFamilyActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/InviteFamilyActivity.kt
index 4545af4..ccd94c0 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/InviteFamilyActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/InviteFamilyActivity.kt
@@ -117,18 +117,18 @@ class InviteFamilyActivity :
             selected = true
             relationList.add(this)
         }
-        DataBean().apply {
-            name = getString(R.string.txt_friend)
-            relationList.add(this)
-        }
-        DataBean().apply {
-            name = getString(R.string.txt_love)
-            relationList.add(this)
-        }
-        DataBean().apply {
-            name = getString(R.string.txt_colleague)
-            relationList.add(this)
-        }
+//        DataBean().apply {
+//            name = getString(R.string.txt_friend)
+//            relationList.add(this)
+//        }
+//        DataBean().apply {
+//            name = getString(R.string.txt_love)
+//            relationList.add(this)
+//        }
+//        DataBean().apply {
+//            name = getString(R.string.txt_colleague)
+//            relationList.add(this)
+//        }
         mRelationAdapter = FamilyRelationAdapter(mContext, relationList).apply {
             setOnItemClickListener(object : BaseRecyclerAdapter.OnItemClickListener {
                 override fun onItemClick(itemView: View?, pos: Int) {
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionDetailActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionDetailActivity.kt
deleted file mode 100644
index 4ad1f19..0000000
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionDetailActivity.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.abbidot.tracker.ui.activity.subscribe
-
-import android.content.Intent
-import android.view.View
-import androidx.activity.viewModels
-import com.abbidot.baselibrary.util.Utils
-import com.abbidot.tracker.R
-import com.abbidot.tracker.base.BaseActivity
-import com.abbidot.tracker.bean.SetMealBean
-import com.abbidot.tracker.constant.ConstantInt
-import com.abbidot.tracker.constant.ConstantString
-import com.abbidot.tracker.databinding.ActivitySubscriptionDetailBinding
-import com.abbidot.tracker.util.Util
-import com.abbidot.tracker.vm.CountDownTimerViewModel
-
-class SubscriptionDetailActivity :
-    BaseActivity<ActivitySubscriptionDetailBinding>(ActivitySubscriptionDetailBinding::inflate) {
-
-    private val mCountDownTimerViewModel: CountDownTimerViewModel by viewModels()
-
-    private var mSetMealBean: SetMealBean? = null
-
-    override fun getTopBar() = mViewBinding.ilSubscribeDetailTopBar.titleTopBar
-
-    override fun initData() {
-        super.initData()
-        setTopBarTitle(R.string.txt_subscription_detail)
-        setLeftBackImage(R.drawable.icon_white_back_svg)
-
-        intent.extras?.apply {
-            mSetMealBean =
-                Util.getParcelableAdaptive(intent, ConstantString.SetMeal, SetMealBean::class.java)
-        }
-
-        mViewBinding.apply {
-            mSetMealBean?.let {
-                tvSubscribeDetailDeviceOutId.text = it.mealId
-                tvSubscribeDetailPlanType.text = if (it.hotType == ConstantInt.Type0) {
-                    btnSubscribeDetailEnd.visibility = View.VISIBLE
-                    ilSubscribeDetailCountDown.root.visibility = View.GONE
-                    btnSubscribeDetailRecharge.visibility = View.GONE
-                    getString(R.string.txt_auto_renew)
-                } else {
-                    btnSubscribeDetailRecharge.visibility = View.VISIBLE
-                    ilSubscribeDetailCountDown.root.visibility = View.VISIBLE
-                    btnSubscribeDetailEnd.visibility = View.GONE
-                    mCountDownTimerViewModel.startCountDown(
-                        (it.createdDate.toLong() - System.currentTimeMillis()) / 1000, 60
-                    )
-                    it.name
-                }
-                tvSubscribeDetailRenewYear.text =
-                    String.format(mContext.getString(R.string.txt_renew_year), "${it.accountFee}")
-                tvSubscribeDetailRenewsOn.text =
-                    Utils.formatTime(it.createdDate.toLong(), Utils.DATE_FORMAT_PATTERN_EN6)
-            }
-            setOnClickListenerViews(btnSubscribeDetailRecharge, btnSubscribeDetailEnd)
-        }
-    }
-
-    override fun liveDataObserve() {
-        mCountDownTimerViewModel.mCountDowningLiveData.observe(this) {
-            mViewBinding.ilSubscribeDetailCountDown.apply {
-                val times = Utils.getSecondToDayHourMin(it)
-                tvAddSuccessDeviceExpiresDays.text = times[0]
-                tvAddSuccessDeviceExpiresHours.text = times[1]
-                tvAddSuccessDeviceExpiresMin.text = times[2]
-            }
-        }
-    }
-
-    override fun onClick(v: View?) {
-        mViewBinding.apply {
-            when (v!!) {
-                btnSubscribeDetailEnd -> finish()
-                btnSubscribeDetailRecharge -> startActivity(
-                    Intent(
-                        mContext, SubscriptionPlanActivity::class.java
-                    )
-                )
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
index 5944524..7689fb2 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
@@ -69,7 +69,7 @@ class ActivityV2Fragment :
                     ContextCompat.getDrawable(mContext!!, R.drawable.shape8_gray_yellow_bg)
                 val tColor = ContextCompat.getColor(mContext!!, R.color.data_black_color)
                 it.ivSportTimeType.setImageResource(R.drawable.icon_active_time)
-                it.tvSportTimeTitle.text = getText(R.string.data_active_other_time)
+                it.tvSportTimeTitle.text = getText(R.string.data_active_time)
                 it.tvSportTimeTitle.setTextColor(tColor)
                 it.tvSportTimeContent.setTextColor(tColor)
             }
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt
index b00339e..1b53aa0 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt
@@ -655,11 +655,11 @@ class HomeTrackFragment :
      */
     private fun setStateData(mapDeviceBean: MapDeviceBean) {
         mapDeviceBean.apply {
-            val startTime = "${getString(R.string.txt_start_time)}:${
-                startTime.split(" ")[0].replace(
-                    "-", "."
-                )
-            }"
+//            val startTime = "${getString(R.string.txt_start_time)}:${
+//                startTime.split(" ")[0].replace(
+//                    "-", "."
+//                )
+//            }"
             val eTime = Utils.stringToDate(
                 endTime, Utils.DATE_FORMAT_PATTERN_CN, Utils.DATE_FORMAT_PATTERN_CN
             )
diff --git a/app/src/main/java/com/abbidot/tracker/widget/BrowserView.java b/app/src/main/java/com/abbidot/tracker/widget/BrowserView.java
index e5bf051..a112232 100644
--- a/app/src/main/java/com/abbidot/tracker/widget/BrowserView.java
+++ b/app/src/main/java/com/abbidot/tracker/widget/BrowserView.java
@@ -58,6 +58,8 @@ public final class BrowserView extends WebView {
         WebSettings settings = getSettings();
         // 允许文件访问
         settings.setAllowFileAccess(true);
+        // 缓存策略：推荐LOAD_DEFAULT，不要无脑LOAD_NO_CACHE（加剧请求压力）
+        settings.setCacheMode(WebSettings.LOAD_DEFAULT);
         // 允许网页定位
         settings.setGeolocationEnabled(true);
         // 允许保存密码
@@ -70,11 +72,12 @@ public final class BrowserView extends WebView {
         settings.setLoadsImagesAutomatically(true);
         // 本地 DOM 存储（解决加载某些网页出现白板现象）
         settings.setDomStorageEnabled(true);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            // 解决 Android 5.0 上 WebView 默认不允许加载 Http 与 Https 混合内容
-            settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
-        }
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//            // 解决 Android 5.0 上 WebView 默认不允许加载 Http 与 Https 混合内容
+//            settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//        }
+        // 解决 Android 5.0 上 WebView 默认不允许加载 Http 与 Https 混合内容
+        settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
 
         // 不显示滚动条
         setVerticalScrollBarEnabled(false);
@@ -332,15 +335,15 @@ public final class BrowserView extends WebView {
                         }
 
                         @Override
-                public void onRequestError(@Nullable String exceptionCode) {
-                }
+                        public void onRequestError(@Nullable String exceptionCode) {
+                        }
 
-                @Override
-                public void onResult(@NonNull Object any) {
-                    String str = any.toString();
-                    result.confirm(str);
-                }
-            }, InputType.TYPE_CLASS_TEXT, 100);
+                        @Override
+                        public void onResult(@NonNull Object any) {
+                            String str = any.toString();
+                            result.confirm(str);
+                        }
+                    }, InputType.TYPE_CLASS_TEXT, 100);
             return true;
         }
 
@@ -357,19 +360,19 @@ public final class BrowserView extends WebView {
                                          FileChooserParams params) {
             Util.Companion.checkPermissions((BaseActivity) (mWebView.getContext()),
                     new Util.RequestPermissionCallback() {
-                @Override
-                public void onRequestPermissionSuccess() {
-                    openSystemFileChooser((BaseActivity) (mWebView.getContext()), callback, params);
-                }
+                        @Override
+                        public void onRequestPermissionSuccess() {
+                            openSystemFileChooser((BaseActivity) (mWebView.getContext()), callback, params);
+                        }
 
-                @Override
-                public void onRequestPermissionFail() {
-                    callback.onReceiveValue(null);
-                    XXPermissions.startPermissionActivity((BaseActivity) (mWebView.getContext()),
-                            PermissionLists.getWriteExternalStoragePermission(),
-                            PermissionLists.getReadExternalStoragePermission());
-                }
-            }, "网页弹出选择文件请求", PermissionLists.getWriteExternalStoragePermission(),
+                        @Override
+                        public void onRequestPermissionFail() {
+                            callback.onReceiveValue(null);
+                            XXPermissions.startPermissionActivity((BaseActivity) (mWebView.getContext()),
+                                    PermissionLists.getWriteExternalStoragePermission(),
+                                    PermissionLists.getReadExternalStoragePermission());
+                        }
+                    }, "网页弹出选择文件请求", PermissionLists.getWriteExternalStoragePermission(),
                     PermissionLists.getReadExternalStoragePermission());
 
             return true;
diff --git a/app/src/main/java/com/abbidot/tracker/wxapi/WXPayEntryActivity.kt b/app/src/main/java/com/abbidot/tracker/wxapi/WXPayEntryActivity.kt
index b23ddcd..aa0aada 100644
--- a/app/src/main/java/com/abbidot/tracker/wxapi/WXPayEntryActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/wxapi/WXPayEntryActivity.kt
@@ -40,5 +40,4 @@ class WXPayEntryActivity : WXBaseActivity() {
         }
         finish()
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_edit_fences_zone.xml b/app/src/main/res/layout/activity_add_edit_fences_zone.xml
index fd0d755..ad4af98 100644
--- a/app/src/main/res/layout/activity_add_edit_fences_zone.xml
+++ b/app/src/main/res/layout/activity_add_edit_fences_zone.xml
@@ -86,7 +86,6 @@
             android:layout_alignParentEnd="true"
             android:background="@drawable/selector_transparent_pressed"
             android:padding="@dimen/dp_8"
-            android:text="@string/txt_reset"
             android:textAllCaps="true"
             android:textColor="@color/select_color"
             android:textSize="@dimen/textSize12"
diff --git a/app/src/main/res/layout/activity_first_set_pet_height.xml b/app/src/main/res/layout/activity_first_set_pet_height.xml
index 9ebe555..5c77363 100644
--- a/app/src/main/res/layout/activity_first_set_pet_height.xml
+++ b/app/src/main/res/layout/activity_first_set_pet_height.xml
@@ -23,7 +23,6 @@
             <com.abbidot.tracker.widget.TypefaceTextView
                 style="@style/my_second_bold_title_TextView_style"
                 android:layout_marginTop="@dimen/dp_8"
-                android:text="@string/txt_your_height"
                 app:lineHeight="@dimen/textSize32" />
 
             <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/activity_first_set_pet_weight.xml b/app/src/main/res/layout/activity_first_set_pet_weight.xml
index 58d904b..24aaeea 100644
--- a/app/src/main/res/layout/activity_first_set_pet_weight.xml
+++ b/app/src/main/res/layout/activity_first_set_pet_weight.xml
@@ -22,7 +22,6 @@
             <com.abbidot.tracker.widget.TypefaceTextView
                 style="@style/my_second_bold_title_TextView_style"
                 android:layout_marginTop="@dimen/dp_8"
-                android:text="@string/txt_your_weight"
                 app:lineHeight="@dimen/textSize32" />
 
             <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/activity_invite_family.xml b/app/src/main/res/layout/activity_invite_family.xml
index b905cd4..51863ef 100644
--- a/app/src/main/res/layout/activity_invite_family.xml
+++ b/app/src/main/res/layout/activity_invite_family.xml
@@ -42,14 +42,6 @@
                 android:visibility="gone"
                 app:typeface="@string/roboto_regular_font" />
 
-            <com.abbidot.tracker.widget.TypefaceTextView
-                style="@style/my_TextView_style_v2"
-                android:layout_marginStart="@dimen/dp_20"
-                android:layout_marginTop="@dimen/dp_16"
-                android:text="@string/txt_relation"
-                android:textSize="@dimen/textSize14"
-                android:visibility="gone"
-                app:typeface="@string/roboto_bold_font" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_invite_family_relation"
diff --git a/app/src/main/res/layout/activity_map_live.xml b/app/src/main/res/layout/activity_map_live.xml
index 01eeb24..dc36dd9 100644
--- a/app/src/main/res/layout/activity_map_live.xml
+++ b/app/src/main/res/layout/activity_map_live.xml
@@ -59,7 +59,7 @@
             android:layout_width="wrap_content"
             android:gravity="start"
             android:padding="@dimen/dp_22"
-            android:text="@string/map_live_detail"
+            android:text="@string/app_name"
             android:textSize="@dimen/textSize16"
             app:typeface="@string/roboto_regular_font" />
 
diff --git a/app/src/main/res/layout/activity_more_activity.xml b/app/src/main/res/layout/activity_more_activity.xml
index 582ff07..657222a 100644
--- a/app/src/main/res/layout/activity_more_activity.xml
+++ b/app/src/main/res/layout/activity_more_activity.xml
@@ -362,7 +362,6 @@
                         style="@style/my_TextView_style_v2"
                         android:drawableStart="@drawable/icon_total_distance_svg"
                         android:drawablePadding="@dimen/dp_6"
-                        android:text="@string/txt_total_distance"
                         android:textSize="@dimen/textSize14"
                         app:typeface="@string/roboto_regular_font" />
 
diff --git a/app/src/main/res/layout/activity_recharge_amount_cn.xml b/app/src/main/res/layout/activity_recharge_amount_cn.xml
index 09e405d..5844f8d 100644
--- a/app/src/main/res/layout/activity_recharge_amount_cn.xml
+++ b/app/src/main/res/layout/activity_recharge_amount_cn.xml
@@ -40,7 +40,7 @@
         style="@style/my_QMUIRoundButton_big_style"
         android:layout_gravity="center"
         android:layout_marginBottom="@dimen/dp_60"
-        android:text="@string/txt_submit_order"
+        android:text="@string/app_name"
         app:qmui_backgroundColor="@color/btn_yellow_color"
         app:typeface="@string/roboto_regular_font" />
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_recharge_order_detail_cn.xml b/app/src/main/res/layout/activity_recharge_order_detail_cn.xml
index 164b7a1..32c4b0b 100644
--- a/app/src/main/res/layout/activity_recharge_order_detail_cn.xml
+++ b/app/src/main/res/layout/activity_recharge_order_detail_cn.xml
@@ -58,7 +58,6 @@
             android:id="@+id/tv_need_pay_money_cn"
             style="@style/my_TextView_style"
             android:layout_width="wrap_content"
-            android:text="@string/txt_month_until"
             android:textSize="@dimen/textSize14"
             app:typeface="@string/roboto_regular_font" />
 
@@ -79,7 +78,7 @@
         <com.abbidot.tracker.widget.TypefaceRoundButton
             android:id="@+id/start_pay_money_btn_cn"
             style="@style/my_QMUIRoundButton_small_style"
-            android:text="@string/txt_pay_order_pay"
+            android:text="@string/app_name"
             app:qmui_backgroundColor="@color/btn_yellow_color"
             app:typeface="@string/roboto_bold_font" />
 
diff --git a/app/src/main/res/layout/activity_select_payment_method.xml b/app/src/main/res/layout/activity_select_payment_method.xml
index c590c40..72fc206 100644
--- a/app/src/main/res/layout/activity_select_payment_method.xml
+++ b/app/src/main/res/layout/activity_select_payment_method.xml
@@ -28,7 +28,7 @@
         style="@style/my_QMUIRoundButton_big_style"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="@dimen/dp_60"
-        android:text="@string/txt_pay_order_Confirm"
+        android:text="@string/app_name"
         app:qmui_backgroundColor="@color/btn_yellow_color"
         app:typeface="@string/roboto_bold_font" />
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_subscription_detail.xml b/app/src/main/res/layout/activity_subscription_detail.xml
deleted file mode 100644
index 489d69f..0000000
--- a/app/src/main/res/layout/activity_subscription_detail.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat 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="match_parent"
-    android:orientation="vertical"
-    tools:context=".ui.activity.subscribe.SubscriptionDetailActivity">
-
-    <include
-        android:id="@+id/il_subscribe_detail_top_bar"
-        layout="@layout/layout_top_bar" />
-
-    <androidx.core.widget.NestedScrollView
-        style="@style/my_ScrollView_style"
-        android:layout_weight="1">
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_100"
-                android:layout_marginTop="@dimen/dp_16"
-                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_20"
-                android:text="@string/txt_tracker_id"
-                android:textSize="@dimen/textSize16"
-                app:typeface="@string/roboto_regular_font" />
-
-            <com.abbidot.tracker.widget.TypefaceTextView
-                android:id="@+id/tv_subscribe_detail_device_out_id"
-                style="@style/my_TextView_style_v2"
-                android:layout_width="match_parent"
-                android:layout_marginTop="@dimen/dp_14"
-                android:text="@string/app_name"
-                android:textSize="@dimen/textSize36"
-                android:textStyle="bold" />
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_40"
-                android:layout_marginTop="@dimen/dp_28"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.abbidot.tracker.widget.TypefaceTextView
-                    style="@style/my_TextView_style_v2"
-                    android:text="@string/txt_plan"
-                    android:textSize="@dimen/textSize16"
-                    android:textStyle="bold" />
-
-                <com.abbidot.tracker.widget.TypefaceTextView
-                    android:id="@+id/tv_subscribe_detail_plan_type"
-                    style="@style/my_TextView_style_v2"
-                    android:layout_marginStart="@dimen/dp_4"
-                    android:text="@string/app_name"
-                    android:textSize="@dimen/textSize14"
-                    app:typeface="@string/roboto_regular_font" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <com.abbidot.tracker.widget.TypefaceTextView
-                android:id="@+id/tv_subscribe_detail_renew_year"
-                style="@style/my_TextView_style_v2"
-                android:layout_marginStart="@dimen/dp_40"
-                android:layout_marginTop="@dimen/dp_6"
-                android:text="@string/txt_renew_year"
-                android:textSize="@dimen/textSize14"
-                app:typeface="@string/roboto_regular_font" />
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_40"
-                android:layout_marginTop="@dimen/dp_28"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <com.abbidot.tracker.widget.TypefaceTextView
-                    style="@style/my_TextView_style_v2"
-                    android:text="@string/txt_renews_on"
-                    android:textSize="@dimen/textSize16"
-                    android:textStyle="bold" />
-
-                <com.abbidot.tracker.widget.TypefaceTextView
-                    android:id="@+id/tv_subscribe_detail_renews_on"
-                    style="@style/my_TextView_style_v2"
-                    android:layout_marginStart="@dimen/dp_4"
-                    android:text="@string/app_name"
-                    android:textSize="@dimen/textSize14"
-                    app:typeface="@string/roboto_regular_font" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <include
-                android:id="@+id/il_subscribe_detail_count_down"
-                layout="@layout/layout_subscribe_count_down"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_40"
-                android:layout_marginTop="@dimen/dp_16" />
-        </androidx.appcompat.widget.LinearLayoutCompat>
-    </androidx.core.widget.NestedScrollView>
-
-    <com.abbidot.tracker.widget.TypefaceButton
-        android:id="@+id/btn_subscribe_detail_recharge"
-        style="@style/my_match_RoundRect_Button_style"
-        android:layout_marginHorizontal="@dimen/dp_16"
-        android:text="@string/txt_card_recharge"
-        app:qmui_radius="@dimen/dp_64"
-        app:typeface="@string/roboto_bold_font" />
-
-    <com.abbidot.tracker.widget.TypefaceButton
-        android:id="@+id/btn_subscribe_detail_end"
-        style="@style/my_match_RoundRect_Button_style"
-        android:layout_marginHorizontal="@dimen/dp_16"
-        android:background="@color/white_gray_color"
-        android:text="@string/txt_stop_renew"
-        app:qmui_radius="@dimen/dp_64"
-        app:typeface="@string/roboto_bold_font" />
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sure_subscription_plan.xml b/app/src/main/res/layout/activity_sure_subscription_plan.xml
index d3bb7ce..ca4939f 100644
--- a/app/src/main/res/layout/activity_sure_subscription_plan.xml
+++ b/app/src/main/res/layout/activity_sure_subscription_plan.xml
@@ -47,7 +47,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:background="@drawable/shape8_gray_border_white_bg"
-                    android:hint="@string/txt_enter_discount_code"
+                    android:hint="输入折扣码"
                     android:paddingHorizontal="@dimen/dp_12"
                     android:paddingVertical="@dimen/dp_10"
                     android:textSize="@dimen/textSize14" />
@@ -58,7 +58,7 @@
                     android:layout_marginStart="@dimen/dp_16"
                     android:paddingHorizontal="@dimen/dp_22"
                     android:paddingVertical="@dimen/dp_6"
-                    android:text="@string/txt_check"
+                    android:text="验证"
                     android:textColor="@color/white"
                     android:textSize="@dimen/textSize18"
                     app:qmui_backgroundColor="@color/line_color1"
diff --git a/app/src/main/res/layout/fragment_home_pet.xml b/app/src/main/res/layout/fragment_home_pet.xml
index deed188..b270ec5 100644
--- a/app/src/main/res/layout/fragment_home_pet.xml
+++ b/app/src/main/res/layout/fragment_home_pet.xml
@@ -29,7 +29,7 @@
             <com.abbidot.tracker.widget.TypefaceTextView
                 android:id="@+id/tv_home_pet_v2_about"
                 style="@style/my_TextView_style_v2"
-                android:text="@string/pet_manage_detail_title1"
+                android:text="@string/txt_setting_about"
                 android:textStyle="bold" />
 
             <com.abbidot.tracker.widget.TypefaceRoundButton
diff --git a/app/src/main/res/layout/fragment_home_track.xml b/app/src/main/res/layout/fragment_home_track.xml
index 63afe22..643b063 100644
--- a/app/src/main/res/layout/fragment_home_track.xml
+++ b/app/src/main/res/layout/fragment_home_track.xml
@@ -40,7 +40,6 @@
                 android:layout_alignTop="@id/iv_home_pet_track_pet_head"
                 android:layout_alignBottom="@id/iv_home_pet_track_pet_head"
                 android:layout_marginTop="@dimen/dp_6"
-                android:text="@string/txt_start_time"
                 android:textColor="@color/select_color3"
                 android:textSize="@dimen/textSize14"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_payment_fail.xml b/app/src/main/res/layout/fragment_payment_fail.xml
index 1802262..f44efb5 100644
--- a/app/src/main/res/layout/fragment_payment_fail.xml
+++ b/app/src/main/res/layout/fragment_payment_fail.xml
@@ -17,7 +17,7 @@
         style="@style/my_TextView_style"
         android:layout_below="@id/payment_fail_lottie_animation"
         android:layout_marginTop="@dimen/dp_18"
-        android:text="@string/txt_pay_order_payment_fail"
+        android:text="@string/app_name"
         android:textColor="@color/deepGray"
         android:textSize="@dimen/textSize14"
         app:typeface="@string/roboto_regular_font" />
diff --git a/app/src/main/res/layout/fragment_payment_success.xml b/app/src/main/res/layout/fragment_payment_success.xml
index 88ec8ec..f9fc1be 100644
--- a/app/src/main/res/layout/fragment_payment_success.xml
+++ b/app/src/main/res/layout/fragment_payment_success.xml
@@ -24,7 +24,7 @@
     <com.abbidot.tracker.widget.TypefaceTextView
         style="@style/my_TextView_style"
         android:layout_marginTop="@dimen/dp_8"
-        android:text="@string/txt_pay_order_payment_succ"
+        android:text="@string/app_name"
         android:textColor="@color/deepGray"
         android:textSize="@dimen/textSize14"
         app:typeface="@string/roboto_regular_font" />
diff --git a/app/src/main/res/layout/fragment_route_v2.xml b/app/src/main/res/layout/fragment_route_v2.xml
index 3a7d2bb..9ab509d 100644
--- a/app/src/main/res/layout/fragment_route_v2.xml
+++ b/app/src/main/res/layout/fragment_route_v2.xml
@@ -101,7 +101,6 @@
             style="@style/my_TextView_style_v2"
             android:layout_alignTop="@id/ll_home_route_calendar_from"
             android:layout_alignBottom="@id/ll_home_route_calendar_from"
-            android:text="@string/txt_from"
             android:textColor="@color/white"
             android:textSize="@dimen/textSize14"
             app:typeface="@string/roboto_regular_font" />
@@ -143,7 +142,6 @@
             android:layout_alignStart="@id/tv_home_route_calendar_from_txt"
             android:layout_alignTop="@id/ll_home_route_calendar_to"
             android:layout_alignBottom="@id/ll_home_route_calendar_to"
-            android:text="@string/txt_to"
             android:textColor="@color/white"
             android:textSize="@dimen/textSize14"
             app:typeface="@string/roboto_regular_font" />
diff --git a/app/src/main/res/layout/item_recharge_amount_cn.xml b/app/src/main/res/layout/item_recharge_amount_cn.xml
index 33cea33..fefc2f6 100644
--- a/app/src/main/res/layout/item_recharge_amount_cn.xml
+++ b/app/src/main/res/layout/item_recharge_amount_cn.xml
@@ -47,7 +47,6 @@
             android:layout_alignBaseline="@id/recharge_amount_cn_two_money"
             android:layout_marginEnd="@dimen/dp_4"
             android:layout_toStartOf="@id/recharge_amount_cn_two_money"
-            android:text="@string/txt_month_until"
             android:textColor="@color/white"
             android:textSize="@dimen/textSize16"
             app:typeface="@string/roboto_regular_font" />
diff --git a/app/src/main/res/layout/item_recharge_device.xml b/app/src/main/res/layout/item_recharge_device.xml
index 9341e5c..4002f0e 100644
--- a/app/src/main/res/layout/item_recharge_device.xml
+++ b/app/src/main/res/layout/item_recharge_device.xml
@@ -76,7 +76,7 @@
         android:layout_alignBaseline="@id/item_card_day_number"
         android:layout_marginBottom="@dimen/dp_2"
         android:layout_toEndOf="@id/item_card_day_number"
-        android:text="@string/txt_card_list_time"
+        android:text="@string/app_name"
         android:textSize="@dimen/textSize16"
         app:typeface="@string/roboto_regular_font" />
 
diff --git a/app/src/main/res/layout/item_recharge_history_cn.xml b/app/src/main/res/layout/item_recharge_history_cn.xml
index 73b1c07..b98393e 100644
--- a/app/src/main/res/layout/item_recharge_history_cn.xml
+++ b/app/src/main/res/layout/item_recharge_history_cn.xml
@@ -23,7 +23,6 @@
         android:layout_below="@id/recharge_history_cn_meal_name"
         android:layout_alignStart="@id/recharge_history_cn_meal_name"
         android:layout_marginTop="@dimen/dp_2"
-        android:text="@string/txt_tracker_name"
         android:textColor="@color/title_color"
         android:textSize="@dimen/textSize12"
         app:typeface="@string/roboto_regular_font" />
@@ -35,7 +34,6 @@
         android:layout_below="@id/recharge_history_cn_device_name"
         android:layout_alignStart="@id/recharge_history_cn_device_name"
         android:layout_marginTop="@dimen/dp_2"
-        android:text="@string/txt_reset_active"
         android:visibility="gone"
         android:textColor="@color/title_color"
         android:textSize="@dimen/textSize12"
diff --git a/app/src/main/res/layout/layout_device_recharge_describe_cn.xml b/app/src/main/res/layout/layout_device_recharge_describe_cn.xml
index feda353..bfa4702 100644
--- a/app/src/main/res/layout/layout_device_recharge_describe_cn.xml
+++ b/app/src/main/res/layout/layout_device_recharge_describe_cn.xml
@@ -10,7 +10,6 @@
         android:id="@+id/tv_description_surplus_day_title"
         style="@style/my_TextView_style"
         android:layout_width="wrap_content"
-        android:text="@string/txt_surplus_day"
         android:textColor="@color/tab_select"
         android:textSize="@dimen/textSize12"
         app:typeface="@string/roboto_regular_font" />
@@ -21,7 +20,6 @@
         style="@style/my_TextView_style"
         android:layout_width="wrap_content"
         android:layout_toEndOf="@id/tv_description_surplus_day_title"
-        tools:text="@string/txt_surplus_day_how"
         android:textSize="@dimen/textSize12"
         app:typeface="@string/roboto_regular_font" />
 
@@ -32,7 +30,6 @@
         android:layout_width="wrap_content"
         android:layout_below="@id/tv_description_surplus_day_title"
         android:layout_marginTop="@dimen/dp_8"
-        android:text="@string/txt_expiry_date"
         android:textColor="@color/tab_select"
         android:textSize="@dimen/textSize12"
         app:typeface="@string/roboto_regular_font" />
diff --git a/app/src/main/res/layout/layout_live_v2_data_info.xml b/app/src/main/res/layout/layout_live_v2_data_info.xml
index b0745ff..59a5b0c 100644
--- a/app/src/main/res/layout/layout_live_v2_data_info.xml
+++ b/app/src/main/res/layout/layout_live_v2_data_info.xml
@@ -13,7 +13,6 @@
         android:layout_centerHorizontal="true"
         android:drawableBottom="@drawable/icon_map_navigation_svg"
         android:drawablePadding="@dimen/dp_6"
-        android:text="@string/txt_direction"
         android:textColor="@color/select_color3"
         android:textSize="@dimen/textSize12"
         android:visibility="invisible"
@@ -48,7 +47,6 @@
         android:layout_above="@id/tv_live_v2_speed"
         android:layout_alignStart="@id/il_live_v2_data_light_switch"
         android:layout_alignEnd="@id/il_live_v2_data_light_switch"
-        android:text="@string/txt_speed"
         android:textColor="@color/select_color3"
         android:textSize="@dimen/textSize12"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/layout_sport_data.xml b/app/src/main/res/layout/layout_sport_data.xml
index 62c6485..8911f06 100644
--- a/app/src/main/res/layout/layout_sport_data.xml
+++ b/app/src/main/res/layout/layout_sport_data.xml
@@ -18,7 +18,7 @@
         style="@style/my_TextView_style_v2"
         android:layout_marginStart="@dimen/dp_4"
         android:layout_toEndOf="@id/iv_sport_data_type"
-        android:text="@string/data_active_distance"
+        android:text="@string/app_name"
         android:textColor="@color/select_color3"
         android:textSize="@dimen/textSize12"
         app:typeface="@string/roboto_regular_font" />
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6297885..ce43e7e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -278,58 +278,43 @@
     <string name="tracker_manage_set_add_family_back">返回</string>
     <string name="tracker_manage_set_duration">追踪间隔</string>
 
-    <string name="tracker_manage_set_fence_title">围栏</string>
-    <string name="tracker_manage_set_fence_detail">围栏详情</string>
     <string name="tracker_manage_set_fence_name">名称</string>
     <string name="tracker_manage_set_fence_shape">形式</string>
     <string name="tracker_manage_set_fence_activate">启用围栏</string>
-    <string name="tracker_manage_set_fence_radius">半径</string>
+
     <string name="tracker_manage_set_finish">完成</string>
-    <string name="tracker_manage_set_led_current">当前</string>
+
     <string name="tracker_light_mode_sustained">常亮</string>
     <string name="tracker_light_mode_breathing">呼吸</string>
-    <string name="tracker_light_mode_slow_flash">慢闪</string>
+
     <string name="tracker_light_mode_flash">快闪</string>
     <string name="pet_manage">我的宠物</string>
-    <string name="pet_manage_title">宠物</string>
-    <string name="pet_manage_mine">我的宠物</string>
-    <string name="pet_manage_authorized">分享的</string>
+
     <string name="pet_manage_gender_male">雄</string>
     <string name="pet_manage_gender_female">雌</string>
-    <string name="pet_manage_detail_title1">关于</string>
+
     <string name="pet_manage_detail_edit">编辑</string>
     <string name="pet_manage_detail_title2">活动勋章</string>
-    <string name="nofification_edit_all">全选</string>
-    <string name="nofification_edit_cancel">取消全选</string>
-    <string name="map_current_low_power">电量低</string>
+
     <string name="map_live_btn_stop">停止直播</string>
-    <string name="map_live_detail">直播会及时更新位置，但是会比较耗电</string>
+
     <string name="map_navigate_select_map">选择地图</string>
     <string name="map_navigate_map_google">谷歌地图</string>
     <string name="map_navigate_map_gaode">高德地图</string>
     <string name="map_navigate_cancel">取消</string>
     <string name="txt_no_install">APP未安装，请先下载安装</string>
     <string name="data_active_time">运动时间</string>
-    <string name="data_active_goal">目标</string>
-    <string name="data_active_distance">里程</string>
+
+
     <string name="data_active_calories">卡路里</string>
-    <string name="data_active_persisted">追踪时间</string>
-    <string name="data_active_sleep_time">睡眠时间</string>
-    <string name="data_active_other_time">运动时间</string>
-    <string name="data_active_history">历史</string>
-    <string name="data_active_detail">历史记录</string>
+
     <string name="data_active_goal_set">设置目标</string>
     <string name="data_active_btn_change">修改</string>
     <string name="data_active_btn_current">当前</string>
-    <string name="data_history_show_track">轨迹</string>
-    <string name="data_history_show_point">点</string>
     <string name="data_active_unit_min">分钟</string>
-    <string name="data_active_unit_step">步</string>
     <string name="data_active_unit_distance">米</string>
     <string name="data_active_unit_calorie">大卡</string>
-    <string name="data_active_unit_persisted">天</string>
     <string name="txt_not_null">请完整填写</string>
-    <string name="txt_not_email">电子邮件格式不正确</string>
     <string name="txt_successful">成功</string>
     <string name="txt_upload_successful">上传成功</string>
     <string name="txt_add_successful">添加成功</string>
@@ -338,18 +323,14 @@
     <string name="txt_change_successful">修改成功</string>
     <string name="txt_tips">提示</string>
     <string name="txt_add_fences">添加围栏</string>
-    <string name="txt_edit_fences">编辑围栏</string>
-    <string name="txt_forgot_password">忘记密码</string>
     <string name="no_data">无数据</string>
     <string name="txt_delete_success">成功删除</string>
     <string name="txt_delete_tips">确定要删除？</string>
     <string name="txt_unbind_tips">确定要解绑设备？</string>
     <string name="txt_unbind_success">解绑成功</string>
     <string name="txt_bind_success">绑定成功</string>
-    <string name="txt_weight_tip">体重必须大于0</string>
     <string name="txt_today">今天</string>
     <string name="txt_min">分钟</string>
-    <string name="txt_step_unit">步</string>
     <string name="txt_distance_unit">英里</string>
     <string name="txt_calorie_unit">大卡</string>
     <string name="txt_persisted_unit">天</string>
@@ -357,15 +338,11 @@
     <string name="txt_stop_live_tips">停止直播？</string>
     <string name="txt_delete">删除</string>
     <string name="txt_cancel">取消</string>
-    <string name="txt_pet_birthdayDate_year">年</string>
     <string name="txt_pet_birthdayDate_mon">月</string>
     <string name="txt_sure">确定</string>
     <string name="txt_notifications">通知</string>
-    <string name="txt_all_select">全选</string>
-    <string name="txt_cancel_all_select">取消全选</string>
     <string name="txt_net_error">请求失败，请重试</string>
     <string name="txt_load_map">地图加载中&#8230;</string>
-    <string name="txt_registered_successfully">注册成功</string>
     <string name="hello_blank_fragment">你好，空白片段</string>
     <string name="selector_folder_all_easy_photos">全部图片</string>
     <string name="selector_folder_all_video_photo_easy_photos">图片和视频</string>
@@ -390,30 +367,13 @@
     <string name="text_sticker_hint_name_easy_photos">自定义</string>
     <string name="picture_selection_easy_photos">选择照片</string>
     <string name="gif_easy_photos">GIF</string>
-    <string name="txt_card_list_time">天</string>
     <string name="txt_card_auto_sub">自动订阅：</string>
-    <string name="txt_card_history">充值记录</string>
     <string name="txt_card_recharge">充值</string>
-    <string name="txt_pay_amount">选择套餐</string>
-    <string name="txt_pay_order_title">订单详情</string>
-    <string name="txt_pay_order_subtotal">小计</string>
-    <string name="txt_pay_order_coupon">优惠券</string>
-    <string name="txt_pay_order_code">优惠码</string>
-    <string name="txt_pay_order_integration">积分</string>
     <string name="txt_pay_order_total">总计</string>
-    <string name="txt_pay_order_pay">支付</string>
-    <string name="txt_pay_order_method">付款方式</string>
     <string name="txt_pay_order_add_card">添加新卡</string>
-    <string name="txt_pay_order_Confirm">确认</string>
     <string name="txt_pay_order_payment_title">支付详情</string>
-    <string name="txt_pay_order_payment_succ">支付成功</string>
-    <string name="txt_pay_order_payment_fail">支付失败，请重试</string>
     <string name="txt_pay_order_payment_again">重试</string>
     <string name="txt_pay_order_payment_back">返回</string>
-    <string name="txt_pay_order_detail_plan">订阅计划：</string>
-    <string name="txt_pay_order_detail_interval">付款间隔：</string>
-    <string name="txt_pay_order_detail_date">截止日期：</string>
-    <string name="txt_language">简体中文</string>
     <string name="txt_log_out_tips">确定要退出登录吗?</string>
     <string name="txt_clear_cache_tips">确定要清除缓存？</string>
     <string name="txt_light_mode">灯光模式</string>
@@ -423,7 +383,6 @@
     <string name="txt_loading">加载中...</string>
     <string name="txt_token_overdue">登录失败，请重新登录</string>
     <string name="txt_auto_recharge_title">确定要取消自动订阅？</string>
-    <string name="txt_cancel_subscription_success">自动订阅已成功取消</string>
     <string name="txt_auto_recharge_content">自动订阅更方便，因为您不必担心订阅过期</string>
     <string name="txt_card_number">卡号</string>
     <string name="txt_cardholder_name">持卡人姓名</string>
@@ -431,8 +390,6 @@
     <string name="expiry">截止日期</string>
     <string name="txt_validity_card">MM/YY</string>
     <string name="txt_cvv_card">CVV</string>
-    <string name="txt_select_payment_method">请选择支付方式</string>
-    <string name="txt_user_canceled_paypal">用户取消付款</string>
     <string name="txt_pay_success">支付成功</string>
     <string name="txt_pay_fail">支付失败，请重试</string>
     <string name="txt_card_validity_format">失效日期</string>
@@ -440,9 +397,7 @@
     <string name="txt_turnoff_tips">您确定要关闭设备吗？</string>
     <string name="txt_crop">裁剪图片</string>
     <string name="txt_connecting">连接中&#8230;</string>
-    <string name="txt_close_account">账户注销</string>
     <string name="txt_close_account_tips">注销账户将删除账户下所有的数据,是否继续?</string>
-    <string name="txt_close_account_success">注销成功</string>
     <string name="txt_exit_return">再次返回退出程序</string>
     <string name="txt_user_password_error">用户名或密码错误</string>
     <string name="txt_verify_code_error">验证码错误</string>
@@ -454,20 +409,8 @@
     <string name="txt_disconnect_tips">是否断开连接设备?</string>
     <string name="txt_connect_success">连接成功</string>
     <string name="txt_connect_fail">连接失败</string>
-    <string name="txt_active_success">激活成功</string>
-    <string name="txt_active_fail">激活失败,请重试</string>
-    <string name="login_txt_login_first">首次登录</string>
-    <string name="login_txt_login_bind_phone">请绑定手机</string>
     <string name="txt_register_phone">请输入手机号</string>
     <string name="txt_find_password">找回密码</string>
-    <string name="txt_submit_order">提交订单</string>
-    <string name="txt_month_until">$</string>
-    <string name="txt_surplus_day">剩余可用天数：</string>
-    <string name="txt_expiry_date">有效期:</string>
-    <string name="txt_surplus_day_how">%d天</string>
-    <string name="txt_tracker_name">设备：%s</string>
-    <string name="txt_reset_active">重新激活：%s</string>
-    <string name="txt_total_money">合计：%s</string>
     <string name="txt_about_app_name">爱彼宠物</string>
     <string name="txt_privacy_policy">隐私政策</string>
     <string name="txt_website">官网</string>
@@ -484,7 +427,6 @@
     <string name="txt_accept">我接受</string>
     <string name="txt_deny">拒绝</string>
     <string name="txt_no_down_url">没有下载地址</string>
-    <string name="txt_dfu_tips">是否下载固件并升级?</string>
     <string name="txt_please_wait">请稍等&#8230;</string>
     <string name="txt_release_notes">版本说明</string>
     <string name="txt_firmware_name">固件名称</string>
@@ -512,36 +454,28 @@
     <string name="txt_km">公里</string>
     <string name="txt_sleep">睡眠</string>
     <string name="txt_live">直播</string>
-    <string name="txt_zone">区域</string>
     <string name="txt_tracker">追踪器</string>
     <string name="txt_badges">徽章</string>
     <string name="txt_view_all">查看全部</string>
     <string name="txt_manage">管理</string>
     <string name="txt_time">时间</string>
-    <string name="txt_start_time">开始时间</string>
-    <string name="txt_virtual_fences">虚拟围栏</string>
     <string name="txt_low_zone">WiFi区域</string>
     <string name="txt_connected">已连接</string>
     <string name="txt_weak_signal">信号弱</string>
     <string name="txt_battery">电量</string>
     <string name="txt_bluetooth">蓝牙</string>
     <string name="txt_light">指示灯</string>
-    <string name="txt_from">从</string>
-    <string name="txt_to">到</string>
     <string name="txt_track_and_points">检查轨迹和地点</string>
     <string name="txt_read_all">全部已读</string>
     <string name="txt_subscription">订阅</string>
     <string name="txt_help">帮助</string>
     <string name="txt_tracker_guide">使用说明</string>
-    <string name="txt_features_guide">常见问题</string>
     <string name="txt_measurement_units">单位设置</string>
-    <string name="txt_shop">商店</string>
     <string name="txt_sign_out">退出登录</string>
     <string name="txt_calories_avg">平均卡路里</string>
     <string name="txt_time_avg">平均时间</string>
     <string name="txt_total_data">总数据</string>
     <string name="txt_hrs">小时</string>
-    <string name="txt_total_distance">总距离</string>
     <string name="txt_last_7days">最近7天</string>
     <string name="txt_last_30days">最近30天</string>
     <string name="txt_ok">确定</string>
@@ -569,9 +503,7 @@
     <string name="txt_october_abbr">10月</string>
     <string name="txt_november_abbr">11月</string>
     <string name="txt_december_abbr">12月</string>
-    <string name="txt_direction">方向</string>
     <string name="txt_find_device_tips">声音传播速度加快时，距离更近。</string>
-    <string name="txt_speed">速度</string>
     <string name="txt_stop_radar">停止雷达</string>
     <string name="txt_edit_power_zone">编辑WiFi区域</string>
     <string name="txt_wifi_name">WiFi名称：</string>
@@ -609,18 +541,13 @@
     <string name="txt_members">成员</string>
     <string name="txt_active">活跃中</string>
     <string name="txt_pending">待处理</string>
-    <string name="txt_relation">关系</string>
     <string name="txt_choose_avatar">选择头像</string>
-    <string name="txt_friend">朋友</string>
-    <string name="txt_love">爱人</string>
     <string name="txt_unlock_new_milestones">解锁新成就！</string>
-    <string name="txt_colleague">同事</string>
     <string name="txt_congratulations">恭喜！</string>
     <string name="txt_share">分享</string>
     <string name="txt_login">登录</string>
     <string name="txt_signup">注册</string>
     <string name="txt_create_account">创建账户</string>
-    <string name="txt_create_account_terms2">隐私政策</string>
     <string name="txt_minimum_characters">至少6个字符</string>
     <string name="txt_country">国家/地区</string>
     <string name="txt_email_address">电子邮箱</string>
@@ -633,19 +560,15 @@
     <string name="txt_reset_now">立即重置</string>
     <string name="txt_confirm_password">确认密码</string>
     <string name="txt_pwd_reset_successful">密码重置成功！</string>
-    <string name="txt_reset">重置</string>
     <string name="txt_standard">标准视图</string>
     <string name="txt_satellite">卫星视图</string>
     <string name="txt_display_fences">显示围栏</string>
-    <string name="txt_enter">输入</string>
     <string name="txt_select">选择</string>
     <string name="txt_say_hi_tip">时刻相伴！</string>
     <string name="txt_powered_by">技术支持</string>
     <string name="txt_view_less">收起</string>
     <string name="txt_see_all">查看全部</string>
     <string name="txt_adventure">探险家</string>
-    <string name="txt_social">社交达人</string>
-    <string name="txt_sporty">运动健将</string>
     <string name="txt_new_tracker">新追踪器</string>
     <string name="txt_add_new_tracker">添加追踪器</string>
     <string name="txt_charge_power_on">充电并开机</string>
@@ -669,12 +592,8 @@
     <string name="txt_confirm_plan">确认您的套餐</string>
     <string name="txt_device_number">设备编号</string>
     <string name="txt_terms_conditions_v2">条款与条件</string>
-    <string name="txt_addons">自动续订</string>
-    <string name="txt_insurance">关于自动续订</string>
-    <string name="txt_insurance_tip">您的年度订阅将在每期结束时自动续订，以确保服务不间断。</string>
     <string name="txt_summary">摘要</string>
     <string name="txt_sales_tax">税费</string>
-    <string name="txt_total_tax">含税总计</string>
     <string name="txt_payment_method">支付方式</string>
     <string name="txt_my_card">我的卡片</string>
     <string name="txt_no_card">未找到卡片</string>
@@ -694,7 +613,6 @@
     <string name="txt_skip">跳过</string>
     <string name="txt_enable">启用</string>
     <string name="txt_grant_permissions">授予权限以提升体验。</string>
-    <string name="txt_subscription_detail">订阅详情</string>
     <string name="txt_tracker_id">设备ID</string>
     <string name="txt_plan">套餐：</string>
 
@@ -705,16 +623,11 @@
     <string name="txt_permanent_residence">常驻地</string>
     <string name="txt_choose_wifi">选择Wi-Fi网络</string>
     <string name="txt_later">稍后</string>
-    <string name="txt_measurement_units_tip">您宠物的计量单位是？</string>
-    <string name="txt_your_height">您宠物的身高</string>
-    <string name="txt_length">身长</string>
-    <string name="txt_your_weight">您宠物的体重</string>
     <string name="txt_notifications_set">通知设置</string>
     <string name="txt_display_fences_desc">进入或离开安全区域/禁止区域</string>
     <string name="txt_tracker_status">设备状态</string>
     <string name="txt_tracker_status_desc">订阅/低电量警告/关机</string>
     <string name="txt_activity_desc">活动/睡眠提醒/目标达成</string>
-    <string name="txt_power_save_zone">WiFi区域</string>
     <string name="txt_about_power_saving_zone">关于WiFi区域</string>
     <string name="txt_office_tip">在您宠物常驻地（如家中）选择一个网络。一旦进入覆盖范围，您的设备将识别此网络为WiFi区域。</string>
     <string name="txt_office">办公室</string>
@@ -724,7 +637,6 @@
     <string name="txt_tracking_pet">正在追踪您的宠物</string>
     <string name="txt_power_saving_set">WiFi区域设置</string>
     <string name="txt_feedback_tip">输入您的反馈</string>
-    <string name="txt_feedback_tip2">请留下您的邮箱，我们能更快帮助您</string>
     <string name="txt_enter_email_tip">输入您的电子邮箱地址</string>
     <string name="txt_choose_file">选择文件</string>
     <string name="txt_power_off">关机</string>
@@ -733,7 +645,6 @@
     <string name="txt_current_led">当前LED状态</string>
     <string name="txt_out_save_zone">已离开安全区域</string>
     <string name="txt_in_power_zone">在WiFi区域内</string>
-    <string name="txt_out_power_zone">已离开WiFi区域</string>
     <string name="txt_in_no_go_zone">处于禁止区域</string>
     <string name="txt_strong_signal">信号强</string>
     <string name="txt_smart_power_zone">WiFi区域</string>
@@ -760,14 +671,11 @@
     <string name="txt_receive_notice">接收通知</string>
     <string name="txt_turn_on_upper">开启</string>
     <string name="txt_activated_tips">设备未激活。请订阅后激活。</string>
-    <string name="txt_hours">小时 (hours)</string>
     <string name="txt_search_device">正在搜索…</string>
     <string name="txt_no_search_device">请保持设备开机并靠近扫描。</string>
     <string name="txt_outside">区域外</string>
     <string name="txt_inside">区域内</string>
     <string name="txt_7days_avg">7日均值</string>
-    <string name="txt_stop_renew">停止自动续订</string>
-    <string name="txt_auto_renew">自动续订</string>
     <string name="txt_created_many_fences">创建的围栏太多了</string>
     <string name="txt_live_ended">直播已结束。直播时长可通过“直播时长”设置。</string>
     <string name="txt_weak_gps_signal">GPS信号弱</string>
@@ -800,7 +708,6 @@
     <string name="txt_type_message">输入消息</string>
     <string name="txt_verify_your_email">请继续验证您的邮箱</string>
     <string name="txt_code_valid_min1">验证码有效期为</string>
-    <string name="txt_code_valid_min2">分钟</string>
     <string name="txt_create_password">创建密码</string>
     <string name="txt_change_email_success">邮箱更改成功！</string>
     <string name="txt_change_email">更改邮箱</string>
@@ -893,11 +800,8 @@
     <string name="txt_refunded">已退款</string>
 
 
-    <string name="txt_enter_discount_code">输入折扣码</string>
-    <string name="txt_check">验证</string>
     <string name="txt_annual_care_text">年度护理</string>
     <string name="txt_annual_care_text1">年度护理：</string>
-    <string name="txt_ble_connect_fail">蓝牙连接失败</string>
     <string name="txt_led_light_set">LED灯设置</string>
     <string name="txt_bluetooth_setup_dec">当设备在手机旁时，建议通过蓝牙连接追踪器并调整LED设置。更改将立即生效。</string>
     <string name="txt_bluetooth_setup">蓝牙设置</string>