fengjingqi/Android-WaterProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

电池电量icon优化

Browse Source
This commit is contained in:
fengjignqi
2026-06-02 13:58:54 +08:00
parent b7ab2e69a4
commit 03e67932b1
49 changed files with 293 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/ckkj/water/mine/AppThemActivity.java
View File

@@ -112,4 +112,9 @@ public class AppThemActivity extends BaseActivity<AppThemeChangeLayoutBinding, M
public void updateUserPasswordSuccess(BaseBean bean) {
}
@Override
public void logOutSuccess(BaseBean bean) {
}
}

5
app/src/main/java/com/ckkj/water/mine/ChangePhoneActivity.java
View File

@@ -146,4 +146,9 @@ public class ChangePhoneActivity extends BaseActivity<ChangePhoneActivityBinding
public void updateUserPasswordSuccess(BaseBean bean) {
}
@Override
public void logOutSuccess(BaseBean bean) {
}
}

37
app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
View File

@@ -13,6 +13,7 @@ import com.ckkj.water.base.BaseFragment;
import com.ckkj.water.base.entity.MineUserInfoBean;
import com.ckkj.water.databinding.MineFragmentBinding;
import com.ckkj.water.databinding.MineFragmentLayoutBinding;
import com.ckkj.water.login.LoginActivity;
import com.ckkj.water.main.entity.CheckVersionEntity;
import com.ckkj.water.mine.entity.MemberComboEntity;
import com.ckkj.water.mine.mvp.MineContract;
@@ -20,6 +21,7 @@ import com.ckkj.water.mine.mvp.MineImpl;
import com.ckkj.water.mine.mvp.MinePresenter;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.dataUtil.SharePreUtil;
import com.ckkj.water.utils.manager.ActivityManager;
import com.ckkj.water.utils.manager.ThemeManager;
import com.ckkj.water.utils.manager.WaterUserInfoManager;
import com.ckkj.water.utils.show.ToastUtil;
@@ -30,6 +32,8 @@ import com.lxj.xpopup.interfaces.OnSelectListener;
import java.util.List;
import de.greenrobot.event.EventBus;
/**
* @author fengxiaoyang
* @date 2026/5/16
@@ -63,6 +67,7 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
setClick(viewBinding.linearLanguage);
setClick(viewBinding.linearPsdManage);
setClick(viewBinding.linearTheme);
setClick(viewBinding.btnDelete);
}
private void setClick(View view) {
@@ -105,6 +110,26 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
case R.id.linear_psd_manage:
goTo(mContext, PsdManageActivity.class,null);
break;
case R.id.btn_delete:
showDialogtext(null,
false,
false,
getString(R.string.tip_text),
getString(R.string.logout_tips),
getString(R.string.cancel_text),
getString(R.string.confirm_text),
new OnDialogClick() {
@Override
public void onCancelClick() {
}
@Override
public void onConfirmClick() {
mPresenter.logout();
}
});
break;
}
}
@@ -125,7 +150,17 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
}else{
viewBinding.tvUserAccount.setText(bean.getUser().getPhonenumber());
}
}
/**
* 退出登录
* @param bean
*/
@Override
public void logOutSuccess(BaseBean bean) {
WaterUserInfoManager.getInstance().clearUser(mContext);
ActivityManager.removeAllActivity();
goTo(mContext, LoginActivity.class,null);
}
@Override
@@ -138,6 +173,8 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
}
@Override
public MinePresenter createPresenter() {
return new MinePresenter(new MineImpl());

5
app/src/main/java/com/ckkj/water/mine/MineFragment.java
View File

@@ -276,4 +276,9 @@ public class MineFragment extends BaseFragment<MineFragmentBinding, MinePresente
public void updateUserPasswordSuccess(BaseBean bean) {
}
@Override
public void logOutSuccess(BaseBean bean) {
}
}

5
app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java
View File

@@ -184,6 +184,11 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
}
@Override
public void logOutSuccess(BaseBean bean) {
}
private void getCompressFile(File file) {
LubanCompressUtil.getInstance().getCompressFile(mContext, file, new LubanCompressUtil.CompressCallback() {

5
app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
View File

@@ -95,4 +95,9 @@ public class PsdManageActivity extends BaseActivity<PasswordManLayoutBinding, Mi
public void updateUserPasswordSuccess(BaseBean bean) {
}
@Override
public void logOutSuccess(BaseBean bean) {
}
}

5
app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java
View File

@@ -90,6 +90,11 @@ public class ResetPsdActivity extends BaseActivity<ResetPsdLayoutBinding, MinePr
finish();
}
@Override
public void logOutSuccess(BaseBean bean) {
}
@Override
public MinePresenter createPresenter() {
return new MinePresenter(new MineImpl());

5
app/src/main/java/com/ckkj/water/mine/SettingsActivity.java
View File

@@ -216,4 +216,9 @@ public class SettingsActivity extends BaseActivity<ActivitySettingsLayoutBinding
public void updateUserPasswordSuccess(BaseBean bean) {
}
@Override
public void logOutSuccess(BaseBean bean) {
}
}

5
app/src/main/java/com/ckkj/water/mine/UserLogOffAccountActivity.java
View File

@@ -126,4 +126,9 @@ public class UserLogOffAccountActivity extends BaseActivity<UserLogOffActivityBi
public void updateUserPasswordSuccess(BaseBean bean) {
}
@Override
public void logOutSuccess(BaseBean bean) {
}
}

2
app/src/main/java/com/ckkj/water/mine/mvp/MineContract.java
View File

@@ -45,6 +45,8 @@ public class MineContract {
void updateUserInfoSuccess(BaseBean bean);
//密码重设完成
void updateUserPasswordSuccess(BaseBean bean);
//退出登录
void logOutSuccess(BaseBean bean);
}
public interface RecommendModel{

24
app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java
View File

@@ -7,6 +7,8 @@ import com.ckkj.water.ConstantUtil;
import com.ckkj.water.base.BasePresenter;
import com.ckkj.water.base.entity.MineUserInfoBean;
import com.ckkj.water.base.entity.UserInfoEntity;
import com.ckkj.water.login.mvp.LoginContract;
import com.ckkj.water.login.mvp.LoginImpl;
import com.ckkj.water.network.BaseBean;
import com.ckkj.water.utils.dataUtil.SharePreUtil;
import com.ckkj.water.utils.manager.WaterUserInfoManager;
@@ -111,4 +113,26 @@ public class MinePresenter extends BasePresenter<MineContract.MineView> {
throw new RuntimeException(e);
}
}
/**
* 退出登录
*/
public void logout() {
JSONObject json = new JSONObject();
new LoginImpl().logout(json, new LoginContract.CallBack<BaseBean>() {
@Override
public void success(BaseBean bean) {
if(MinePresenter.this.getView() != null){
MinePresenter.this.getView().logOutSuccess(bean);
}
}
@Override
public void fail(String msg) {
if(MinePresenter.this.getView() != null){
MinePresenter.this.getView().showError(msg);
}
}
});
}
}