From 0077e2137a77e6e671e95529165e10b3ed1289bb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 十二月 2023 16:09:09 +0800
Subject: [PATCH] 2023年12月25日16:08:58

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 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 ab42849..58b3a7e 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
@@ -9,7 +9,6 @@
 
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.google.gson.JsonObject;
-import com.hdl.linkpm.sdk.core.callback.IDefaultCallBack;
 import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -70,12 +69,7 @@
         viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                //鏁版嵁鏄娇鐢↖ntent杩斿洖
-                Intent intent = new Intent();
-                //鎶婅繑鍥炴暟鎹瓨鍏ntent
-                intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
-                //璁剧疆杩斿洖鏁版嵁
-                setResult(10, intent);
+                backPressedData();
                 finish();
             }
         });
@@ -132,21 +126,23 @@
             cameraAlbumPopWindow = new CameraAlbumPopWindow(_mActivity, new CameraAlbumPopWindow.CameraAlbumListener() {
                 @Override
                 public void successCallBack(final File a) {
+                    //涓婁紶澶村儚鏂囦欢
                     HDLLinkPMUser.getInstance().uploadUserHeadImage(a, new IResponseCallBack<ImageSubmitInfo>() {
                         @Override
                         public void onSuccess(ImageSubmitInfo imageKey) {
                             JsonObject imageInfo = new JsonObject();
                             imageInfo.addProperty("memberHeadIcon", imageKey.getUrl());
-                            HDLLinkPMUser.getInstance().updateMemberInfo(imageInfo, new IDefaultCallBack() {
+                            //涓婁紶澶村儚鍦板潃
+                            HdlAccountLogic.getInstance().updateMemberHeadIcon_C(imageKey.getUrl(), new CloudCallBeak<Boolean>() {
                                 @Override
-                                public void onSuccess() {
+                                public void onSuccess(Boolean obj) {
                                     mMemberHeadIconUrl = imageKey.getUrl();
                                     setMemberHeadIcon();
                                 }
 
                                 @Override
-                                public void onFailure(HDLException error) {
-                                    HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg());
+                                public void onFailure(HDLException e) {
+                                    HdlLogLogic.print("uploadUserHeadImage error:" + e.getMsg());
 //                                    hideLoading();
                                 }
                             });
@@ -180,7 +176,7 @@
             confirmationInputDialog.setYesOnclickListener(new ConfirmationInputDialog.onYesOnclickListener() {
                 @Override
                 public void Confirm(String str) {
-                    HdlAccountLogic.getInstance().updateMemberInfo_C("", str, "", "", "", "", new CloudCallBeak<Boolean>() {
+                    HdlAccountLogic.getInstance().updateMemberName_C(str, new CloudCallBeak<Boolean>() {
                         @Override
                         public void onSuccess(Boolean obj) {
                             UserConfigManage.getInstance().setUserName(str);
@@ -192,7 +188,7 @@
 
                         @Override
                         public void onFailure(HDLException e) {
-                            HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMessage(), e.getCode());
+                            HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
                         }
                     });
 
@@ -249,4 +245,23 @@
         }
     }
 
+    /**
+     * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+     */
+    @Override
+    public void onBackPressed() {
+        backPressedData();
+        super.onBackPressed();
+    }
+
+    /**
+     * 杩斿洖缁欎笂涓�绾х晫闈㈡暟鎹�
+     */
+    private void backPressedData() {
+        Intent intent = new Intent();
+        intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
+        intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
+        setResult(10, intent);
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.8.0