From c568cfab0138cce245d2f637eb8a1795b4edc87b Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 15 三月 2024 16:09:11 +0800 Subject: [PATCH] 2024年03月15日16:09:06 --- app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java index bb7c02f..d0cd9dc 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java @@ -4,6 +4,7 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.text.TextUtils; import android.view.Gravity; import android.view.View; @@ -96,7 +97,7 @@ viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - backPressedData(); +// backPressedData(); finish(); } }); @@ -168,19 +169,23 @@ public void onSuccess(Boolean obj) { mMemberHeadIconUrl = imageKey.getUrl(); setMemberHeadIcon(); + backPressedData(); } @Override public void onFailure(HDLException e) { - HdlLogLogic.print("uploadUserHeadImage error:" + e.getMsg()); + + HdlThreadLogic.toast(_mActivity, e); +// HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg()); // hideLoading(); } }); } @Override - public void onFailure(HDLException error) { - HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg()); + public void onFailure(HDLException e) { +// HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode()); + HdlThreadLogic.toast(_mActivity, e); } }); } @@ -214,6 +219,7 @@ viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName()); confirmationInputDialog.dismiss(); HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_change_name_succeed), 0); + backPressedData(); } @Override @@ -280,7 +286,7 @@ */ @Override public void onBackPressed() { - backPressedData(); +// backPressedData(); super.onBackPressed(); } @@ -295,9 +301,17 @@ intent.putExtra("memberName", UserConfigManage.getInstance().getUserName()); setResult(10, intent); } else { - //閫氱煡缁欏皬绋嬪簭鏇存柊鍥惧儚鎴栬�呯敤鎴峰悕 + //閫氱煡缁欏皬绋嬪簭鏇存柊澶村儚鎴栬�呯敤鎴峰悕 HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); + JsonObject jsonObject = new JsonObject(); + if (!TextUtils.isEmpty(mMemberHeadIconUrl)) { + jsonObject.addProperty("memberHeadIcon", mMemberHeadIconUrl); + } + if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserName())) { + jsonObject.addProperty("memberName", UserConfigManage.getInstance().getUserName()); + } uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO); + uniCallBackBaseBean.setData(jsonObject); HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean); } } -- Gitblit v1.8.0