1.完成国内登录注册接口逻辑

2.剔除部分未使用字符串的key 3.不再支持 32 位，只支持'arm64-v8a', 'x86_64'
2026-07-21 16:08:32 +08:00
parent beb802e8c2
commit f51e8f24de
24 changed files with 60 additions and 78 deletions
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,14 +4,6 @@
    <selectionStates>
      <SelectionState runConfigName="app">
        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-07-09T07:54:36.545805400Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=3A251FDJH000CE" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
      </SelectionState>
    </selectionStates>
  </component>
--- a/.idea/migrations.xml
+++ b/.idea/migrations.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,5 @@
+<?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">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
 </project>
--- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Fri Jul 10 19:03:03 CST 2026
+#Mon Jul 20 16:50:50 CST 2026
--- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\build\generated\res\resValues\debug"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\build\generated\res\resValues\debug"/></dataSet><mergedItems/></merger>
--- a/FastBleLib/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet></merger>
--- a/FastBleLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\jniLibs"/></dataSet></merger>
--- a/FastBleLib/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\debug\shaders"/></dataSet></merger>
--- a/FastBleLib/build/intermediates/manifest_merge_blame_file/debug/processDebugManifest/manifest-merger-blame-debug-report.txt
+++ b/FastBleLib/build/intermediates/manifest_merge_blame_file/debug/processDebugManifest/manifest-merger-blame-debug-report.txt
@@ -5,16 +5,16 @@
 5    <uses-sdk android:minSdkVersion="21" />
 6
 7    <uses-permission android:name="android.permission.BLUETOOTH" />
-7-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:5-68
-7-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:22-65
+7-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:5-68
+7-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:22-65
 8    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-8-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:5-74
-8-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:22-71
+8-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:5-74
+8-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:22-71
 9    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-9-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:5-81
-9-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:22-78
+9-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:5-81
+9-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:22-78
 10    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-10-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:5-79
-10-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:22-76
+10-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:5-79
+10-->F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:22-76
 11
 12</manifest>
--- a/FastBleLib/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/FastBleLib/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,33 +1,33 @@
 -- Merging decision tree log ---
 manifest
-ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
-INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
+ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
+INJECTED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12
 	package
-		ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:2:5-30
-		INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
+		ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:2:5-30
+		INJECTED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:11-69
+		ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:11-69
 uses-permission#android.permission.BLUETOOTH
-ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:5-68
+ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:5-68
 	android:name
-		ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:22-65
+		ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:22-65
 uses-permission#android.permission.BLUETOOTH_ADMIN
-ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:5-74
+ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:5-74
 	android:name
-		ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:22-71
+		ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:22-71
 uses-permission#android.permission.ACCESS_COARSE_LOCATION
-ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:5-81
+ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:5-81
 	android:name
-		ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:22-78
+		ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:22-78
 uses-permission#android.permission.ACCESS_FINE_LOCATION
-ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:5-79
+ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:5-79
 	android:name
-		ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:22-76
+		ADDED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:22-76
 uses-sdk
-INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
-INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
+INJECTED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
+INJECTED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
+		INJECTED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
+		INJECTED from F:\Project\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml
--- a/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
+++ b/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,7 +36,13 @@ android {

        ndk {
            //选择要添加的对应 cpu 类型的 .so 库。
-            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64', 'mips', 'mips64'
+            /**
+             * armeabi：Android 4.4 之后基本淘汰，Android7.0 设备几乎不会匹配这个 ABI
+             * mips/mips64：芯片厂商早已停产，市面不存在任何手机使用该架构
+             */
+//            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64', 'mips', 'mips64'
+            //只保留 64 位架构,解决MMKV2.x,32位进程崩溃问题
+            abiFilters 'arm64-v8a', 'x86_64'
        }

        manifestPlaceholders = [
--- a/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeAmountCNAdapter.kt
+++ b/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeAmountCNAdapter.kt
@@ -49,8 +49,8 @@ class RechargeAmountCNAdapter(ctx: Context, list: MutableList<SetMealBean>?) :
        holder.setText(R.id.recharge_amount_cn_two_money, item.accountFee.toString())

        val averageMonth = Utils.formatDecimal(item.accountFee / (12 * period), 2)
-        val monthString = String.format(mContext.getString(R.string.txt_perMonth), averageMonth)
-        holder.setText(R.id.recharge_amount_cn_two_description, monthString)
+//        val monthString = String.format(mContext.getString(R.string.txt_perMonth), averageMonth)
+//        holder.setText(R.id.recharge_amount_cn_two_description, monthString)
    }

    fun setSelectIndex(index: Int) {
--- 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
@@ -80,7 +80,7 @@ class RechargeDeviceDetailCNActivity : BaseActivity<ActivityRechargeDeviceDetail
                    val asOfString = if (TextUtils.isEmpty(overdueDate)) {
                        ""
                    } else {
-                        String.format(getString(R.string.txt_card_list_end), overdueDate)
+                        ""
                    }
                    itemCardAsOf.text = asOfString
                    if (null == rechargeDeviceBean.pet) {
--- a/app/src/main/res/layout/activity_badge_detail.xml
+++ b/app/src/main/res/layout/activity_badge_detail.xml
@@ -45,7 +45,7 @@
        android:layout_width="match_parent"
        android:layout_marginHorizontal="@dimen/dp_18"
        android:layout_marginTop="@dimen/dp_16"
-        android:text="@string/txt_congratulations_tip"
+        android:text="@string/app_name"
        android:textColor="@color/select_color3"
        android:textSize="@dimen/textSize14"
        app:lineHeight="@dimen/textSize16"
--- a/app/src/main/res/layout/dialog_my_layout.xml
+++ b/app/src/main/res/layout/dialog_my_layout.xml
@@ -58,7 +58,7 @@
            android:layout_alignBottom="@id/my_dialog_cancel"
            android:layout_alignParentEnd="true"
            android:layout_marginEnd="@dimen/dp_36"
-            android:text="@string/tracker_activate_yes"
+            android:text="@string/txt_ok"
            android:textSize="@dimen/textSize14"
            app:qmui_backgroundColor="@color/btn_yellow_color"
            app:typeface="@string/roboto_bold_font" />
--- a/app/src/main/res/layout/fragment_bind_phone_cn.xml
+++ b/app/src/main/res/layout/fragment_bind_phone_cn.xml
@@ -19,7 +19,7 @@
        android:layout_below="@id/ll_bind_phone_get_phone_code"
        android:layout_centerHorizontal="true"
        android:layout_marginTop="@dimen/dp_50"
-        android:text="@string/register_txt_bind_phone"
+        android:text="@string/app_name"
        app:qmui_backgroundColor="@color/btn_yellow_color"
        app:typeface="@string/roboto_regular_font" />

--- a/app/src/main/res/layout/fragment_forget_password_cn_finish.xml
+++ b/app/src/main/res/layout/fragment_forget_password_cn_finish.xml
@@ -11,21 +11,21 @@
    <androidx.appcompat.widget.AppCompatTextView
        style="@style/my_TextView_style"
        android:layout_width="wrap_content"
-        android:text="@string/txt_set_new_password"
+        android:text="@string/app_name"
        android:textColor="@color/set_goal_color" />

    <androidx.appcompat.widget.AppCompatEditText
        android:id="@+id/set_new_cn_password_ed"
        style="@style/my_EditText_style"
        android:layout_marginTop="@dimen/dp_32"
-        android:hint="@string/txt_set_new_password"
+        android:hint="@string/app_name"
        android:inputType="textPassword" />

    <com.abbidot.tracker.widget.TypefaceRoundButton
        android:id="@+id/btn_finish_set_new_password"
        style="@style/my_QMUIRoundButton_big_style"
        android:layout_marginTop="@dimen/dp_56"
-        android:text="@string/login_txt_login_finish"
+        android:text="@string/app_name"
        app:qmui_backgroundColor="@color/btn_yellow_color"
        app:typeface="@string/roboto_regular_font" />

--- a/app/src/main/res/layout/fragment_login_cn_code.xml
+++ b/app/src/main/res/layout/fragment_login_cn_code.xml
@@ -38,7 +38,7 @@
        android:layout_centerHorizontal="true"
        android:layout_marginTop="@dimen/dp_42"
        android:background="@drawable/text_view_pressed"
-        android:text="@string/login_txt_login_password"
+        android:text="@string/app_name"
        android:textColor="@color/tab_select"
        android:textSize="@dimen/textSize14" />
 </RelativeLayout>
--- a/app/src/main/res/layout/fragment_login_cn_first.xml
+++ b/app/src/main/res/layout/fragment_login_cn_first.xml
@@ -42,7 +42,7 @@
        android:background="@drawable/text_view_pressed"
        android:drawableTop="@drawable/ico_loading_user"
        android:drawablePadding="@dimen/dp_8"
-        android:text="@string/login_txt_login_account"
+        android:text="@string/app_name"
        android:textColor="@color/gray_forget_color"
        android:textSize="@dimen/textSize12" />

--- a/app/src/main/res/layout/fragment_register_cn_finish.xml
+++ b/app/src/main/res/layout/fragment_register_cn_finish.xml
@@ -11,7 +11,7 @@
    <androidx.appcompat.widget.AppCompatTextView
        style="@style/my_TextView_style"
        android:layout_width="wrap_content"
-        android:text="@string/register_txt_set_password"
+        android:text="@string/app_name"
        android:textColor="@color/set_goal_color" />

    <androidx.appcompat.widget.AppCompatEditText
@@ -25,7 +25,7 @@
        android:id="@+id/btn_finish_register_cn"
        style="@style/my_QMUIRoundButton_big_style"
        android:layout_marginTop="@dimen/dp_56"
-        android:text="@string/login_txt_login_finish"
+        android:text="@string/app_name"
        app:qmui_backgroundColor="@color/btn_yellow_color"
        app:typeface="@string/roboto_regular_font" />

--- a/app/src/main/res/layout/item_recharge_amount_cn.xml
+++ b/app/src/main/res/layout/item_recharge_amount_cn.xml
@@ -57,7 +57,6 @@
            style="@style/my_TextView_style"
            android:layout_below="@id/recharge_amount_cn_two_money"
            android:layout_marginTop="@dimen/dp_2"
-            android:text="@string/txt_perMonth"
            android:textColor="@color/white"
            android:textSize="@dimen/textSize16"
            app:typeface="@string/roboto_regular_font" />
--- a/app/src/main/res/layout/layout_get_phone_code.xml
+++ b/app/src/main/res/layout/layout_get_phone_code.xml
@@ -20,7 +20,7 @@
        android:layout_below="@id/et_get_code_phone"
        android:layout_alignStart="@id/et_get_code_phone"
        android:layout_marginTop="@dimen/dp_16"
-        android:hint="@string/register_txt_verification"
+        android:hint="@string/app_name"
        android:inputType="number"
        android:maxLength="@integer/max_length6" />

@@ -34,7 +34,7 @@
        android:layout_toEndOf="@id/et_phone_code"
        android:enabled="true"
        android:padding="@dimen/dp_8"
-        android:text="@string/register_txt_get_code"
+        android:text="@string/app_name"
        android:textColor="@drawable/button_enabled_text_color"
        android:textSize="@dimen/textSize20"
        app:qmui_backgroundColor="@color/btn_yellow_color"
--- a/local.properties
+++ b/local.properties
@@ -4,10 +4,9 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jul 12 12:13:20 CST 2022
-sdk.dir=H\:\\androidSdk
-#签名文件配置信息
-keyStoreFile=E\:\\AndroidProject\\key\\shanrenkey.jks
-keyStorePassword=ShanrenSport365
+#Mon Jul 20 11:52:16 CST 2026
 keyAlias=ShanrenSportKey
-keyAliasPassword=ShanrenSport365
+keyAliasPassword=ShanrenSport365
+keyStoreFile=F\:\\Project\\AndroidProject\\key\\shanrenkey.jks
+keyStorePassword=ShanrenSport365
+sdk.dir=D\:\\AndroidSdk