From dbff6d6f9200417ea60e2fe507b79cbe2eb7ea32 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 11 一月 2024 18:19:48 +0800 Subject: [PATCH] 2024年01月11日18:19:42 --- app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 100 +++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 82 insertions(+), 18 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 817490e..441618b 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 @@ -2,24 +2,34 @@ import android.content.Intent; import android.os.Bundle; +import android.text.TextUtils; import android.view.View; 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; 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.enums.HomepageTitleTabSwitch; import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlAccountLogic; +import com.hdl.photovoltaic.other.HdlLogLogic; +import com.hdl.photovoltaic.other.HdlResidenceLogic; 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; + +import org.greenrobot.eventbus.EventBus; /** * 鎴戠殑-鐣岄潰 @@ -45,6 +55,7 @@ initEvent(); //鍒濆鍖栨暟鎹� initData(); + } /** @@ -52,11 +63,13 @@ */ private void initData() { // showLoading(); - if (UserConfigManage.getInstance().isBAccount()) { - this.getBUserInfo(); - } else { - this.getCMemberInfo(); - } +// if (UserConfigManage.getInstance().isBAccount()) { +// this.getBUserInfo(); +// } else { +// this.getCMemberInfo(); +// } + //鍥犱负uni閭h竟闇�瑕侊紝鍚姩鐨勬椂鍊欏氨璇诲彇鍟� + this.getResidenceTemperatureUnit(); } @@ -99,7 +112,7 @@ // setMemberHeadIcon(cUserInfo.getMemberHeadIcon()); //鏇存柊鐢ㄦ埛鍚嶇О setMemberName(cUserInfo.getMemberName()); - HdlThreadLogic.toast(_mActivity, e); +// HdlThreadLogic.toast(_mActivity, e); } }); } @@ -109,6 +122,8 @@ @Override public void onFailure(HDLException e) { + //鎬曞叾瀹冧笉鍒ゆ柇null + mC_UserInfo = new CUserInfo(); // hideLoading(); HdlThreadLogic.toast(_mActivity, e); } @@ -125,7 +140,6 @@ public void onSuccess(BUserInfo bUserInfo) { mB_UserInfo = bUserInfo; // hideLoading(); - setMemberName(bUserInfo.getUserName()); } @@ -148,6 +162,9 @@ public void onClick(View v) { 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); } @@ -191,13 +208,6 @@ // 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); @@ -206,10 +216,6 @@ 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); - } } @@ -248,4 +254,62 @@ UserConfigManage.getInstance().Save(); } + + @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())) { + //璇诲彇澶村儚 + if (UserConfigManage.getInstance().isBAccount()) { + this.getBUserInfo(); + } else { + this.getCMemberInfo(); + } + // 鍙栨秷绮樻�т簨浠� + EventBus.getDefault().removeStickyEvent(eventBus); + } + + } + + } + + /** + * 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�(app鍚姩鐨勬椂鍊欒鑾峰彇) + */ + private void getResidenceTemperatureUnit() { + HdlResidenceLogic.getInstance().getResidenceTemperatureUnit(new CloudCallBeak<String>() { + @Override + public void onSuccess(String json) { + try { + if (TextUtils.isEmpty(json) || json.equals("{}")) { + return; + } + JSONObject jsonObject = new Gson().fromJson(json, JSONObject.class); + if (jsonObject.containsKey("tempType")) { + String unit = jsonObject.getString("tempType"); + if (unit.contains("C")) { + unit = "鈩�"; + } else { + unit = "鈩�"; + } + UserConfigManage.getInstance().setTemperature_unit(unit); + UserConfigManage.getInstance().Save(); + } + } catch (Exception ignored) { + } + + } + + @Override + public void onFailure(HDLException e) { + HdlLogLogic.print("鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�--->" + e.getMsg() + "(" + e.getCode() + ")", true); +// HdlThreadLogic.toast(_mActivity, e); + } + }); + } } -- Gitblit v1.8.0