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

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

Browse Source 
2.剔除部分未使用字符串的key
3.不再支持 32 位 ，只支持'arm64-v8a', 'x86_64'
This commit is contained in:
yezhiqiu
2026-07-21 16:08:32 +08:00
parent beb802e8c2
commit f51e8f24de
24 changed files with 60 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@@ -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 = [

4
app/src/main/java/com/abbidot/tracker/deprecated/adapter/RechargeAmountCNAdapter.kt
View File

@@ -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) {

2
app/src/main/java/com/abbidot/tracker/deprecated/ui/activity/profile/recharge/cn/RechargeDeviceDetailCNActivity.kt
View File

@@ -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) {

2
app/src/main/res/layout/activity_badge_detail.xml
View File

@@ -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"

2
app/src/main/res/layout/dialog_my_layout.xml
View File

@@ -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" />

2
app/src/main/res/layout/fragment_bind_phone_cn.xml
View File

@@ -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" />

6
app/src/main/res/layout/fragment_forget_password_cn_finish.xml
View File

@@ -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" />

2
app/src/main/res/layout/fragment_login_cn_code.xml
View File

@@ -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>

2
app/src/main/res/layout/fragment_login_cn_first.xml
View File

@@ -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" />

4
app/src/main/res/layout/fragment_register_cn_finish.xml
View File

@@ -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" />

1
app/src/main/res/layout/item_recharge_amount_cn.xml
View File

@@ -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" />

4
app/src/main/res/layout/layout_get_phone_code.xml
View File

@@ -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"