From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 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 7971280..65e4f84 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
@@ -1,6 +1,5 @@
package com.hdl.photovoltaic.ui.me;
-import android.app.job.JobScheduler;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
@@ -10,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;
@@ -29,6 +27,10 @@
import com.hdl.photovoltaic.ui.test.TestMainActivity;
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;
/**
* 鎴戠殑-鐣岄潰
@@ -62,11 +64,12 @@
*/
private void initData() {
// showLoading();
- if (UserConfigManage.getInstance().isBAccount()) {
- this.getBUserInfo();
- } else {
- this.getCMemberInfo();
- }
+// if (UserConfigManage.getInstance().isBAccount()) {
+// this.getBUserInfo();
+// } else {
+// this.getCMemberInfo();
+// }
+ //鍥犱负uni閭ｈ竟闇�瑕侊紝鍚姩鐨勬椂鍊欏氨璇诲彇鍟�
this.getResidenceTemperatureUnit();
}
@@ -158,6 +161,11 @@
viewBinding.fragmentMeIconParentCl.setOnClickListener(new View.OnClickListener() {
@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, PersonalDataActivity.class);
if (mC_UserInfo == null) {
@@ -182,7 +190,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;
@@ -202,17 +210,14 @@
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.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
+ setMemberName(UserConfigManage.getInstance().getUserName());
+// setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());
}
@@ -236,10 +241,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);
}
@@ -247,22 +256,38 @@
* 鏄剧ず鐢ㄦ埛鍚嶇О
*/
private void setMemberName(String userName) {
+ if (TextUtils.isEmpty(userName)) {
+ return;
+ }
viewBinding.fragmentMeUserNameIv.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) {
+ return;
+ }
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
if (eventBus.getType().equals(HomepageTitleTabSwitch.me.toString())) {
- //
- HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭垜鐨勩��");
+ // 鍙栨秷绮樻�т簨浠�
+ EventBus.getDefault().removeStickyEvent(eventBus);
+ //璇诲彇澶村儚
+ if (UserConfigManage.getInstance().isBAccount()) {
+ this.getBUserInfo();
+ } else {
+ this.getCMemberInfo();
+ }
+ // 鍙栨秷绮樻�т簨浠�
+ EventBus.getDefault().removeStickyEvent(eventBus);
}
+
}
+
}
/**
@@ -279,10 +304,10 @@
JSONObject jsonObject = new Gson().fromJson(json, JSONObject.class);
if (jsonObject.containsKey("tempType")) {
String unit = jsonObject.getString("tempType");
- if(unit.contains("C")){
- unit="鈩�";
- }else{
- unit= "鈩�";
+ if (unit.contains("C")) {
+ unit = "鈩�";
+ } else {
+ unit = "鈩�";
}
UserConfigManage.getInstance().setTemperature_unit(unit);
UserConfigManage.getInstance().Save();
@@ -294,7 +319,7 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�--->" + e.getMessage() + "(" + e.getCode() + ")", true);
+ HdlLogLogic.print("鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�--->" + e.getMsg() + "(" + e.getCode() + ")", true);
// HdlThreadLogic.toast(_mActivity, e);
}
});
--
Gitblit v1.8.0