diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 98dda44..b268ef3 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,14 +4,6 @@
-
-
-
-
-
-
-
-
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
deleted file mode 100644
index f8051a6..0000000
--- a/.idea/migrations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c67ba6b..a16b5fb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,5 @@
+
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index f322c79..e8a9215 100644
--- 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
diff --git a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/merger.xml
index 37b1420..b18388d 100644
--- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/FastBleLib/build/intermediates/incremental/mergeDebugAssets/merger.xml b/FastBleLib/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 376d3ab..b29920e 100644
--- a/FastBleLib/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/FastBleLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/FastBleLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 0bf21ef..3a95128 100644
--- a/FastBleLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/FastBleLib/build/intermediates/incremental/mergeDebugShaders/merger.xml b/FastBleLib/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 1776399..4c30d0d 100644
--- a/FastBleLib/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/FastBleLib/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git 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
index 9530167..95cb31e 100644
--- 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
6
7
-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
-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
-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
-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
diff --git a/FastBleLib/build/outputs/logs/manifest-merger-debug-report.txt b/FastBleLib/build/outputs/logs/manifest-merger-debug-report.txt
index 187eac0..155da35 100644
--- 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
diff --git a/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 1edf5ae..285831e 100644
Binary files a/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/app/build.gradle b/app/build.gradle
index a6b7e64..b7839ae 100644
--- 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 = [
diff --git a/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeAmountCNAdapter.kt b/app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeAmountCNAdapter.kt
index 5d21f27..683b7f8 100644
--- 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?) :
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) {
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 4a7c7aa..bbff7c6 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
@@ -80,7 +80,7 @@ class RechargeDeviceDetailCNActivity : BaseActivity
diff --git a/app/src/main/res/layout/fragment_bind_phone_cn.xml b/app/src/main/res/layout/fragment_bind_phone_cn.xml
index c9637f5..1af9535 100644
--- 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" />
diff --git a/app/src/main/res/layout/fragment_forget_password_cn_finish.xml b/app/src/main/res/layout/fragment_forget_password_cn_finish.xml
index 89a202e..e9af707 100644
--- 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 @@
diff --git a/app/src/main/res/layout/fragment_login_cn_code.xml b/app/src/main/res/layout/fragment_login_cn_code.xml
index a3f8d93..4bbd363 100644
--- 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" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_login_cn_first.xml b/app/src/main/res/layout/fragment_login_cn_first.xml
index dfd94ba..510754f 100644
--- 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" />
diff --git a/app/src/main/res/layout/fragment_register_cn_finish.xml b/app/src/main/res/layout/fragment_register_cn_finish.xml
index 3579b6e..58beedc 100644
--- 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 @@
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 b7d21e7..33cea33 100644
--- 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" />
diff --git a/app/src/main/res/layout/layout_get_phone_code.xml b/app/src/main/res/layout/layout_get_phone_code.xml
index 8cc8424..f17316f 100644
--- 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"
diff --git a/local.properties b/local.properties
index f27a2d9..355c42d 100644
--- 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
\ No newline at end of file
+keyAliasPassword=ShanrenSport365
+keyStoreFile=F\:\\Project\\AndroidProject\\key\\shanrenkey.jks
+keyStorePassword=ShanrenSport365
+sdk.dir=D\:\\AndroidSdk