From 5d3efa4c93dde0cde474951e5310bb72ebbf4184 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:18:26 +0800
Subject: [PATCH] 2025年05月07日15:18:20 1.2.0
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 105 +++++++++++++++++++++++-----------------------------
1 files changed, 47 insertions(+), 58 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 e73d49b..4d1ee26 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
@@ -61,21 +61,22 @@
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
//缁勪覆瀹归噺(鍒涘缓鐢电珯鏃惰緭鍏ョ殑缁勪覆瀹归噺)
- holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity()));
+ holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(), UnitType.kWp));
holder.pv_kw_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity()));
//褰撴棩鍙戠數
- holder.generation_today_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity()));
+ holder.generation_today_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity(), UnitType.kWh));
holder.generation_today_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getTodayElectricity()));
//閫嗗彉鍣ㄩ瀹氬姛鐜囷紙鍗曚釜閫嗗彉鍣ㄩ瀹氬姛鐜�*閫嗗彉鍣ㄦ暟閲忥級
- holder.output_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInvPower()));
+ holder.output_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInvPower(), UnitType.kW));
holder.output_kw_unit.setText(HdlCommonLogic.convertKWUnit(houseIdBean.getInvPower()));
- //鐢垫睜鑳介噺
- holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity()));
+ //鐢垫睜鑳介噺锛堝閲�*鐢垫睜鏁伴噺锛�
+ holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity(), UnitType.kWh));
holder.battery_storage_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getBatteryCapacity()));
holder.home_location_tv.setText(houseIdBean.getHomeAddress());
holder.item_parent_rl.setTag(position);
setHomeStateTextViewStyle(holder.home_state_tv, houseIdBean.getPowerStationStatus());
+ setHomeDebugStateTextViewStyle(holder.home_debug_state_tv, holder.home_debug_state_iv, houseIdBean.getDebugStatus());
GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, 6);
// HdlLogLogic.print("---鐢电珯鍚嶇О:" + houseIdBean.getHomeName() + "---鍥剧墖url:" + houseIdBean.getPowerStationImage(), false);
holder.item_parent_rl.setOnClickListener(new View.OnClickListener() {
@@ -102,10 +103,12 @@
}
});
holder.home_del_ll.setVisibility(View.GONE);
- if (houseIdBean.getDeliverStatus().equals(DeliverStatus.UNDELIVERED)) {
+
+ if (houseIdBean.getDebugStatus().equals(DebugStatus.Debugging)) {
//鏈氦浠樺畬瑕佹樉绀哄垹闄ゆ寜閽�
holder.home_del_ll.setVisibility(View.VISIBLE);
}
+
//鍒犻櫎鐢电珯
holder.home_del_ll.setOnClickListener(new View.OnClickListener() {
@Override
@@ -154,59 +157,39 @@
/**
* 璁剧疆銆愮數绔欒皟璇曠姸鎬併�戠粍浠舵牱寮�
*
- * @param textView 鏄剧ず缁勪欢
- * 濡傛灉璁惧浠庢潵娌′笂鎶ヨ繃鏁版嵁鏁版嵁 鐘舵�侊細杩炴帴涓�
- * 璁惧鍦ㄧ嚎 浣嗘槸褰撳墠澶勪簬鏁呴殰 鐘舵�侊細鏁呴殰
- * 璁惧鍦ㄧ嚎锛堟湁涓婃姤杩囨暟鎹紝娌℃湁鏁呴殰锛� 鐘舵�侊細鍦ㄧ嚎
- * 璁惧绂荤嚎 鐘舵�侊細绂荤嚎
- * @param state_value 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�)
+ * @param textView 鏄剧ず浣忓畢鐘舵�佹枃鏈粍浠�
+ * @param imageView 鏄剧ず浣忓畢鐘舵�佸浘鏍囩粍浠�
+ * @param stateValue 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�)
*/
- private void setHomeDebugStateTextViewStyle(TextView textView, int state_value) {
+ private void setHomeDebugStateTextViewStyle(TextView textView, ImageView imageView, String stateValue) {
- String text = mContext.getString(R.string.my_power_station_operation);
- Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
- if (mPowerStationStatus.equals(DebugStatus.All)) {
- switch (state_value) {
- case 1: {
- text = mContext.getString(R.string.my_power_station_operation);
- }
- break;
-
- case 2: {
- text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
- }
- break;
- case 3: {
- text = mContext.getString(R.string.my_power_station_connecting);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
- }
- break;
- case 4:
- case 5: {
- text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
- }
- //5:绂荤嚎鏈夋晠闅淥ffline_fault
- break;
-// case 5: {
-// text = mContext.getString(R.string.Offline_fault);
-// drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
-// }
-// break;
+ String text = mContext.getString(R.string.be_debugging);
+ Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.debugging);
+ switch (stateValue) {
+ case DebugStatus.Debugging: {
+ text = mContext.getString(R.string.be_debugging);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.debugging);
}
- } else if (mPowerStationStatus.equals(PowerStationStatus.malfunction)) {
- text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
- } else if (mPowerStationStatus.equals(PowerStationStatus.off)) {
- text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
- } else if (mPowerStationStatus.equals(PowerStationStatus.connecting)) {
- text = mContext.getString(R.string.my_power_station_connecting);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
+ break;
+
+ case DebugStatus.WAIT_DELIVERED: {
+ text = mContext.getString(R.string.debugging_completed);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.done);
+ }
+ break;
+ case DebugStatus.Delivered: {
+ text = mContext.getString(R.string.delivered);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.delivered);
+ }
+ break;
+ case DebugStatus.SECONDARY_DEBUGGIN: {
+ text = mContext.getString(R.string.authorization_debugging);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.authorization_debugging);
+ }
+ break;
}
-// textView.setText(text);
- textView.setBackground(drawable);
+ textView.setText(text);
+ imageView.setBackground(drawable);
}
@@ -219,7 +202,7 @@
* 璁惧鍦ㄧ嚎 浣嗘槸褰撳墠澶勪簬鏁呴殰 鐘舵�侊細鏁呴殰
* 璁惧鍦ㄧ嚎锛堟湁涓婃姤杩囨暟鎹紝娌℃湁鏁呴殰锛� 鐘舵�侊細鍦ㄧ嚎
* 璁惧绂荤嚎 鐘舵�侊細绂荤嚎
- * @param state_value 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�)
+ * @param state_value 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�,6:閮ㄥ垎绂荤嚎)
*/
private void setHomeStateTextViewStyle(TextView textView, int state_value) {
@@ -232,7 +215,8 @@
}
break;
- case 2: {
+ case 2:
+ case 6: {
text = mContext.getString(R.string.my_power_station_off_line);
drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
}
@@ -279,6 +263,9 @@
public ImageView homeIconIv;//浣忓畢鍥剧墖
public TextView homeNameTv;//浣忓畢鍚嶇О
+ public ImageView home_debug_state_iv;//浣忓畢璋冭瘯鐘舵�佸浘鏍�
+ public TextView home_debug_state_tv;//浣忓畢璋冭瘯鐘舵��
+
public TextView pv_value_tv;//缁勪覆瀹归噺
public TextView pv_kw_unit;//鍙戠數鍔熺巼鍗曚綅
public TextView generation_today_value_tv;//褰撴棩鍙戠數
@@ -298,6 +285,8 @@
super(itemView);
homeIconIv = itemView.findViewById(R.id.home_image_iv);
homeNameTv = itemView.findViewById(R.id.home_name_tv);
+ home_debug_state_iv = itemView.findViewById(R.id.home_debug_state_iv);
+ home_debug_state_tv = itemView.findViewById(R.id.home_debug_state_tv);
pv_value_tv = itemView.findViewById(R.id.pv_value_tv);
pv_kw_unit = itemView.findViewById(R.id.pv_kw_unit);
generation_today_value_tv = itemView.findViewById(R.id.generation_today_value_tv);
@@ -324,4 +313,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0