From c48f6e1e7f7fc4ca3db8ecadf441d6da942ceb8f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 22 十二月 2023 18:05:13 +0800
Subject: [PATCH] 2023年12月22日18:05:07
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 135 +++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 52 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index e857999..d4092a0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -5,19 +5,25 @@
import android.view.View;
+import androidx.annotation.Nullable;
+
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseFragment;
+import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentMeBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.GlideUtils;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
/**
* 鎴戠殑-鐣岄潰
@@ -66,23 +72,38 @@
HdlAccountLogic.getInstance().getMemberInfo_C(new CloudCallBeak<CUserInfo>() {
@Override
public void onSuccess(CUserInfo cUserInfo) {
+ if (cUserInfo == null) {
+ return;
+ }
mC_UserInfo = cUserInfo;
+ UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
+ UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
+ UserConfigManage.getInstance().Save();
// hideLoading();
//鑾峰彇鐢ㄦ埛澶村儚璺緞
if (cUserInfo.getMemberHeadIcon().contains("http")) {
- updateView(null, cUserInfo);
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
} else {
HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String url) {
cUserInfo.setMemberHeadIcon(url);
- updateView(null, cUserInfo);
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
}
@Override
public void onFailure(HDLException e) {
- updateView(null, cUserInfo);
- HdlThreadLogic.toast(_mActivity, e);
+// //鏇存柊鐢ㄦ埛澶村儚
+// setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
+// HdlThreadLogic.toast(_mActivity, e);
}
});
}
@@ -108,7 +129,8 @@
public void onSuccess(BUserInfo bUserInfo) {
mB_UserInfo = bUserInfo;
// hideLoading();
- updateView(bUserInfo, null);
+
+ setMemberName(bUserInfo.getUserName());
}
@Override
@@ -131,7 +153,7 @@
Intent intent = new Intent();
intent.setClass(_mActivity, PersonalDataActivity.class);
intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
- startActivity(intent);
+ startActivityForResult(intent, 10);
}
});
viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@@ -148,46 +170,19 @@
startActivity(AsRegardsActivity.class);
}
});
+ final int[] count = {0};
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(TestMainActivity.class);
+ count[0] = count[0] + 1;
+ if (count[0] > 3) {
+ count[0] = 0;
+ startActivity(TestMainActivity.class);
+ }
}
});
- }
-
- /**
- * 鏇存柊ui
- *
- * @param bUserInfo B绔釜浜轰俊鎭�
- * @param cUserInfo C绔釜浜轰俊鎭�
- */
- private void updateView(BUserInfo bUserInfo, CUserInfo cUserInfo) {
- if (viewBinding == null) {
- return;
- }
- String userName = UserConfigManage.getInstance().getUserName();
- if (bUserInfo != null) {
- //B绔�
- userName = bUserInfo.getUserName();
- }
- if (cUserInfo != null) {
- //C绔�
- userName = cUserInfo.getMemberName();
- GlideUtils.getRoundedCornersImage(_mActivity, cUserInfo.getMemberHeadIcon(), viewBinding.fragmentMeIconIv, new RoundedCorners(4));
- }
- viewBinding.fragmentMeUserNameIv.setText(userName);
- UserConfigManage.getInstance().setUserName(userName);
- UserConfigManage.getInstance().Save();
- }
-
- @Override
- public void onResume() {
- super.onResume();
- //鏇存柊鐢ㄦ埛鍚嶇О
- updateView(null, null);
}
/**
@@ -197,16 +192,9 @@
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me);
- viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
+// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
+// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
- viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.message_center);
- viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineTitleIv.setText(R.string.set_message_center);
- viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineV.setVisibility(View.VISIBLE);
-
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.set_user_management);
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);
viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
@@ -215,11 +203,54 @@
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
- if (!UserConfigManage.getInstance().isBAccount()) {
- viewBinding.fragmentMeLineMessageCenterIl.getRoot().setVisibility(View.GONE);
- viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
- }
}
+ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == 10 && resultCode == 10) {
+ if (data != null) {
+ String iconUrl = data.getStringExtra("memberHeadIcon");
+ String memberName = data.getStringExtra("memberName");
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(iconUrl);
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(memberName);
+
+ }
+ }
+ }
+
+ /**
+ * 鏄剧ず鐢ㄦ埛澶村儚
+ */
+ private void setMemberHeadIcon(String memberHeadIconUrl) {
+ if (mC_UserInfo != null) {
+ mC_UserInfo.setMemberHeadIcon(memberHeadIconUrl);
+ }
+ GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4));
+
+ }
+
+ /**
+ * 鏄剧ず鐢ㄦ埛鍚嶇О
+ */
+ private void setMemberName(String userName) {
+ viewBinding.fragmentMeUserNameIv.setText(userName);
+ UserConfigManage.getInstance().setUserName(userName);
+ UserConfigManage.getInstance().Save();
+
+ }
+
+ @Override
+ public void onEventMessage(BaseEventBus eventBus) {
+ super.onEventMessage(eventBus);
+ //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
+ if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
+ if (eventBus.getType().equals(HdlCommonLogic.HomepageTitleTabSwitch.me.toString())) {
+ //
+ HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭垜鐨勩��");
+ }
+ }
+ }
}
--
Gitblit v1.8.0