From 1863007fd5fc407af48a27c47362e0b1345b668a Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 23 十二月 2024 20:51:33 +0800 Subject: [PATCH] (修改新主题)2024年12月23日20:51:09 --- app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 196 +++++++++++++++++++++++++----------------------- 1 files changed, 102 insertions(+), 94 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 c056421..2765735 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 @@ -4,18 +4,10 @@ import static com.hdl.photovoltaic.ui.home.aachart.CustomStyleChartComposer.configureColorfulColumnChart; 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; @@ -26,10 +18,10 @@ 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; +import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.databinding.FragmentHomePageBinding; import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch; import com.hdl.photovoltaic.enums.PowerStationStatus; @@ -37,7 +29,6 @@ import com.hdl.photovoltaic.enums.UnitType; import com.hdl.photovoltaic.listener.CloudCallBeak; import com.hdl.photovoltaic.other.HdlCommonLogic; -import com.hdl.photovoltaic.other.HdlDeviceLogic; import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlPowerStationDataStatisticsLogic; import com.hdl.photovoltaic.other.HdlResidenceLogic; @@ -50,7 +41,6 @@ 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; @@ -120,37 +110,38 @@ viewBinding.homePageStationAddIv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(1); HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null); } }); //鍏ㄩ儴 - viewBinding.homeAllIl.parentLl.setOnClickListener(new View.OnClickListener() { + viewBinding.homeAllIl.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); } }); //鏁呴殰 - viewBinding.homeFaultsIl.parentLl.setOnClickListener(new View.OnClickListener() { + viewBinding.homeFaultsIl.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() { + viewBinding.homeOfflineIl.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() { + viewBinding.homeConnectedIl.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); } }); //鏃堕棿閫夋嫨鍣� @@ -172,17 +163,17 @@ timeType = TimeType.day; viewBinding.unitTv.setText(UnitType.kW); viewBinding.unitTextTv.setText(getString(R.string.pv_power)); - viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); - viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); + viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d)); + viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.v1.setVisibility(View.GONE); viewBinding.v2.setVisibility(View.VISIBLE); @@ -207,16 +198,16 @@ viewBinding.unitTv.setText(UnitType.kWh); viewBinding.unitTextTv.setText(getString(R.string.generation)); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); - viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); - viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); + viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d)); + viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.v1.setVisibility(View.GONE); viewBinding.v2.setVisibility(View.GONE); @@ -241,16 +232,16 @@ viewBinding.unitTv.setText(UnitType.kWh); viewBinding.unitTextTv.setText(getString(R.string.generation)); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); - viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); - viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); + viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d)); + viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.v1.setVisibility(View.VISIBLE); viewBinding.v2.setVisibility(View.GONE); @@ -273,16 +264,16 @@ viewBinding.unitTv.setText(UnitType.kWh); viewBinding.unitTextTv.setText(getString(R.string.generation)); viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); - viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); - viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); + viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d)); + viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF)); viewBinding.v1.setVisibility(View.VISIBLE); viewBinding.v2.setVisibility(View.VISIBLE); @@ -379,23 +370,23 @@ }).setType(new boolean[]{year, month, day, false, false, false})// 榛樿鍏ㄩ儴鏄剧ず .setCancelText(_mActivity.getString(R.string.loading_cancel))//鍙栨秷鎸夐挳鏂囧瓧 .setSubmitText(_mActivity.getString(R.string.loading_affirm))//纭鎸夐挳鏂囧瓧 - .setContentTextSize(18)//婊氳疆鏂囧瓧澶у皬 - .setTitleSize(18)//鏍囬鏂囧瓧澶у皬 - .setTitleText(_mActivity.getString(R.string.time_selectd))//鏍囬鏂囧瓧 + .setContentTextSize(16)//婊氳疆鏂囧瓧澶у皬 +// .setTitleSize(18)//鏍囬鏂囧瓧澶у皬 +// .setTitleText(_mActivity.getString(R.string.time_selectd))//鏍囬鏂囧瓧 .setOutSideCancelable(true)//鐐瑰嚮灞忓箷锛岀偣鍦ㄦ帶浠跺閮ㄨ寖鍥存椂锛屾槸鍚﹀彇娑堟樉绀� .isCyclic(false)//鏄惁寰幆婊氬姩 - .setTitleColor(_mActivity.getColor(R.color.text_E6000000))//鏍囬鏂囧瓧棰滆壊 - .setSubmitColor(_mActivity.getColor(R.color.text_38C494))//纭畾鎸夐挳鏂囧瓧棰滆壊 - .setCancelColor(_mActivity.getColor(R.color.text_66000000))//鍙栨秷鎸夐挳鏂囧瓧棰滆壊 - .setTitleBgColor(_mActivity.getColor(R.color.text_FFFFFFFF))//鏍囬鑳屾櫙棰滆壊 Night mode - .setBgColor(_mActivity.getColor(R.color.text_FFFFFFFF))//婊氳疆鑳屾櫙棰滆壊 Night mode - .setTextColorCenter(_mActivity.getColor(R.color.text_E6000000)).setDate(selectedDate)// 濡傛灉涓嶈缃殑璇濓紝榛樿鏄郴缁熸椂闂�*/ +// .setTitleColor(_mActivity.getColor(R.color.text_E6FFFFFF))//鏍囬鏂囧瓧棰滆壊 + .setSubmitColor(_mActivity.getColor(R.color.text_E6FFFFFF))//纭畾鎸夐挳鏂囧瓧棰滆壊 + .setCancelColor(_mActivity.getColor(R.color.text_FF8E8E8E))//鍙栨秷鎸夐挳鏂囧瓧棰滆壊 + .setTitleBgColor(_mActivity.getColor(R.color.text_FF222222))//鏍囬鑳屾櫙棰滆壊 Night mode + .setBgColor(_mActivity.getColor(R.color.text_FF222222))//婊氳疆鑳屾櫙棰滆壊 Night mode + .setTextColorCenter(_mActivity.getColor(R.color.text_E6FFFFFF)).setDate(selectedDate)// 濡傛灉涓嶈缃殑璇濓紝榛樿鏄郴缁熸椂闂�*/ .setRangDate(startDate, endDate)//璧峰缁堟骞存湀鏃ヨ瀹� .setLabel(_mActivity.getString(R.string.year), _mActivity.getString(R.string.month), _mActivity.getString(R.string.day), _mActivity.getString(R.string.hour), _mActivity.getString(R.string.minute), _mActivity.getString(R.string.seconds))//榛樿璁剧疆涓哄勾鏈堟棩鏃跺垎绉� .isCenterLabel(false) //鏄惁鍙樉绀轰腑闂撮�変腑椤圭殑label鏂囧瓧锛宖alse鍒欐瘡椤筰tem鍏ㄩ儴閮藉甫鏈塴abel銆� .isDialog(false)//鏄惁鏄剧ず涓哄璇濇鏍峰紡 .setItemVisibleCount(7)//瀵硅瘽妗嗛珮搴� - .setDividerColor(_mActivity.getColor(R.color.text_E1E1E1)).setLineSpacingMultiplier(3f)// + .setDividerColor(_mActivity.getColor(R.color.text_1AFFFFFF)).setLineSpacingMultiplier(3f)// .build(); pvTime.show(); } @@ -403,7 +394,7 @@ /** * 鍥捐〃鍔犺浇 */ - private void setUpAAChartView() { + private void setUpAAChartView(boolean needDelay) { aaChartView = viewBinding.autoSizeMyAAChart; aaChartView.callBack = this; if (TimeType.day.equals(timeType)) { @@ -411,47 +402,48 @@ } else if (TimeType.month.equals(timeType) || TimeType.year.equals(timeType) || TimeType.all.equals(timeType)) { aaChartModel = configureColorfulColumnChart(getString(R.string.generation), fieldNames, fieldValues); } - aaChartView.aa_drawChartWithChartModel(aaChartModel); + aaChartView.aa_drawChartWithChartOptions(aaChartModel.aa_toAAOptions()); + } + @Override + public void onDestroy() { + super.onDestroy(); } private void initView() { - - viewBinding.homeAllIl.stationTitleTv.setText(getString(R.string.message_all)); - viewBinding.homeFaultsIl.stationTitleTv.setText(getString(R.string.my_power_station_malfunction)); - viewBinding.homeOfflineIl.stationTitleTv.setText(getString(R.string.my_power_station_off_line)); - viewBinding.homeConnectedIl.stationTitleTv.setText(getString(R.string.to_be_added)); - String dataStr = TimeUtils.getDateTimestamp(TimeUtils.getCurrentTimestamp(), TimeUtils.getTimeDateFormat(timeType)); viewBinding.yearMonthDayTv.setText(dataStr); - 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; - viewBinding.homePageStationInfoRl1TitleTv.setText(generation); +// 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; +// viewBinding.homePageStationInfoRl1TitleTv.setText(generation); - viewBinding.homePageStationInfoRl2DayIc.dataTypeTv.setText(R.string.day_power_generation); - viewBinding.homePageStationInfoRl2MonIc.dataTypeTv.setText(R.string.month_power_generation); - viewBinding.homePageStationInfoRl2YearIc.dataTypeTv.setText(R.string.year_power_generation); - viewBinding.homePageStationInfoRl2CumulativeIc.dataTypeTv.setText(R.string.cumulative_power_generation); - +// viewBinding.day.setText(R.string.day_power_generation); +// viewBinding.month.setText(R.string.month_power_generation); +// viewBinding.year.setText(R.string.year_power_generation); +// viewBinding.Total.setText(R.string.cumulative_power_generation); +// viewBinding.unitTv.setText(UnitType.kW); - viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494)); - viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_38C494)); + + + viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d)); + viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF)); viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000)); - viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66000000)); + viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF)); viewBinding.v1.setVisibility(View.GONE); viewBinding.v2.setVisibility(View.VISIBLE); viewBinding.v3.setVisibility(View.VISIBLE); viewBinding.homePageStationSelectTimeLl.setVisibility(View.VISIBLE); - setUpAAChartView();//鍥捐〃鍔犺浇 + viewBinding.autoSizeMyAAChart.setBackgroundColor(_mActivity.getColor(R.color.text_FF1C1C1E)); + setUpAAChartView(true);//鍥捐〃鍔犺浇 } @@ -493,10 +485,10 @@ if (statusOverviewBean == null) { return; } - viewBinding.homeAllIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getTotal())); - viewBinding.homeFaultsIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getFault())); - viewBinding.homeOfflineIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getOffline())); - viewBinding.homeConnectedIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getConnecting())); + viewBinding.stationAllTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getTotal())); + viewBinding.stationFaultsTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getFault())); + viewBinding.stationOfflineTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getOffline())); + viewBinding.stationConnectedTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getConnecting())); } @Override @@ -524,22 +516,38 @@ viewBinding.infoRl1Text1Tv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getInstalledCapacity())); 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); +// 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_66FFFFFF)); +// spannableString.setSpan(colorSpan, startIndex, endIndex, 0); +// viewBinding.infoRl1FText1Tv.setText(spannableString); + viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio()); + try { + int progress = 0; + if (!TextUtils.isEmpty(dataOverBean.getPowerRatio())) { + progress = (int) Double.parseDouble(dataOverBean.getPowerRatio()); + if (progress > 100) { + progress = 100; + } + if (progress < 0) { + progress = 0; + } + viewBinding.progressBar.setProgress(progress); + } - viewBinding.infoRl1FText1Tv.setText(spannableString); + } catch (Exception ignored) { + } - viewBinding.homePageStationInfoRl2DayIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTodayElectricity())); - viewBinding.homePageStationInfoRl2MonIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getMonthElectricity())); - viewBinding.homePageStationInfoRl2YearIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getYearElectricity())); - viewBinding.homePageStationInfoRl2CumulativeIc.dataTv.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTotalElectricity())); + viewBinding.day.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTodayElectricity())); + viewBinding.month.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getMonthElectricity())); + viewBinding.year.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getYearElectricity())); + viewBinding.Total.setText(HdlCommonLogic.getConvertDoubleUnit(dataOverBean.getTotalElectricity())); + } }); } @@ -577,7 +585,7 @@ } fieldNames = keys; fieldValues = values; - setUpAAChartView(); + setUpAAChartView(false); } }); @@ -613,4 +621,4 @@ } -} \ No newline at end of file +} -- Gitblit v1.8.0