YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1：修改巡乐会抽奖次数，更改为1-5-8

Browse Source 
2：修改手机换绑和手机绑定
3：修改系统消息展示背景
This commit is contained in:
梁小江
2025-12-19 15:51:24 +08:00
parent b028ec883b
commit 07dbffaa5a
16 changed files with 261 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java
View File

@@ -1,7 +1,11 @@
package com.xscm.modulemain.activity.user.activity;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import android.os.CountDownTimer;
import android.view.View;
import android.widget.TextView;
import com.xscm.modulemain.R;
import com.xscm.modulemain.databinding.ActivityPhoneReplacementBinding;
@@ -9,14 +13,15 @@ import com.hjq.toast.ToastUtils;
import com.xscm.modulemain.activity.user.conacts.PhoneReplacementConacts;
import com.xscm.modulemain.activity.user.presenter.PhoneReplacementPresenter;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.SpUtil;
/**
*@author
*@data
*@description: 手机换绑
* @author
* @data
* @description: 手机换绑
*/
public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPresenter, ActivityPhoneReplacementBinding> implements PhoneReplacementConacts.View {
private CountDownTimer mTimer;
@@ -28,9 +33,14 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")) {
type = "2";
mBinding.topBar.setTitle("手机绑定");
mBinding.relTheOldPhone.setVisibility(GONE);
mBinding.rlTheOldCode.setVisibility(GONE);
} else {
type = "1";
mBinding.topBar.setTitle("手机换绑");
mBinding.relTheOldPhone.setVisibility(VISIBLE);
mBinding.tvPhone.setText(SpUtil.getUserBean().getMobile());
mBinding.rlTheOldCode.setVisibility(VISIBLE);
}
}
@@ -45,6 +55,8 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
mBinding.tvSendCode.setOnClickListener(this::onClick);
mBinding.btnSubmit.setOnClickListener(this::onClick);
mBinding.tvSendTheOldCode.setOnClickListener(this::onClick);
mBinding.tvSendCode.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.btnSubmit, ColorManager.getInstance().getPrimaryColorInt(), 53);
@@ -57,7 +69,12 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
}
private void onClick(View view) {
if (view.getId() == R.id.tv_send_code) {
if (view.getId() == R.id.tv_send_the_old_code) {
if (MvpPre == null) {
MvpPre = bindPresenter();
}
MvpPre.sendCode(SpUtil.getUserBean().getMobile(), type, mBinding.tvSendTheOldCode);
} else if (view.getId() == R.id.tv_send_code) {
if (mBinding.edPhone.getText().toString().isEmpty()) {
ToastUtils.show("请输入手机号");
return;
@@ -66,32 +83,57 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
if (MvpPre == null) {
MvpPre = bindPresenter();
}
MvpPre.sendCode(mBinding.edPhone.getText().toString(), type);
MvpPre.sendCode(mBinding.edPhone.getText().toString(), type, mBinding.tvSendCode);
} else if (view.getId() == R.id.btnSubmit) {
if (type.equals("1")){
if (mBinding.edPhone.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
return;
}
if (mBinding.edPassword.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
return;
}
if (MvpPre != null) {
if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")) {
MvpPre.mobileView(mBinding.edPhone.getText().toString(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
} else {
MvpPre.mobileView(SpUtil.getUserBean().getMobile(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
if(mBinding.edTheOldPassword.getText().toString().isEmpty()){
com.blankj.utilcode.util.ToastUtils.showShort("请输入旧手机验证码");
return;
}
if (mBinding.edPhone.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入新手机号");
return;
}
if (mBinding.edPassword.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
return;
}
if (MvpPre!=null){
MvpPre.mobileView(SpUtil.getUserBean().getMobile(), mBinding.edPhone.getText().toString(),mBinding.edTheOldPassword.getText().toString(), mBinding.edPassword.getText().toString(), type);
}
}else if (type.equals("2")){
if (mBinding.edPhone.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
return;
}
if (mBinding.edPassword.getText().toString().isEmpty()) {
com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
return;
}
if (MvpPre!=null){
MvpPre.mobileView("", mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(),"", type);
}
}
// if (MvpPre != null) {
// if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")) {
// MvpPre.mobileView(mBinding.edPhone.getText().toString(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
// } else {
// MvpPre.mobileView(SpUtil.getUserBean().getMobile(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
// }
// }
}
}
public void sendCodeSuccess2(String phoneNumber) {
public void sendCodeSuccess2(String phoneNumber,TextView textView) {
com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
mBinding.tvSendCode.setEnabled(false);
mBinding.tvSendCode.setAlpha(0.5f);
textView.setEnabled(false);
textView.setAlpha(0.5f);
releaseTimer();
if (mTimer != null) {
mTimer.cancel();
@@ -99,16 +141,16 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
mTimer = new CountDownTimer(60000L, 1000L) {
@Override
public void onTick(long millisUntilFinished) {
if (mBinding.tvSendCode != null) {
mBinding.tvSendCode.setText(String.format("重新发送（%s）", millisUntilFinished / 1000));
if (textView != null) {
textView.setText(String.format("重新发送（%s）", millisUntilFinished / 1000));
}
}
@Override
public void onFinish() {
mBinding.tvSendCode.setAlpha(1f);
mBinding.tvSendCode.setEnabled(true);
mBinding.tvSendCode.setText("重新发送");
textView.setAlpha(1f);
textView.setEnabled(true);
textView.setText("重新发送");
}
};
mTimer.start();
@@ -122,18 +164,22 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
}
@Override
public void sendCodeSuccess1(String phoneNumber) {
sendCodeSuccess2(mBinding.edPhone.getText().toString());
public void sendCodeSuccess1(String phoneNumber, TextView textView) {
sendCodeSuccess2(mBinding.edPhone.getText().toString(),textView);
}
@Override
public void sendCodeSuccess(String s) {
if (s.contains("失败")) {
if (s.contains("成功")) {
ToastUtils.show(s);
try {
CommonAppContext.getInstance().clearLoginInfo();
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
finish();
} else {
ToastUtils.show(s);
finish();
}
}

21
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
View File

@@ -36,6 +36,7 @@ import com.xscm.moduleutil.dialog.RealNameDialog;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.TextViewUtils;
import com.xscm.moduleutil.widget.CommonAppConfig;
import java.io.File;
@@ -81,6 +82,13 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
} else {
mBinding.llQhdz.setVisibility(View.GONE);
}
if (userInfo.getMobile()!=null && !userInfo.getMobile().equals("")) {
mBinding.tvPhoneTitle.setText("手机换绑");
mBinding.tvPhone.setText(TextViewUtils.formatAnyPhone(userInfo.getMobile()));
}else {
mBinding.tvPhoneTitle.setText("手机绑定");
mBinding.tvPhone.setText("");
}
}
}
@@ -130,7 +138,12 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
} else if (id == R.id.ll_szmm) {//设置密码
startActivity(new Intent(this, ChangPassActivity.class));
} else if (id == R.id.ll_shb) {
startActivity(new Intent(this, PhoneReplacementActivity.class));
LogUtils.e("点击了", SpUtil.getUserBean().getMobile());
if (TextUtils.isEmpty(SpUtil.getUserBean().getMobile())){
startActivity(new Intent(this, PhoneReplacementActivity.class));
}else {
startActivity(new Intent(this, MobilePhoneActivity.class));
}
} else if (id == R.id.ll_smrz) {//实名认证
if (SpUtil.getRealName()) {
startActivity(new Intent(this, RealDetailActivity.class));
@@ -208,12 +221,12 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
.setPositiveButton("确定", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if( SpUtil.getUserBean().getMobile()==null){
if (SpUtil.getUserBean().getMobile() == null) {
if (MvpPre == null) {
MvpPre = bindPresenter();
}
MvpPre.cancel("");
}else {
} else {
showSecondaryVerificationDialog();
}
@@ -335,7 +348,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
MvpPre.cancel(code);
dialog.dismiss();
}else {
} else {
com.hjq.toast.ToastUtils.show("请输入正确的验证码");
}
}

7
MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java
View File

@@ -1,6 +1,7 @@
package com.xscm.modulemain.activity.user.conacts;
import android.app.Activity;
import android.widget.TextView;
import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
@@ -8,15 +9,15 @@ import com.xscm.moduleutil.activity.IView;
public class PhoneReplacementConacts {
public interface View extends IView<Activity> {
void sendCodeSuccess1(String phoneNumber);
void sendCodeSuccess1(String phoneNumber,TextView textView);
void sendCodeSuccess(String s);
}
public interface IMePre extends IPresenter {
void sendCode(String phoneNumber, String type);
void sendCode(String phoneNumber, String type, TextView tvSendCode);
void mobileView(String mobile, String new_mobile, String sms_code,String type);
void mobileView(String mobile, String new_mobile, String sms_code,String new_sms_code,String type);
}
}

25
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java
View File

@@ -1,6 +1,7 @@
package com.xscm.modulemain.activity.user.presenter;
import android.content.Context;
import android.widget.TextView;
import com.xscm.modulemain.activity.user.conacts.PhoneReplacementConacts;
import com.xscm.moduleutil.bean.UserBean;
@@ -21,7 +22,7 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
}
@Override
public void sendCode(String phoneNumber, String type) {
public void sendCode(String phoneNumber, String type, TextView textView) {
api.sendCode(phoneNumber, type, new BaseObserver<String>() {
@Override
@@ -34,16 +35,16 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().sendCodeSuccess1(phoneNumber);
MvpRef.get().sendCodeSuccess1(phoneNumber,textView);
}
});
}
@Override
public void mobileView(String mobile, String new_mobile, String sms_code, String type) {
public void mobileView(String mobile, String new_mobile, String sms_code,String new_sms_code, String type) {
if (type.equals("1")) {
api.mobileView(mobile, new_mobile, sms_code, new BaseObserver<String>() {
api.mobileView(mobile, new_mobile, sms_code,new_sms_code, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
@@ -54,9 +55,11 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
UserBean userInfo = SpUtil.getUserBean();
userInfo.setMobile(new_mobile);
SpUtil.saveUserBean(userInfo);
if (s.contains("成功")) {
UserBean userInfo = SpUtil.getUserBean();
userInfo.setMobile(new_mobile);
SpUtil.saveUserBean(userInfo);
}
MvpRef.get().sendCodeSuccess(s);
}
});
@@ -72,9 +75,11 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
UserBean userInfo = SpUtil.getUserBean();
userInfo.setMobile(new_mobile);
SpUtil.saveUserBean(userInfo);
if (s.contains("成功")) {
UserBean userInfo = SpUtil.getUserBean();
userInfo.setMobile(new_mobile);
SpUtil.saveUserBean(userInfo);
}
MvpRef.get().sendCodeSuccess(s);
}
});

12
MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java
View File

@@ -275,7 +275,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
if (!isDrawing) {
isDrawing = true;
prepareForNewLottery();
num = "10";
num = "5";
MvpPre.xlhChou(roomId, num);
} else {
// com.hjq.toast.ToastUtils.show("正在抽奖中...");
@@ -285,7 +285,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
if (!isDrawing) {
isDrawing = true;
prepareForNewLottery();
num = "100";
num = "8";
MvpPre.xlhChou(roomId, num);
} else {
// com.hjq.toast.ToastUtils.show("正在抽奖中...");
@@ -411,8 +411,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
private void upTitle(int boxPrice) {
this.mboxPrice = boxPrice;
mBinding.tvOne.setText(boxPrice + "币一次");
mBinding.tvTen.setText((boxPrice * 10) + "币十次");
mBinding.tvHundred.setText((boxPrice * 100) + "币百次");
mBinding.tvTen.setText((boxPrice * 5) + "币五次");
mBinding.tvHundred.setText((boxPrice * 8) + "币八次");
}
// TODO: 2025/8/29 接收im推送过来的消息
@@ -619,12 +619,12 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
mBinding.llOne.setClickable( false);
}
if (icon>=mboxPrice*10){
if (icon>=mboxPrice*5){
mBinding.llTen.setClickable( true);
}else {
mBinding.llTen.setClickable( false);
}
if (icon>=mboxPrice*100){
if (icon>=mboxPrice*8){
mBinding.llHundred.setClickable( true);
}else {
mBinding.llHundred.setClickable( false);