From 316edc17322cd39ca9b9bd285ba63018cebfa2b4 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 21 三月 2024 15:12:10 +0800
Subject: [PATCH] 2024年03月21日15:11:23
---
app/src/main/res/layout/fragment_me.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 29 ++++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 11 +++++
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 2
app/src/main/res/drawable/selected.png | 0
app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java | 14 +++++++
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 4 +-
app/src/main/res/layout/frgment_house_list_line.xml | 1
9 files changed, 58 insertions(+), 6 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 aed7c4c..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
@@ -220,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());
}
@@ -243,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),true);
+ GlideUtils.getCircleCropImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, true);
+// GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4), true);
}
@@ -254,6 +260,9 @@
* 鏄剧ず鐢ㄦ埛鍚嶇О
*/
private void setMemberName(String userName) {
+ if (TextUtils.isEmpty(userName)) {
+ return;
+ }
viewBinding.fragmentMeUserNameIv.setText(userName);
UserConfigManage.getInstance().setUserName(userName);
UserConfigManage.getInstance().Save();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
index 680757a..4012af1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
@@ -2,10 +2,12 @@
import androidx.recyclerview.widget.LinearLayoutManager;
+import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
+import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
@@ -15,7 +17,9 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import java.util.ArrayList;
import java.util.List;
@@ -79,7 +83,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- setResult(40);
+ backPressedData();
finish();
}
});
@@ -148,5 +152,28 @@
});
}
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ backPressedData();
+ super.onBackPressed();
+ }
+
+ /**
+ * 杩斿洖缁欎笂涓�绾х晫闈㈡暟鎹�
+ */
+ private void backPressedData() {
+ setResult(40);
+ //閫氱煡缁欏皬绋嬪簭鏇存柊娓╁害鍗曚綅
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("temperature_unit", UserConfigManage.getInstance().getTemperature_unit());
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE);
+ uniCallBackBaseBean.setData(jsonObject);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index 697a644..90096df 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -98,11 +98,11 @@
public void onClick(View v) {
clearCacheData();
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
- uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO);
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER);
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
uniCallBackBaseBean.setData(jsonObject);
- HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER, uniCallBackBaseBean);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
finish();
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index ee6e3c8..c39a689 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -261,7 +261,7 @@
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("homeId", houseIdBean.getHomeId());
jsonObject.addProperty("homeName", houseIdBean.getHomeName());
- jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus());
+ jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus()+"");
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
uniCallBackBaseBean.setData(jsonObject);
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index ce35a28..8150c97 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -101,6 +101,7 @@
public final static String UNI_EVENT_NOTIFICATION_DEVICE_MODEL = "uni_notification_model";//閫氱煡妯″潡(澶х被)
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS = "refresh_details";//鍒锋柊鐢电珯璇︽儏
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO = "refresh_userinfo";//鍒锋柊鐢ㄦ埛淇℃伅
+ public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE = "temperature_format_changed";//鍒锋柊鍗曚綅娓╁害
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER = "refresh_unread_messages_number";//鍒锋柊鏈娑堟伅鏁伴噺
public final static String UNI_EVENT_NOTIFICATION_DEVICE_ADD = "add";//璁惧娣诲姞
public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//璁惧鍒犻櫎
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
index d9aa883..5343b61 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/GlideUtils.java
@@ -9,6 +9,7 @@
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
+import android.text.TextUtils;
import android.widget.ImageView;
import androidx.annotation.Nullable;
@@ -28,6 +29,7 @@
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.Target;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import java.io.InputStream;
@@ -46,6 +48,9 @@
* @param imageview 鏄剧ず鍥剧墖缁勪欢
*/
public static void getGeneralImage(Context context, String url, ImageView imageview) {
+ if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
+ return;
+ }
Glide.with(context)
.load(url)
.apply(getRequestOptions(false))
@@ -61,6 +66,9 @@
* @param granularRoundedCorners 璁剧疆鍥剧墖瑙掑害
*/
public static void getGranularRoundedCornersImage(Context context, String url, ImageView imageview, GranularRoundedCorners granularRoundedCorners) {
+ if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
+ return;
+ }
Glide.with(context)
.load(url)
.apply(getRequestOptions(false))
@@ -77,6 +85,9 @@
* @param roundedCorners 璁剧疆鍥剧墖瑙掑害鍊�
*/
public static void getRoundedCornersImage(Context context, String url, ImageView imageview, RoundedCorners roundedCorners, boolean userImage) {
+ if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
+ return;
+ }
Glide.with(context)
.load(url)
.apply(getRequestOptions(userImage))
@@ -93,6 +104,9 @@
* @param imageview 鏄剧ず鍥剧墖缁勪欢
*/
public static void getCircleCropImage(Context context, String url, ImageView imageview, boolean userImage) {
+ if (TextUtils.isEmpty(url) || !url.startsWith("http://")) {
+ return;
+ }
Glide.with(context)
.load(url)
.apply(getRequestOptions(userImage))
diff --git a/app/src/main/res/drawable/selected.png b/app/src/main/res/drawable/selected.png
index 6fb74a3..5819252 100644
--- a/app/src/main/res/drawable/selected.png
+++ b/app/src/main/res/drawable/selected.png
Binary files differ
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 9c789dd..6bf98eb 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -25,7 +25,7 @@
android:id="@+id/fragment_me_icon_iv"
android:layout_width="69dp"
android:layout_height="69dp"
- android:background="@drawable/default_user"
+ android:background="@drawable/default_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/frgment_house_list_line.xml b/app/src/main/res/layout/frgment_house_list_line.xml
index 55fb773..b238670 100644
--- a/app/src/main/res/layout/frgment_house_list_line.xml
+++ b/app/src/main/res/layout/frgment_house_list_line.xml
@@ -30,6 +30,7 @@
android:id="@+id/fragment_house_list_line_left_iv"
android:layout_width="113dp"
android:layout_height="130dp"
+ android:background="@drawable/default_user"
android:scaleType="centerCrop" />
<TextView
--
Gitblit v1.8.0