moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat : 登录页面修改 , fix 金币红包 金币统计

Browse Source
This commit is contained in:
eggmanQQQ
2025-02-26 10:42:23 +08:00
parent 769232137d
commit 368caf9392
3 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt
View File

@@ -1,6 +1,5 @@
package com.chwl.app.avroom.dialog
import android.annotation.SuppressLint
import android.view.Gravity
import android.view.MotionEvent
import android.view.View
@@ -608,7 +607,7 @@ class RoomLuckyBagDialog : BaseDialogFragment<DialogRoomLuckyBagBinding>() {
}
private fun showGoldCoin() {
val coin = mGoldSelect * mGoldNumSelect
val coin = mGoldSelect
val redBagDesc = R.string._ver_24_Total_spend_s_coins.getString(coin)
SpannableTextBuilder(binding.redBagDesc).appendText(redBagDesc)
.addTextStyleList(arrayListOf(

32
app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java
View File

@@ -49,6 +49,7 @@ import com.chwl.library.common.util.OtherExtKt;
import com.chwl.library.common.util.SPUtils;
import com.chwl.library.utils.TextWatcherWrapper;
import com.coorchice.library.SuperTextView;
import com.example.lib_utils.ktx.ResourcesKtxKt;
import com.example.module_base.support.login.ILoginService;
import com.netease.nim.uikit.StatusBarUtil;
import com.trello.rxlifecycle3.android.ActivityEvent;
@@ -71,8 +72,6 @@ public class LoginPasswordActivity extends BaseActivity {
private View btnNext;
private AppCompatTextView tvAccountLogin;
private AppCompatTextView tvCodeLogin;
private View ivAccountIndicator;
private View ivCodeIndicator;
private LinearLayout llAccountLogin;
private LinearLayout llSmsLogin;
private AppCompatTextView tvAreaCode;
@@ -88,6 +87,8 @@ public class LoginPasswordActivity extends BaseActivity {
protected CheckBox tvProtocol;
private TextView tvProtocolHint;
private boolean isAccountLogin = true;
private final TextWatcher textWatcher = new TextWatcherWrapper() {
@Override
public void afterTextChanged(Editable s) {
@@ -133,8 +134,6 @@ public class LoginPasswordActivity extends BaseActivity {
btnNext = findViewById(R.id.btn_next);
tvAccountLogin = findViewById(R.id.tv_account_login);
tvCodeLogin = findViewById(R.id.tv_code_login);
ivAccountIndicator = findViewById(R.id.iv_account_indicator);
ivCodeIndicator = findViewById(R.id.iv_code_indicator);
llAccountLogin = findViewById(R.id.ll_account_login);
llSmsLogin = findViewById(R.id.ll_sms_login);
tvAreaCode = findViewById(R.id.tv_areaCode);
@@ -154,22 +153,24 @@ public class LoginPasswordActivity extends BaseActivity {
findViewById(R.id.tv_forget_password).setOnClickListener(v ->
ResetPasswordActivity.start(context, ResetPasswordActivity.FROM_NOT_LOGIN)
);
tvAccountLogin.setOnClickListener(v -> {
ivAccountIndicator.setVisibility(View.VISIBLE);
ivCodeIndicator.setVisibility(View.GONE);
tvAccountLogin.setTextColor(ContextCompat.getColor(this, R.color.black));
tvCodeLogin.setTextColor(ContextCompat.getColor(this, R.color.color_84868A));
tvCodeLogin.setOnClickListener(v -> {
if (!isAccountLogin) {
llAccountLogin.setVisibility(View.VISIBLE);
llSmsLogin.setVisibility(View.GONE);
});
tvCodeLogin.setOnClickListener(v -> {
ivAccountIndicator.setVisibility(View.GONE);
ivCodeIndicator.setVisibility(View.VISIBLE);
tvAccountLogin.setTextColor(ContextCompat.getColor(this, R.color.color_84868A));
tvCodeLogin.setTextColor(ContextCompat.getColor(this, R.color.black));
tvCodeLogin.setText(ResourcesKtxKt.getString(R.string._ver_23_SMS_Login));
tvAccountLogin.setText(ResourcesKtxKt.getString(R.string._ver_23_ID_Login));
} else {
llAccountLogin.setVisibility(View.GONE);
llSmsLogin.setVisibility(View.VISIBLE);
tvCodeLogin.setText(ResourcesKtxKt.getString(R.string._ver_23_ID_Login));
tvAccountLogin.setText(ResourcesKtxKt.getString(R.string._ver_23_SMS_Login));
}
isAccountLogin = !isAccountLogin;
});
tvAreaCode.setOnClickListener(v -> {
if (!tvProtocol.isChecked()) {
tvProtocolHint.setVisibility(View.VISIBLE);
@@ -177,6 +178,7 @@ public class LoginPasswordActivity extends BaseActivity {
}
AreaCodeActivity.startForResult(this, 100);
});
tvRegain.setOnClickListener(v -> {
if (!tvProtocol.isChecked()) {
tvProtocolHint.setVisibility(View.VISIBLE);

22
app/src/main/res/layout/activity_login_password.xml
View File

@@ -47,20 +47,11 @@
android:text="@string/_ver_23_ID_Login"
android:textColor="@color/black"
android:textSize="@dimen/dp_16"
android:textStyle="bold"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_logo" />
<ImageView
android:id="@+id/iv_account_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/base_ic_indicator"
app:layout_constraintBottom_toBottomOf="@id/tv_account_login"
app:layout_constraintEnd_toEndOf="@id/tv_account_login"
app:layout_constraintStart_toStartOf="@id/tv_account_login" />
<LinearLayout
@@ -325,7 +316,7 @@
android:gravity="center_horizontal"
android:paddingVertical="10dp"
android:text="@string/_ver_23_SMS_Login"
android:textColor="@color/color_84868A"
android:textColor="@color/black"
android:textSize="@dimen/dp_16"
android:textStyle="bold"
android:layout_marginTop="10dp"
@@ -333,17 +324,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<ImageView
android:id="@+id/iv_code_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/base_ic_indicator"
android:visibility="gone"
android:alpha="0"
app:layout_constraintBottom_toBottomOf="@id/tv_code_login"
app:layout_constraintEnd_toEndOf="@id/tv_code_login"
app:layout_constraintStart_toStartOf="@id/tv_code_login"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView