From 55751f180a45e83eeba357a7fdde0375f1a64ea4 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 22 七月 2024 13:53:49 +0800
Subject: [PATCH] 2024年07月22日13:53:46
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 22 +++++++++++++++++++++-
app/src/main/res/layout/fragment_home_page.xml | 9 +++++----
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 2 +-
3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index f99edb8..5b03584 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -71,7 +71,7 @@
holder.plant_details_location_tv.setText(houseIdBean.getHomeAddress());
holder.item_parent_rl.setTag(position);
setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
- GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(12), false);
+ GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(6), false);
HdlLogLogic.print("---鐢电珯鍚嶇О:" + houseIdBean.getHomeName() + "---鍥剧墖url:" + houseIdBean.getPowerStationImage(), false);
holder.item_parent_rl.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index ebc8306..1d9b2ae 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -5,10 +5,17 @@
import android.os.Bundle;
import android.os.SystemClock;
+import android.text.SpannableString;
+import android.text.Spanned;
import android.text.TextUtils;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
import android.view.View;
+import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -19,6 +26,7 @@
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView;
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAMoveOverEventMessageModel;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.config.ConstantManage;
@@ -42,6 +50,7 @@
import com.hdl.photovoltaic.ui.home.aachart.BasicChartComposer;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.TimeUtils;
+import com.hdl.photovoltaic.utils.UnitConversionUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -514,7 +523,18 @@
}
viewBinding.infoRl1Text1Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getInstalledCapacity()));
viewBinding.infoRl1Text3Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getPower(), UnitType.kW, false));
- viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio());
+
+ String str = dataOverBean.getPowerRatio() + "%";
+ int startIndex = str.lastIndexOf("%");
+ int endIndex = str.lastIndexOf("%") + 1;
+ SpannableString spannableString = new SpannableString(str);
+ //璁剧疆绗竴閮ㄥ垎鏂囧瓧鐨勫瓧浣撳ぇ灏�
+ spannableString.setSpan(new AbsoluteSizeSpan((int) UnitConversionUtils.dpToPx(HDLApp.getInstance(), 12)), startIndex, endIndex, 0);
+ // 鍒涘缓涓�涓狥oregroundColorSpan瀵硅薄锛屽弬鏁版槸棰滆壊鍊�
+ ForegroundColorSpan colorSpan = new ForegroundColorSpan(HDLApp.getInstance().getColor(R.color.text_191919));
+ spannableString.setSpan(colorSpan, startIndex, endIndex, 0);
+
+ viewBinding.infoRl1FText1Tv.setText(spannableString);
viewBinding.homePageStationInfoRl2DayIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTodayElectricity()));
viewBinding.homePageStationInfoRl2MonIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getMonthElectricity()));
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 408bda2..8fd513f 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -101,7 +101,7 @@
android:layout_height="102dp"
android:layout_marginTop="@dimen/dp_22"
android:background="@drawable/disc">
-
+ <!--鐢ㄥ瘜鏂囨湰瀹炵幇-->
<TextView
android:id="@+id/info_rl1_f_text1_tv"
android:layout_width="wrap_content"
@@ -109,11 +109,11 @@
android:layout_centerInParent="true"
android:layout_marginStart="@dimen/dp_6"
android:gravity="end|center_vertical"
- android:text="88"
+ android:text="0"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_26"
android:textStyle="bold" />
-
+ <!--鍏堥殣钘�-->
<TextView
android:id="@+id/home_page_station_info_rl1_f_text2_tv"
android:layout_width="wrap_content"
@@ -124,7 +124,8 @@
android:layout_toEndOf="@+id/info_rl1_f_text1_tv"
android:text="%"
android:textColor="@color/text_191919"
- android:textSize="@dimen/text_12" />
+ android:textSize="@dimen/text_12"
+ android:visibility="gone" />
</RelativeLayout>
--
Gitblit v1.8.0