From c1755223fd042d0411ab29708c5a848085c4cee9 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 05 六月 2024 16:38:58 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.0' into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 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 bde7be6..00d3660 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
@@ -29,6 +29,8 @@
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
/**
* 鎴戠殑-鐣岄潰
@@ -160,17 +162,18 @@
@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.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@@ -188,7 +191,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,11 +211,6 @@
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);
@@ -227,6 +225,10 @@
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");
@@ -268,7 +270,7 @@
}
- @Override
+ @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onEventMessage(BaseEventBus eventBus) {
super.onEventMessage(eventBus);
if (eventBus == null) {
@@ -277,6 +279,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