From 96ef84e192807b383af7d3f2e5c89f08b359137f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 28 十二月 2023 10:23:39 +0800
Subject: [PATCH] 2023年12月28日10:23:22
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 65 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 15 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 d356751..7971280 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,23 +1,28 @@
package com.hdl.photovoltaic.ui.me;
+import android.app.job.JobScheduler;
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.HdlCommonLogic;
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;
@@ -49,6 +54,7 @@
initEvent();
//鍒濆鍖栨暟鎹�
initData();
+
}
/**
@@ -61,6 +67,7 @@
} else {
this.getCMemberInfo();
}
+ this.getResidenceTemperatureUnit();
}
@@ -103,7 +110,7 @@
// setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
//鏇存柊鐢ㄦ埛鍚嶇О
setMemberName(cUserInfo.getMemberName());
- HdlThreadLogic.toast(_mActivity, e);
+// HdlThreadLogic.toast(_mActivity, e);
}
});
}
@@ -113,6 +120,8 @@
@Override
public void onFailure(HDLException e) {
+ //鎬曞叾瀹冧笉鍒ゆ柇null
+ mC_UserInfo = new CUserInfo();
// hideLoading();
HdlThreadLogic.toast(_mActivity, e);
}
@@ -129,7 +138,6 @@
public void onSuccess(BUserInfo bUserInfo) {
mB_UserInfo = bUserInfo;
// hideLoading();
-
setMemberName(bUserInfo.getUserName());
}
@@ -152,6 +160,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);
}
@@ -195,13 +206,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);
@@ -210,10 +214,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);
- }
}
@@ -258,10 +258,45 @@
super.onEventMessage(eventBus);
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
- if (eventBus.getType().equals(HdlCommonLogic.HomepageTitleTabSwitch.me.toString())) {
+ if (eventBus.getType().equals(HomepageTitleTabSwitch.me.toString())) {
//
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭垜鐨勩��");
}
}
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�(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.getMessage() + "(" + e.getCode() + ")", true);
+// HdlThreadLogic.toast(_mActivity, e);
+ }
+ });
+ }
}
--
Gitblit v1.8.0