From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java |   55 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 41 insertions(+), 14 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..288b43a 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;
@@ -29,6 +28,8 @@
 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;
 
 /**
  * 鎴戠殑-鐣岄潰
@@ -62,11 +63,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 +160,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) {
@@ -213,6 +220,8 @@
 
         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 +245,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,6 +260,9 @@
      * 鏄剧ず鐢ㄦ埛鍚嶇О
      */
     private void setMemberName(String userName) {
+        if (TextUtils.isEmpty(userName)) {
+            return;
+        }
         viewBinding.fragmentMeUserNameIv.setText(userName);
         UserConfigManage.getInstance().setUserName(userName);
         UserConfigManage.getInstance().Save();
@@ -256,13 +272,24 @@
     @Override
     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("姝ｅ湪鐐瑰嚮銆愭垜鐨勩��");
+                //璇诲彇澶村儚
+                if (UserConfigManage.getInstance().isBAccount()) {
+                    this.getBUserInfo();
+                } else {
+                    this.getCMemberInfo();
+                }
+                // 鍙栨秷绮樻�т簨浠�
+                EventBus.getDefault().removeStickyEvent(eventBus);
             }
+
         }
+
     }
 
     /**
@@ -279,10 +306,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 +321,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