From f1b6f9eeb0c65be3be02eba1296bf69067af6d9b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 25 九月 2024 14:51:59 +0800
Subject: [PATCH] 2024年09月25日14:51:50
---
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
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 e93c164..a2fbcd5 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;
@@ -119,7 +128,7 @@
viewBinding.homeAllIl.parentLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.All);
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.homepage_title_tab_switch,ConstantManage.station_page, PowerStationStatus.All);
}
});
@@ -127,21 +136,21 @@
viewBinding.homeFaultsIl.parentLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.malfunction);
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.homepage_title_tab_switch,ConstantManage.station_page, PowerStationStatus.malfunction);
}
});
//绂荤嚎
viewBinding.homeOfflineIl.parentLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.off);
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.homepage_title_tab_switch,ConstantManage.station_page, PowerStationStatus.off);
}
});
//寰呮帴鍏�
viewBinding.homeConnectedIl.parentLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- HdlCommonLogic.getInstance().postEventBus(ConstantManage.station_status, PowerStationStatus.connecting);
+ HdlCommonLogic.getInstance().postEventBus(ConstantManage.homepage_title_tab_switch,ConstantManage.station_page, PowerStationStatus.connecting);
}
});
//鏃堕棿閫夋嫨鍣�
@@ -417,11 +426,11 @@
String dataStr = TimeUtils.getDateTimestamp(TimeUtils.getCurrentTimestamp(), TimeUtils.getTimeDateFormat(timeType));
viewBinding.yearMonthDayTv.setText(dataStr);
- String installed_capacity = getString(R.string.installed_capacity) + "(" + UnitType.kWp + ")";
+ String installed_capacity = getString(R.string.string_capacity) + "(" + UnitType.kWp + ")";
viewBinding.infoRl1Text2Tv.setText(installed_capacity);
String generated_power = getString(R.string.generated_power) + "(" + UnitType.kW + ")";
viewBinding.infoRl1Text4Tv.setText(generated_power);
- String generation = getString(R.string.generation) + "(" + UnitType.kWh + ")";
+ String generation = getString(R.string.generation) + "/" + UnitType.kWh;
viewBinding.homePageStationInfoRl1TitleTv.setText(generation);
viewBinding.homePageStationInfoRl2DayIc.dataTypeTv.setText(R.string.day_power_generation);
@@ -469,7 +478,6 @@
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愰椤点��");
-
}
}
}
@@ -514,8 +522,19 @@
return;
}
viewBinding.infoRl1Text1Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getInstalledCapacity()));
- viewBinding.infoRl1Text3Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getPower(),UnitType.kW,false));
- viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio());
+ viewBinding.infoRl1Text3Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getPower(), UnitType.kW, false));
+
+ 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()));
--
Gitblit v1.8.0