From be8cd0c440b19ea676bb2de4f9378569234e01d8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:10:51 +0800
Subject: [PATCH] 2025年07月07日11:10:34
---
app/src/main/res/layout/fragment_house_list.xml | 103 ++++-----
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/res/layout/item_plant_details.xml | 398 ++++++++++++++++++++++-----------------
4 files changed, 288 insertions(+), 260 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/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index 4156922..7eaa523 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,19 +1,15 @@
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.view.View;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
@@ -46,7 +42,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;
@@ -58,7 +53,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;
@@ -258,6 +252,7 @@
installedCapacityMinValue = min;//鏈�灏忕粍涓插閲�(瑁呮満瀹归噺)
installedCapacityMaxValue = max;//鏈�澶х粍涓插閲�(瑁呮満瀹归噺)
screeningConditionStatus = state;//璋冭瘯鐘舵��(鍏ㄩ儴;璋冭瘯涓�;璋冭瘯瀹屾垚;宸蹭氦浠�;鎺堟潈璋冭瘯)
+ getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
});
@@ -360,14 +355,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) {
@@ -375,10 +363,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) {
@@ -410,17 +399,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/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 46fc52c..1d87e30 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -25,7 +25,7 @@
android:layout_centerVertical="true"
android:gravity="center"
android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<TextView
@@ -37,19 +37,11 @@
android:layout_toEndOf="@+id/power_station_label"
android:gravity="center"
android:text="@string/device"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
- <ImageView
- android:id="@+id/edit_iv"
- android:layout_width="@dimen/dp_31"
- android:layout_height="@dimen/dp_31"
- android:layout_marginEnd="@dimen/dp_13"
- android:layout_toStartOf="@+id/add_iv"
- android:src="@drawable/edit"
- android:visibility="gone" />
<ImageView
android:id="@+id/add_iv"
@@ -117,7 +109,7 @@
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
android:text="@string/search_station"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -161,7 +153,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -172,7 +164,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/message_all"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -198,7 +190,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -209,7 +201,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/my_power_station_malfunction"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -235,7 +227,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -246,7 +238,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/my_power_station_off_line"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -272,7 +264,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -283,7 +275,7 @@
android:paddingStart="@dimen/dp_2"
android:paddingEnd="@dimen/dp_2"
android:text="@string/to_be_added"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -313,8 +305,8 @@
android:id="@+id/station_name_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/station_name"
- android:textColor="@color/text_E6FFFFFF"
+ android:text="@string/pv"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -346,8 +338,8 @@
android:id="@+id/station_power_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:text="@string/generated_power"
- android:textColor="@color/text_E6FFFFFF"
+ android:text="@string/output"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
@@ -356,36 +348,6 @@
android:layout_height="@dimen/dp_18"
android:layout_toEndOf="@+id/station_power_tv"
android:background="@drawable/ascending_descending_order_select" />
-
- </RelativeLayout>
-
- <View
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1" />
-
- <RelativeLayout
- android:id="@+id/station_day_rl"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center_horizontal"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/station_day_tv"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:text="@string/day_power_generation"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14" />
-
- <ImageView
- android:id="@+id/station_day_iv"
- android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:layout_toEndOf="@+id/station_day_tv"
- android:background="@drawable/ascending_descending_order_select" />
-
</RelativeLayout>
@@ -406,7 +368,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/battery_capacity_indicator"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
@@ -416,6 +378,37 @@
android:layout_toEndOf="@+id/station_month_tv"
android:background="@drawable/ascending_descending_order_select" />
</RelativeLayout>
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+
+ <RelativeLayout
+ android:id="@+id/station_day_rl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/station_day_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="@string/day_generation"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/station_day_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_toEndOf="@+id/station_day_tv"
+ android:background="@drawable/ascending_descending_order_select" />
+
+
+ </RelativeLayout>
+
</LinearLayout>
@@ -502,7 +495,7 @@
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/device_search_iv"
android:text="@string/enter_the_device_sn_and_device_name"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
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