From 1a0aaa0bd03b3a491c751b5ce1bfca16302767b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 19 六月 2024 19:30:12 +0800
Subject: [PATCH] 2024年06月19日19:30:03
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 75 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 24 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 2e624aa..f1c0120 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
@@ -9,7 +9,6 @@
import androidx.annotation.Nullable;
import com.alibaba.fastjson.JSONObject;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
@@ -23,13 +22,17 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
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.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
/**
* 鎴戠殑-鐣岄潰
@@ -161,17 +164,26 @@
@Override
public void onClick(View v) {
if (UserConfigManage.getInstance().isBAccount()) {
- //todo B绔笉鏀寔鏇存敼鏄电О
- HdlThreadLogic.toast(_mActivity, R.string.loading_not_supported);
- return;
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, BPersonalDataActivity.class);
+ startActivity(intent);
+ } else {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, CPersonalDataActivity.class);
+ if (mC_UserInfo == null) {
+ mC_UserInfo = new CUserInfo();
+ }
+ intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
+ startActivityForResult(intent, 10);
}
- Intent intent = new Intent();
- intent.setClass(_mActivity, PersonalDataActivity.class);
- if (mC_UserInfo == null) {
- mC_UserInfo = new CUserInfo();
- }
- intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
- startActivityForResult(intent, 10);
+ }
+ });
+ //鍛樺伐绠＄悊锛堜富璐﹀彿鎵嶆樉绀猴級
+ viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String path = HDLUniMP.UNI_EVENT_OPEN_MINE_MINESTAFFMANAGER;
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
});
viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@@ -189,7 +201,7 @@
}
});
final int[] count = {0};
- viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
+ viewBinding.meTitleTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
count[0] = count[0] + 1;
@@ -208,24 +220,30 @@
*/
private void initView() {
-
- viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me);
-// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
-// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
-
-
- viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
- viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
- viewBinding.fragmentMeLineSetIl.fragmentMeLineV.setVisibility(View.VISIBLE);
+ viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
+ viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
+ viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
+ viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineV.setVisibility(View.VISIBLE);
+
+ viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
+ viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
+
+
+ setMemberName(UserConfigManage.getInstance().getUserName());
+// setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());
}
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //B绔笉闇�瑕佹洿鏂�
+ return;
+ }
if (requestCode == 10 && resultCode == 10) {
if (data != null) {
String iconUrl = data.getStringExtra("memberHeadIcon");
@@ -243,10 +261,14 @@
* 鏄剧ず鐢ㄦ埛澶村儚
*/
private void setMemberHeadIcon(String memberHeadIconUrl) {
+ if (TextUtils.isEmpty(memberHeadIconUrl)) {
+ return;
+ }
if (mC_UserInfo != null) {
mC_UserInfo.setMemberHeadIcon(memberHeadIconUrl);
}
- GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4));
+ GlideUtils.getCircleCropImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, true);
+// GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4), true);
}
@@ -254,13 +276,16 @@
* 鏄剧ず鐢ㄦ埛鍚嶇О
*/
private void setMemberName(String userName) {
- viewBinding.fragmentMeUserNameIv.setText(userName);
+ if (TextUtils.isEmpty(userName)) {
+ return;
+ }
+ viewBinding.fragmentMeUserNameTv.setText(userName);
UserConfigManage.getInstance().setUserName(userName);
UserConfigManage.getInstance().Save();
}
- @Override
+ @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onEventMessage(BaseEventBus eventBus) {
super.onEventMessage(eventBus);
if (eventBus == null) {
@@ -269,6 +294,8 @@
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
if (eventBus.getType().equals(HomepageTitleTabSwitch.me.toString())) {
+ // 鍙栨秷绮樻�т簨浠�
+ EventBus.getDefault().removeStickyEvent(eventBus);
//璇诲彇澶村儚
if (UserConfigManage.getInstance().isBAccount()) {
this.getBUserInfo();
--
Gitblit v1.8.0