From ce9298417731c02a1b41b83049f637abc356fc02 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 11:38:03 +0800
Subject: [PATCH] 2025年04月30日11:38:01
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 37 --
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 10
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 123 ++++++++---
app/src/main/res/layout/item_plant_details.xml | 398 ++++++++++++++++++++++-----------------
4 files changed, 324 insertions(+), 244 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 47b387e..46c0367 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -233,7 +233,7 @@
houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//瑁呮満瀹归噺
houseInfoBean.setPower(houseIdBean.getPower());//鍙戠數鍔熺巼
houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//浠婂ぉ鍙戠數閲�
- houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
+ houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
//娣诲姞鍒版湰鍦扮紦瀛�
addHouseToLocalMemory(houseInfoBean);
}
@@ -592,8 +592,12 @@
/**
* 鐢电珯鐘舵�佹瑙�(瀹夎鍟�)
+ *
+ * @param debugStatus (璋冭瘯鐘舵��:Debugging = 璋冭瘯涓�,WAIT_DELIVERED = 璋冭瘯瀹屾垚,Delivered = 宸蹭氦浠�,SECONDARY_DEBUGGIN = 鎺堟潈璋冭瘯)
+ * @param installedCapacityMin 鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
+ * @param installedCapacityMax 鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
*/
- public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) {
+ public void getStatusOverview(String debugStatus, String installedCapacityMin, String installedCapacityMax, CloudCallBeak<StatusOverviewBean> cloudCallBeak) {
String requestUrl = HttpApi.POST_statusOverview;
JsonObject json = new JsonObject();
if (!TextUtils.isEmpty(installedCapacityMin)) {
@@ -1169,4 +1173,4 @@
}
}
-}
+}
\ No newline at end of file
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 1a98fbd..9190c23 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
@@ -1,3 +1,4 @@
+
package com.hdl.photovoltaic.ui.adapter;
import android.content.Context;
@@ -14,13 +15,12 @@
import androidx.appcompat.content.res.AppCompatResources;
import androidx.recyclerview.widget.RecyclerView;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.enums.DebugStatus;
+import com.hdl.photovoltaic.enums.DeliverStatus;
import com.hdl.photovoltaic.enums.PowerStationStatus;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.other.HdlCommonLogic;
-import com.hdl.photovoltaic.other.HdlDeviceLogic;
-import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.photovoltaic.widget.SwipeLayout;
@@ -60,9 +60,6 @@
HouseIdBean houseIdBean = this.mList.get(position);
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
- //瑁呮満瀹归噺
- holder.capacityTv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(), UnitType.kWp));
- holder.capacity_kwp_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity()));
//缁勪覆瀹归噺(鍒涘缓鐢电珯鏃惰緭鍏ョ殑缁勪覆瀹归噺)
holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity(), UnitType.kWp));
@@ -77,9 +74,10 @@
holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity(), UnitType.kWh));
holder.battery_storage_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getBatteryCapacity()));
- holder.plant_details_location_tv.setText(houseIdBean.getHomeAddress());
+ holder.home_location_tv.setText(houseIdBean.getHomeAddress());
holder.item_parent_rl.setTag(position);
- setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
+ 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() {
@@ -94,7 +92,7 @@
}
});
//绉诲姩鐢电珯浣嶇疆
- holder.move_home_ll.setOnClickListener(new View.OnClickListener() {
+ holder.home_move_ll.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
@@ -109,10 +107,11 @@
if (houseIdBean.getDebugStatus().equals(DebugStatus.Debugging)) {
//鏈氦浠樺畬瑕佹樉绀哄垹闄ゆ寜閽�
- holder.del_home_ll.setVisibility(View.VISIBLE);
+ holder.home_del_ll.setVisibility(View.VISIBLE);
}
+
//鍒犻櫎鐢电珯
- holder.del_home_ll.setOnClickListener(new View.OnClickListener() {
+ holder.home_del_ll.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
@@ -157,7 +156,47 @@
}
/**
- * 鏀瑰彉缁勪欢鏍峰紡
+ * 璁剧疆銆愮數绔欒皟璇曠姸鎬併�戠粍浠舵牱寮�
+ *
+ * @param textView 鏄剧ず浣忓畢鐘舵�佹枃鏈粍浠�
+ * @param imageView 鏄剧ず浣忓畢鐘舵�佸浘鏍囩粍浠�
+ * @param stateValue 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�)
+ */
+ private void setHomeDebugStateTextViewStyle(TextView textView, ImageView imageView, String stateValue) {
+
+ 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);
+ }
+ 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);
+ imageView.setBackground(drawable);
+
+
+ }
+
+ /**
+ * 璁剧疆銆愮數绔欑姸鎬併�戠粍浠舵牱寮�
*
* @param textView 鏄剧ず缁勪欢
* 濡傛灉璁惧浠庢潵娌′笂鎶ヨ繃鏁版嵁鏁版嵁 鐘舵�侊細杩炴帴涓�
@@ -166,7 +205,7 @@
* 璁惧绂荤嚎 鐘舵�侊細绂荤嚎
* @param state_value 鐢电珯鐘舵��(1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰,5:绂荤嚎鏈夋晠闅�,6:閮ㄥ垎绂荤嚎)
*/
- private void setTextViewStyle(TextView textView, int state_value) {
+ private void setHomeStateTextViewStyle(TextView textView, int state_value) {
String text = mContext.getString(R.string.my_power_station_operation);
Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
@@ -224,38 +263,44 @@
public ImageView homeIconIv;//浣忓畢鍥剧墖
public TextView homeNameTv;//浣忓畢鍚嶇О
- public TextView capacityTv;//瑁呮満瀹归噺
- public TextView capacity_kwp_unit;//瑁呮満瀹归噺鍗曚綅
- public TextView power_value_tv;//鍙戠數鍔熺巼
- public TextView power_kw_unit;//鍙戠數鍔熺巼鍗曚綅
- public TextView day_value_tv;//褰撴棩鍙戠數閲�
- public TextView day_kwh_unit;//褰撴棩鍙戠數閲忓崟浣�
- public TextView month_value_tv;//褰撴湀鍙戠數閲�
- public TextView month_kwh_unit;//褰撴湀鍙戠數閲忓崟浣�
- public TextView stateTv;//鐢电珯鐘舵��(杩炴帴涓�,杩愯,绂荤嚎,鏁呴殰);
+
+ 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;//褰撴棩鍙戠數
+ public TextView generation_today_kw_unit;//褰撴棩鍙戠數鍗曚綅
+ public TextView output_value_tv;//棰濆畾鍔熺巼
+ public TextView output_kw_unit;//棰濆畾鍔熺巼鍗曚綅
+ public TextView battery_storage_value_tv;//鐢垫睜鑳介噺
+ public TextView battery_storage_kw_unit;//鐢垫睜鑳介噺鍗曚綅
+ public TextView home_state_tv;//鐢电珯鐘舵��(杩炴帴涓�,杩愯,绂荤嚎,鏁呴殰);
public RelativeLayout item_parent_rl;//鏉＄洰鐖跺鍣�
- public LinearLayout move_home_ll;//绉诲姩鐢电珯浣嶇疆
- public LinearLayout del_home_ll;//鍒犻櫎鐢电珯
- public TextView plant_details_location_tv;//鐢电珯鍦板潃
+ public LinearLayout home_move_ll;//绉诲姩鐢电珯浣嶇疆
+ public LinearLayout home_del_ll;//鍒犻櫎鐢电珯
+ public TextView home_location_tv;//鐢电珯鍦板潃
public SwipeLayout item_parent_swipeLayout;//鐖跺鍣�
public MyViewHolder(@NonNull View itemView) {
super(itemView);
- homeIconIv = itemView.findViewById(R.id.device_details_image_iv);
- homeNameTv = itemView.findViewById(R.id.device_details_name_tv);
- capacityTv = itemView.findViewById(R.id.device_details_value_tv);
- capacity_kwp_unit = itemView.findViewById(R.id.capacity_kwp_unit);
- power_value_tv = itemView.findViewById(R.id.power_value_tv);
- power_kw_unit = itemView.findViewById(R.id.power_kw_unit);
- day_value_tv = itemView.findViewById(R.id.day_value_tv);
- day_kwh_unit = itemView.findViewById(R.id.day_kwh_unit);
- month_value_tv = itemView.findViewById(R.id.month_value_tv);
- month_kwh_unit = itemView.findViewById(R.id.month_kwh_unit);
- stateTv = itemView.findViewById(R.id.device_state_tv);
+ 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);
+ generation_today_kw_unit = itemView.findViewById(R.id.generation_today_kw_unit);
+ output_value_tv = itemView.findViewById(R.id.output_value_tv);
+ output_kw_unit = itemView.findViewById(R.id.output_kw_unit);
+ battery_storage_value_tv = itemView.findViewById(R.id.battery_storage_value_tv);
+ battery_storage_kw_unit = itemView.findViewById(R.id.battery_storage_kw_unit);
+ home_state_tv = itemView.findViewById(R.id.home_state_tv);
item_parent_rl = itemView.findViewById(R.id.item_parent_rl);
- move_home_ll = itemView.findViewById(R.id.move_ll);
- del_home_ll = itemView.findViewById(R.id.del_ll);
- plant_details_location_tv = itemView.findViewById(R.id.plant_details_location_tv);
+ home_move_ll = itemView.findViewById(R.id.move_ll);
+ home_del_ll = itemView.findViewById(R.id.del_ll);
+ home_location_tv = itemView.findViewById(R.id.home_location_tv);
item_parent_swipeLayout = itemView.findViewById(R.id.item_parent_swipeLayout);
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index f947370..e40ab20 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -1,20 +1,16 @@
package com.hdl.photovoltaic.ui.powerstation;
import android.Manifest;
-import android.app.Dialog;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.location.LocationManager;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
@@ -49,7 +45,6 @@
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlDialogLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
-import com.hdl.photovoltaic.other.HdlOtaLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
@@ -61,7 +56,6 @@
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
-import com.hdl.photovoltaic.utils.ProcessManagerUtils;
import com.hdl.photovoltaic.utils.URLEncodingUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.DefaultFilteringDialog;
@@ -261,6 +255,7 @@
installedCapacityMinValue = min;//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
installedCapacityMaxValue = max;//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
screeningConditionStatus = state;//璋冭瘯鐘舵��(鍏ㄩ儴;璋冭瘯涓�;璋冭瘯瀹屾垚;宸蹭氦浠�;鎺堟潈璋冭瘯)
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -363,14 +358,7 @@
}
});
-// //鐢电珯缂栬緫鎸夐挳
-// viewBinding.editIv.setOnClickListener(new View.OnClickListener() {
-// @Override
-// public void onClick(View v) {
-// startActivity(HouseListEditActivity.class);
-// }
-// });
- //鐢电珯鍚嶇О绛涢��
+ //PV绛涢��
viewBinding.stationNameRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -378,10 +366,11 @@
screeningConditionStyle(viewBinding.stationNameRl, viewBinding.stationNameIv, isSelected);
key = SortType.installedCapacitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
- //鐢电珯鍙戠數鍔熺巼绛涢��
+ //棰濆畾鍔熺巼绛涢��
viewBinding.stationPowerRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -413,17 +402,7 @@
screeningConditionStyle(viewBinding.stationDayRl, viewBinding.stationDayIv, isSelected);
key = SortType.todayElectricitySort;
value = isSelected ? SortValue.ascending : SortValue.descending;
- loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
- }
- });
- //鐢电珯鐢垫睜瀹归噺绛涢��
- viewBinding.stationMonthRl.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- boolean isSelected = !v.isSelected();
- screenIconState(viewBinding.stationMonthRl, viewBinding.stationMonthIv, isSelected);
- key = SortType.batteryCapacitySort;
- value = isSelected ? SortValue.ascending : SortValue.descending;
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -658,6 +637,7 @@
// if (MqttRecvClient.getInstance() != null) {
// MqttRecvClient.getInstance().removeAllTopic();
// }
+
loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
@@ -831,7 +811,7 @@
if (isRefreshing) {
hideLoading();
}
-
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
}
@@ -900,6 +880,7 @@
if (isRefreshing) {
hideLoading();
}
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
}
@@ -1211,4 +1192,4 @@
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 89b01b4..6074fcf 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -12,26 +12,25 @@
<RelativeLayout
android:id="@+id/item_parent_rl"
android:layout_width="match_parent"
- android:layout_height="160.5dp">
+ android:layout_height="204.5dp">
<RelativeLayout
android:id="@+id/device_details_info_rl"
android:layout_width="match_parent"
- android:layout_height="150.5dp"
+ android:layout_height="194.5dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bj_ff1c1c1e">
-
+ <!--鐢电珯鍥剧墖-->
<ImageView
- android:id="@+id/device_details_image_iv"
+ android:id="@+id/home_image_iv"
android:layout_width="44dp"
android:layout_height="42dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_13"
android:scaleType="centerCrop" />
-
-
+ <!--鐢电珯鍚嶇О浠ュ強鍦板潃-->
<LinearLayout
android:id="@+id/home_name_ll"
android:layout_width="match_parent"
@@ -43,28 +42,34 @@
android:gravity="center_vertical"
android:orientation="horizontal">
- <TextView
- android:id="@+id/device_state_tv"
- android:layout_width="7dp"
- android:layout_height="7dp"
- android:background="@drawable/device_state_ff38c494" />
+ <LinearLayout
+ android:layout_width="@dimen/dp_19"
+ android:layout_height="@dimen/dp_19"
+ android:gravity="center">
+
+ <TextView
+ android:id="@+id/home_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:background="@drawable/device_state_ff38c494" />
+ </LinearLayout>
<TextView
- android:id="@+id/device_details_name_tv"
+ android:id="@+id/home_name_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_vertical|start"
- android:paddingStart="@dimen/dp_6"
- android:paddingEnd="@dimen/dp_20"
+ android:paddingStart="0dp"
+ android:paddingEnd="@dimen/dp_5"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
-
- <TextView
- android:id="@+id/device_details_sn_tv"
+ <!--鐢电珯鐘舵��-->
+ <LinearLayout
+ android:id="@+id/home_debug_state_ll"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_alignParentTop="true"
@@ -123,201 +128,246 @@
android:orientation="vertical">
<LinearLayout
- android:id="@+id/power_ll"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:orientation="horizontal">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18">
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
- <TextView
- android:id="@+id/power_value_tv"
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/pv" />
+
+ <LinearLayout
+ android:id="@+id/pv_ll"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:gravity="center_vertical|start"
- android:text="0"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:orientation="vertical">
- <TextView
- android:id="@+id/power_kw_unit"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginStart="3dp"
- android:gravity="bottom"
- android:text="kW"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_10" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+ <!--缁勪覆瀹归噺鍊�-->
+ <TextView
+ android:id="@+id/pv_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/pv_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kWp"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/pv_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/pv"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
</LinearLayout>
-
- <TextView
- android:id="@+id/power_type_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
- android:layout_marginTop="3dp"
- android:gravity="center_vertical|start"
- android:text="@string/generated_power"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_12" />
-
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="@dimen/dp_0"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center">
-
- <View
- android:layout_width="0.5dp"
- android:layout_height="17.5dp"
- android:layout_gravity="center"
- android:background="@color/text_1AFFFFFF" />
- </LinearLayout>
-
-
- <LinearLayout
- android:id="@+id/day_ll"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="vertical">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18">
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
- <TextView
- android:id="@+id/day_value_tv"
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/generation_today" />
+
+ <LinearLayout
+ android:id="@+id/generation_today_ll"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:gravity="start|center_horizontal"
- android:text="0"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:orientation="vertical">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
- <TextView
- android:id="@+id/day_kwh_unit"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginStart="3dp"
- android:gravity="bottom"
- android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_10" />
+ <TextView
+ android:id="@+id/generation_today_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/generation_today_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kW"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/generation_today_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/day_generation"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
</LinearLayout>
-
-
- <TextView
- android:id="@+id/day_type_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
- android:layout_marginTop="3dp"
- android:gravity="start|center_horizontal"
- android:text="@string/day_power_generation"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_12" />
-
</LinearLayout>
<LinearLayout
- android:layout_width="@dimen/dp_0"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:gravity="center">
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_32">
<View
- android:layout_width="0.5dp"
- android:layout_height="17.5dp"
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
android:layout_gravity="center"
android:background="@color/text_1AFFFFFF" />
</LinearLayout>
<LinearLayout
- android:id="@+id/month_ll"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:orientation="horizontal">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18">
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
- <TextView
- android:id="@+id/month_value_tv"
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/output" />
+
+ <LinearLayout
+ android:id="@+id/output_ll"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:gravity="center_vertical|start"
- android:text="0"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
+ android:orientation="vertical">
- <TextView
- android:id="@+id/month_kwh_unit"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginStart="3dp"
- android:gravity="bottom"
- android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_10" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+ <!--缁勪覆瀹归噺鍊�-->
+ <TextView
+ android:id="@+id/output_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/output_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kWh"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/output_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/output"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
</LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
- <TextView
- android:id="@+id/month_type_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_15"
- android:layout_marginTop="3dp"
- android:gravity="center_vertical|start"
- android:text="@string/battery_capacity_indicator"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_12" />
+ <ImageView
+ android:layout_width="37.5dp"
+ android:layout_height="37.5dp"
+ android:layout_marginEnd="@dimen/dp_12"
+ android:src="@drawable/battery_storage" />
+ <LinearLayout
+ android:id="@+id/battery_storage_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+
+ <TextView
+ android:id="@+id/battery_storage_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|start"
+ android:text="0"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/battery_storage_kw_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginStart="3dp"
+ android:gravity="bottom"
+ android:text="kWh"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_10" />
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/battery_storage_type_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_14"
+ android:layout_marginTop="3dp"
+ android:gravity="center_vertical|start"
+ android:text="@string/battery_capacity_indicator"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
+
+ </LinearLayout>
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
-
- <View
- android:id="@+id/line"
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:layout_below="@+id/screening_condition_ll"
- android:layout_alignStart="@+id/device_details_image_iv"
- android:layout_marginTop="@dimen/dp_7"
- android:layout_marginEnd="@dimen/dp_16"
- android:background="@color/text_1AFFFFFF" />
- <!--鐢电珯鍦板潃-->
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_35"
- android:layout_below="@+id/line"
- android:layout_marginStart="11dp">
-
- <ImageView
- android:id="@+id/plant_details_location_iv"
- android:layout_width="@dimen/dp_19"
- android:layout_height="@dimen/dp_19"
- android:layout_centerVertical="true"
- android:src="@drawable/location" />
-
- <TextView
- android:id="@+id/plant_details_location_tv"
- android:layout_width="290dp"
- android:layout_height="@dimen/dp_17"
- android:layout_centerVertical="true"
- android:layout_toEndOf="@+id/plant_details_location_iv"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:singleLine="true"
- android:text="@string/power_station"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_12" />
- </RelativeLayout>
</RelativeLayout>
--
Gitblit v1.8.0