From 5e2e1fc7fc23d5fa035608bc415e9eac73ce2e37 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 27 十一月 2024 13:11:20 +0800
Subject: [PATCH] 2024年11月27日13:11:17
---
app/src/main/res/drawable/social_contribution_3.png | 0
app/src/main/res/values/styles.xml | 10
app/src/main/res/drawable/station_status_no_ffffff.xml | 4
app/src/main/res/drawable/station_status_yer_ffffff.xml | 5
app/src/main/res/drawable/search_path.png | 0
app/src/main/res/drawable/social_contribution_2.png | 0
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 28 +
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 2
app/src/main/res/values/colors.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 2
app/src/main/res/values-zh/strings.xml | 2
app/src/main/res/layout/fragment_home_page.xml | 3
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java | 120 +++++-----
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 20
app/src/main/res/drawable/device_state_ffb9b9b9.xml | 6
app/src/main/res/drawable/device_satte_ffb300.xml | 5
app/src/main/res/drawable/device_state_fff55252.xml | 6
app/src/main/res/drawable/search_bj_ff05000000.xml | 2
app/src/main/res/values/strings.xml | 2
app/src/main/res/drawable/default_condition.png | 0
app/src/main/res/layout/item_plant_details.xml | 65 +++--
app/src/main/res/drawable/device_state_ff38c494.xml | 5
aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java | 15 +
/dev/null | 0
app/src/main/res/layout/fragment_house_list.xml | 208 +++++++++++++++---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 101 +++-----
app/src/main/res/drawable/social_contribution_1.png | 0
app/src/main/res/values-en/strings.xml | 2
28 files changed, 398 insertions(+), 216 deletions(-)
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
index f4e5226..79330b5 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAChartModel.java
@@ -1,22 +1,22 @@
/**
-// AAChartModel.java
-// AAChartCore
-//
-// Created by AnAn on 2017/9/5.
-// Copyright 漏 2018骞� An An. All rights reserved.
-
+ * // AAChartModel.java
+ * // AAChartCore
+ * //
+ * // Created by AnAn on 2017/9/5.
+ * // Copyright 漏 2018骞� An An. All rights reserved.
+ * <p>
* 鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼� ...... SOURCE CODE ......鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼�
* 鈼夆棄鈼�................................................... 鈼夆棄鈼�
* 鈼夆棄鈼� https://github.com/AAChartModel/AAChartCore 鈼夆棄鈼�
* 鈼夆棄鈼� https://github.com/AAChartModel/AAChartCore-Kotlin 鈼夆棄鈼�
* 鈼夆棄鈼�................................................... 鈼夆棄鈼�
* 鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼� ...... SOURCE CODE ......鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼夆棄鈼�
-
-
+ * <p>
+ * <p>
* -------------------------------------------------------------------------------
- *
- * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
- *
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
* Please contact me on GitHub,if there are any problems encountered in use.
* GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
* -------------------------------------------------------------------------------
@@ -25,9 +25,8 @@
* StackOverflow : https://stackoverflow.com/users/7842508/codeforu
* JianShu : http://www.jianshu.com/u/f1e6753d4254
* SegmentFault : https://segmentfault.com/u/huanghunbieguan
- *
+ * <p>
* -------------------------------------------------------------------------------
-
*/
package com.github.AAChartModel.AAChartCore.AAChartCreator;
@@ -44,51 +43,50 @@
public class AAChartModel {
- public String animationType; //鍔ㄧ敾绫诲瀷
+ public String animationType; //鍔ㄧ敾绫诲瀷
public Integer animationDuration; //鍔ㄧ敾鏃堕棿
- public String title; //鏍囬鍐呭
+ public String title; //鏍囬鍐呭
public AAStyle titleStyle; //鏍囬鏂囨湰椋庢牸鏍峰紡
- public String subtitle; //鍓爣棰樺唴瀹�
- public String subtitleAlign; //鍓爣棰樻按骞冲榻愭柟寮�
+ public String subtitle; //鍓爣棰樺唴瀹�
+ public String subtitleAlign; //鍓爣棰樻按骞冲榻愭柟寮�
public AAStyle subtitleStyle; //鍓爣棰樻枃鏈鏍兼牱寮�
- public String axesTextColor; //x 杞村拰 y 杞存枃瀛楅鑹�
- public String chartType; //鍥捐〃绫诲瀷
- public String stacking; //鍫嗙Н鏍峰紡
- public String markerSymbol; //鎶樼嚎鏇茬嚎杩炴帴鐐圭殑绫诲瀷锛�"circle", "square", "diamond", "triangle","triangle-down"锛岄粯璁ゆ槸"circle"
- public String markerSymbolStyle; //鎶樼嚎鏇茬嚎杩炴帴鐐圭殑鑷畾涔夐鏍兼牱寮�
- public String zoomType; //缂╂斁绫诲瀷 AAChartZoomTypeX琛ㄧず鍙部鐫� x 杞磋繘琛屾墜鍔跨缉鏀�
+ public String axesTextColor; //x 杞村拰 y 杞存枃瀛楅鑹�
+ public String chartType; //鍥捐〃绫诲瀷
+ public String stacking; //鍫嗙Н鏍峰紡
+ public String markerSymbol; //鎶樼嚎鏇茬嚎杩炴帴鐐圭殑绫诲瀷锛�"circle", "square", "diamond", "triangle","triangle-down"锛岄粯璁ゆ槸"circle"
+ public String markerSymbolStyle; //鎶樼嚎鏇茬嚎杩炴帴鐐圭殑鑷畾涔夐鏍兼牱寮�
+ public String zoomType; //缂╂斁绫诲瀷 AAChartZoomTypeX琛ㄧず鍙部鐫� x 杞磋繘琛屾墜鍔跨缉鏀�
public Boolean inverted; //x 杞存槸鍚︾炕杞�(鍨傜洿)
public Boolean xAxisReversed; //x 杞寸炕杞�
public Boolean yAxisReversed; //y 杞寸炕杞�
public Boolean tooltipEnabled; //鏄惁鏄剧ず娴姩鎻愮ず妗�(榛樿鏄剧ず)
- public String tooltipValueSuffix; //娴姩鎻愮ず妗嗗崟浣嶅悗缂�
+ public String tooltipValueSuffix; //娴姩鎻愮ず妗嗗崟浣嶅悗缂�
public Boolean gradientColorEnable; //鏄惁瑕佷负娓愬彉鑹�
public Boolean polar; //鏄惁鏋佸寲鍥惧舰(鍙樹负闆疯揪鍥�)
- public Number[]margin; //鍥捐〃澶栬竟缂樺拰缁樺浘鍖哄煙涔嬮棿鐨勮竟璺�
+ public Number[] margin; //鍥捐〃澶栬竟缂樺拰缁樺浘鍖哄煙涔嬮棿鐨勮竟璺�
public Boolean dataLabelsEnabled; //鏄惁鏄剧ず鏁版嵁
public AAStyle dataLabelsStyle; //鏁版嵁鏂囨湰椋庢牸鏍峰紡
public Boolean xAxisLabelsEnabled; //x 杞存槸鍚︽樉绀烘暟鎹�
public Integer xAxisTickInterval; //x 杞村埢搴︾偣闂撮殧鏁�(璁剧疆姣忛殧鍑犱釜鐐规樉绀轰竴涓� X杞寸殑鍐呭)
- public String[]categories; //x 杞存槸鍚︽樉绀烘暟鎹�
- public Number xAxisGridLineWidth; //x 杞寸綉鏍肩嚎鐨勫搴�
+ public String[] categories; //x 杞存槸鍚︽樉绀烘暟鎹�
+ public Number xAxisGridLineWidth; //x 杞寸綉鏍肩嚎鐨勫搴�
public Boolean xAxisVisible; //x 杞存槸鍚︽樉绀�
public Boolean yAxisVisible; //y 杞存槸鍚︽樉绀�
public Boolean yAxisLabelsEnabled; //y 杞存槸鍚︽樉绀烘暟鎹�
- public String yAxisTitle; //y 杞存爣棰�
- public Number yAxisLineWidth; //y 杞磋酱绾跨殑瀹藉害
- public Number yAxisMin; //y 杞存渶灏忓��
- public Number yAxisMax; //y 杞存渶澶у��
+ public String yAxisTitle; //y 杞存爣棰�
+ public Number yAxisLineWidth; //y 杞磋酱绾跨殑瀹藉害
+ public Number yAxisMin; //y 杞存渶灏忓��
+ public Number yAxisMax; //y 杞存渶澶у��
public Boolean yAxisAllowDecimals; //y 杞存槸鍚﹀厑璁告樉绀哄皬鏁�
- public Number yAxisGridLineWidth; //y 杞寸綉鏍肩嚎鐨勫搴�
- public Object[]colorsTheme; //鍥捐〃涓婚棰滆壊鏁扮粍
+ public Number yAxisGridLineWidth; //y 杞寸綉鏍肩嚎鐨勫搴�
+ public Object[] colorsTheme; //鍥捐〃涓婚棰滆壊鏁扮粍
public Boolean legendEnabled; //鏄惁鏄剧ず鍥句緥
- public Object backgroundColor; //鍥捐〃鑳屾櫙鑹�
- public Number borderRadius; //鏌辩姸鍥鹃暱鏉″浘澶撮儴鍦嗚鍗婂緞(鍙敤浜庤缃ご閮ㄧ殑褰㈢姸,浠呭鏉″舰鍥�,鏌辩姸鍥炬湁鏁�)
- public Number markerRadius; //鎶樼嚎杩炴帴鐐圭殑鍗婂緞闀垮害
- public Object[]series; //鍥捐〃鐨勬暟鎹垪鍐呭
+ public Object backgroundColor; //鍥捐〃鑳屾櫙鑹�
+ public Number borderRadius; //鏌辩姸鍥鹃暱鏉″浘澶撮儴鍦嗚鍗婂緞(鍙敤浜庤缃ご閮ㄧ殑褰㈢姸,浠呭鏉″舰鍥�,鏌辩姸鍥炬湁鏁�)
+ public Number markerRadius; //鎶樼嚎杩炴帴鐐圭殑鍗婂緞闀垮害
+ public Object[] series; //鍥捐〃鐨勬暟鎹垪鍐呭
public Boolean touchEventEnabled; //鏄惁鏀寔鐢ㄦ埛瑙︽懜浜嬩欢
public AAScrollablePlotArea scrollablePlotArea;
-
public AAChartModel animationType(String prop) {
@@ -317,29 +315,29 @@
}
public AAChartModel() {
- chartType = AAChartType.Line;
- title = "";
- yAxisTitle = "";
- animationDuration = 500;//浠ユ绉掍负鍗曚綅
- animationType = AAChartAnimationType.Linear;
- inverted = false;
- stacking = AAChartStackingType.False;
- xAxisReversed = false;
- yAxisReversed = false;
- zoomType = AAChartZoomType.None;
- dataLabelsEnabled = false;
- markerSymbolStyle = AAChartSymbolStyleType.Normal;
- colorsTheme = new String[]{"#fe117c","#ffc069","#06caf4","#7dffc0"};//榛樿鐨勯鑹叉暟缁�(蹇呴』瑕佹坊鍔犻粯璁ゆ暟缁�,鍚﹀垯灏变細鍑洪敊)
- gradientColorEnable = false;
- polar = false;
- xAxisLabelsEnabled = true;
- xAxisGridLineWidth = 0f;
- yAxisLabelsEnabled = true;
- yAxisGridLineWidth = 1f;
- legendEnabled = true;
- backgroundColor = "#ffffff";
- borderRadius = 0f;//鏌辩姸鍥鹃暱鏉″浘澶撮儴鍦嗚鍗婂緞(鍙敤浜庤缃ご閮ㄧ殑褰㈢姸,浠呭鏉″舰鍥�,鏌辩姸鍥炬湁鏁�,璁剧疆涓�1000鏃�,鏌卞舰鍥炬垨鑰呮潯褰㈠浘澶撮儴涓烘褰�)
- markerRadius = 6f;//鎶樼嚎杩炴帴鐐圭殑鍗婂緞闀垮害,濡傛灉鍊艰缃负0,杩欐牱灏辩浉褰撲簬涓嶆樉绀轰簡
+ chartType = AAChartType.Line;
+ title = "";
+ yAxisTitle = "";
+ animationDuration = 500;//浠ユ绉掍负鍗曚綅
+ animationType = AAChartAnimationType.Linear;
+ inverted = false;
+ stacking = AAChartStackingType.False;
+ xAxisReversed = false;
+ yAxisReversed = false;
+ zoomType = AAChartZoomType.None;
+ dataLabelsEnabled = false;
+ markerSymbolStyle = AAChartSymbolStyleType.Normal;
+ colorsTheme = new String[]{"#fe117c", "#ffc069", "#06caf4", "#7dffc0"};//榛樿鐨勯鑹叉暟缁�(蹇呴』瑕佹坊鍔犻粯璁ゆ暟缁�,鍚﹀垯灏变細鍑洪敊)
+ gradientColorEnable = false;
+ polar = false;
+ xAxisLabelsEnabled = true;
+ xAxisGridLineWidth = 0f;
+ yAxisLabelsEnabled = true;
+ yAxisGridLineWidth = 1f;
+ legendEnabled = true;
+ backgroundColor = "#FF333738";
+ borderRadius = 0f;//鏌辩姸鍥鹃暱鏉″浘澶撮儴鍦嗚鍗婂緞(鍙敤浜庤缃ご閮ㄧ殑褰㈢姸,浠呭鏉″舰鍥�,鏌辩姸鍥炬湁鏁�,璁剧疆涓�1000鏃�,鏌卞舰鍥炬垨鑰呮潯褰㈠浘澶撮儴涓烘褰�)
+ markerRadius = 6f;//鎶樼嚎杩炴帴鐐圭殑鍗婂緞闀垮害,濡傛灉鍊艰缃负0,杩欐牱灏辩浉褰撲簬涓嶆樉绀轰簡
}
}
diff --git a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
index 7434cc7..4cec63a 100644
--- a/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
+++ b/aa_chart_core/src/main/java/com/github/AAChartModel/AAChartCore/AAChartCreator/AAOptionsConstructor.java
@@ -27,6 +27,21 @@
* SegmentFault : https://segmentfault.com/u/huanghunbieguan
* <p>
* -------------------------------------------------------------------------------
+ * <p>
+ * -------------------------------------------------------------------------------
+ * <p>
+ * 馃寱 馃寲 馃寳 馃寴 鉂�鉂�鉂� WARM TIPS!!! 鉂�鉂�鉂� 馃寫 馃寬 馃寭 馃寯
+ * <p>
+ * Please contact me on GitHub,if there are any problems encountered in use.
+ * GitHub Issues : https://github.com/AAChartModel/AAChartCore/issues
+ * -------------------------------------------------------------------------------
+ * And if you want to contribute for this project, please contact me as well
+ * GitHub : https://github.com/AAChartModel
+ * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
+ * JianShu : http://www.jianshu.com/u/f1e6753d4254
+ * SegmentFault : https://segmentfault.com/u/huanghunbieguan
+ * <p>
+ * -------------------------------------------------------------------------------
*/
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 3c96a8f..fa5cce0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -724,11 +724,15 @@
String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel);
//鏈湴缂撳瓨鏁版嵁
if (callback != null) {
- if (s.startsWith("{")) {
- uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
- } else if (s.startsWith("[")) {
- uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
- } else {
+ try {
+ if (s.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
+ } else if (s.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, s, callback);
+ }
+ } catch (Exception e) {
uniSuccessCallback(type, s, callback);
}
}
@@ -744,11 +748,15 @@
} else {
//鏈湴缂撳瓨鏁版嵁
if (callback != null) {
- if (json.startsWith("{")) {
- uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
- } else if (json.startsWith("[")) {
- uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
- } else {
+ try {
+ if (json.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
+ } else if (json.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, json, callback);
+ }
+ } catch (Exception e) {
uniSuccessCallback(type, json, callback);
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 3a36ea8..dda2339 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -410,7 +410,7 @@
viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
- viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_select));
+ viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_selected));
viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
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 0a2c879..3263f89 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,7 +61,7 @@
HouseIdBean houseIdBean = this.mList.get(position);
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
//瑁呮満瀹归噺
- String capacity = mContext.getString(R.string.string_capacity) + ":" + HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp);
+ String capacity = HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getInstalledCapacity(), UnitType.kWp, false);
holder.capacityTv.setText(capacity);
//鍙戠數鍔熺巼
holder.power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(houseIdBean.getPower(), UnitType.kW));
@@ -160,7 +160,7 @@
private void setTextViewStyle(TextView textView, int state_value) {
String text = mContext.getString(R.string.my_power_station_operation);
- Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_06b92a);
+ Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ff38c494);
if (mPowerStationStatus.equals(PowerStationStatus.All)) {
switch (state_value) {
case 1: {
@@ -170,18 +170,18 @@
case 2: {
text = mContext.getString(R.string.my_power_station_off_line);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
+ 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.state_ffb300);
+ 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.state_e34343);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
}
//5:绂荤嚎鏈夋晠闅淥ffline_fault
break;
@@ -193,13 +193,13 @@
}
} else if (mPowerStationStatus.equals(PowerStationStatus.malfunction)) {
text = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+ 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.state_b9b9b9);
+ 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.state_ffb300);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
}
textView.setText(text);
textView.setBackground(drawable);
@@ -229,11 +229,11 @@
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_sn_tv);
+ capacityTv = itemView.findViewById(R.id.device_details_value_tv);
power_value_tv = itemView.findViewById(R.id.power_value_tv);
day_value_tv = itemView.findViewById(R.id.day_value_tv);
month_value_tv = itemView.findViewById(R.id.month_value_tv);
- stateTv = itemView.findViewById(R.id.fragment_house_list_line_state_tv);
+ stateTv = itemView.findViewById(R.id.device_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);
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 7ac7ea1..6fd51e8 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
@@ -432,7 +432,7 @@
// viewBinding.year.setText(R.string.year_power_generation);
// viewBinding.Total.setText(R.string.cumulative_power_generation);
//
-// viewBinding.unitTv.setText(UnitType.kW);
+ viewBinding.unitTv.setText(UnitType.kW);
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_38c494));
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 500d6ea..d91d90b 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
@@ -148,38 +148,50 @@
}
});
//鍏ㄩ儴
- viewBinding.powerStationAllIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.allLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.All;
- selectedStationStateStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
+ viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff));
+ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
//鏁呴殰
- viewBinding.powerStationFaultsIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.faultsLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.malfunction;
- selectedStationStateStyle(viewBinding.powerStationFaultsIl.parentLl, viewBinding.powerStationFaultsIl.stationTotalTv, viewBinding.powerStationFaultsIl.stationTitleTv, true);
+ viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff));
+ viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
//绂荤嚎
- viewBinding.powerStationOfflineIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.offlineLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.off;
- selectedStationStateStyle(viewBinding.powerStationOfflineIl.parentLl, viewBinding.powerStationOfflineIl.stationTotalTv, viewBinding.powerStationOfflineIl.stationTitleTv, true);
+ viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff));
+ viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
//寰呮帴鍏�
- viewBinding.powerStationConnectedIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.connectedLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
powerStationStatusValue = PowerStationStatus.connecting;
- selectedStationStateStyle(viewBinding.powerStationConnectedIl.parentLl, viewBinding.powerStationConnectedIl.stationTotalTv, viewBinding.powerStationConnectedIl.stationTitleTv, true);
+ viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff));
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
}
});
@@ -259,7 +271,7 @@
public void onClick(int position, HouseIdBean houseIdBean) {
//鐐瑰嚮浣忓畢璇︽儏
HdlLogLogic.print("鐐瑰嚮浣忓畢璇︽儏---" + new Gson().toJson(houseIdBean), false);
- HdlResidenceLogic.getInstance().switchHouse(houseIdBean,true);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
HdlUniLogic.getInstance().openUniMP(path, null);
@@ -496,13 +508,10 @@
private void initView() {
viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
viewBinding.deviceLabelParent.setVisibility(View.GONE);
-
- viewBinding.powerStationAllIl.stationTitleTv.setText(getString(R.string.message_all));
- viewBinding.powerStationFaultsIl.stationTitleTv.setText(getString(R.string.my_power_station_malfunction));
- viewBinding.powerStationOfflineIl.stationTitleTv.setText(getString(R.string.my_power_station_off_line));
- viewBinding.powerStationConnectedIl.stationTitleTv.setText(getString(R.string.to_be_added));
-
- selectedStationStateStyle(viewBinding.powerStationAllIl.parentLl, viewBinding.powerStationAllIl.stationTotalTv, viewBinding.powerStationAllIl.stationTitleTv, true);
+ viewBinding.allLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yer_ffffff));
+ viewBinding.faultsLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
+ viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
//鐢电珯鏍囩
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
@@ -522,8 +531,8 @@
*/
private void selectedTitleLabelStyle() {
if (isClickPowerStationLabel) {
- viewBinding.powerStationLabel.setTextAppearance(R.style.Text20Style);
- viewBinding.deviceLabel.setTextAppearance(R.style.Text16Style);
+ viewBinding.powerStationLabel.setTextAppearance(R.style.Text18Style);
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text14Style);
// viewBinding.editIv.setVisibility(View.VISIBLE);//缂栬緫鍥炬爣闅愯棌
viewBinding.addIv.setVisibility(View.VISIBLE);//娣诲姞鍥炬爣闅愯棌
viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戞樉绀�
@@ -532,8 +541,8 @@
viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
}
} else {
- viewBinding.deviceLabel.setTextAppearance(R.style.Text20Style);
- viewBinding.powerStationLabel.setTextAppearance(R.style.Text16Style);
+ viewBinding.deviceLabel.setTextAppearance(R.style.Text18Style);
+ viewBinding.powerStationLabel.setTextAppearance(R.style.Text14Style);
// viewBinding.editIv.setVisibility(View.GONE);//缂栬緫鍥炬爣闅愯棌
viewBinding.addIv.setVisibility(View.GONE);//娣诲姞鍥炬爣闅愯棌
viewBinding.powerStationLabelParent.setVisibility(View.GONE);//鐢电珯鏍囩銆愮埗瀹瑰櫒銆戦殣钘�
@@ -545,40 +554,6 @@
}
- /**
- * 鏄剧ず閫変腑鐘舵�佹牱寮�
- *
- * @param linearLayout 缁勪欢
- * @param numberTv 缁勪欢
- * @param titleTv 缁勪欢
- * @param isShowSelectedStatus 鏄惁鏄剧ず鐘舵�佹牱寮�
- */
- private void selectedStationStateStyle(LinearLayout linearLayout, TextView numberTv, TextView titleTv, boolean isShowSelectedStatus) {
- viewBinding.powerStationAllIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.powerStationFaultsIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.powerStationOfflineIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.powerStationConnectedIl.parentLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
-
- viewBinding.powerStationAllIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
- viewBinding.powerStationAllIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
-
- viewBinding.powerStationFaultsIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
- viewBinding.powerStationFaultsIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
-
- viewBinding.powerStationOfflineIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
- viewBinding.powerStationOfflineIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
-
- viewBinding.powerStationConnectedIl.stationTotalTv.setTextColor(getResources().getColor(R.color.text_E6000000, null));
- viewBinding.powerStationConnectedIl.stationTitleTv.setTextColor(getResources().getColor(R.color.text_66000000, null));
-
-
- if (isShowSelectedStatus) {
- linearLayout.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.selected_8_38c494));
- numberTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- titleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- }
-
- }
private void initData() {
if (isClickPowerStationLabel) {
@@ -610,7 +585,7 @@
Gson gson = new Gson();
String json = eventBus.getData().toString();
HouseIdBean houseIdBean = gson.fromJson(json, HouseIdBean.class);
- HdlResidenceLogic.getInstance().switchHouse(houseIdBean,true);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean, true);
}
} else if (HDLUniMP.UNI_EVENT_REPLY_HOME_EDIT.equals(eventBus.getType())) {
@@ -697,19 +672,19 @@
if (eventBus.getData().equals(PowerStationStatus.All)) {
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
- viewBinding.powerStationAllIl.parentLl.performClick();
+ viewBinding.allLl.performClick();
} else if (eventBus.getData().equals(PowerStationStatus.malfunction)) {
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
- viewBinding.powerStationFaultsIl.parentLl.performClick();
+ viewBinding.faultsLl.performClick();
} else if (eventBus.getData().equals(PowerStationStatus.off)) {
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
- viewBinding.powerStationOfflineIl.parentLl.performClick();
+ viewBinding.offlineLl.performClick();
} else if (eventBus.getData().equals(PowerStationStatus.connecting)) {
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
- viewBinding.powerStationConnectedIl.parentLl.performClick();
+ viewBinding.connectedLl.performClick();
}
} else if (eventBus.getType().equals(ConstantManage.station_edit)) {
//缂栬緫鍚庢洿鏂颁竴涓嬩綇瀹呭垪琛�
@@ -735,10 +710,10 @@
if (statusOverviewBean == null) {
return;
}
- viewBinding.powerStationAllIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getTotal()));
- viewBinding.powerStationFaultsIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getFault()));
- viewBinding.powerStationOfflineIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getOffline()));
- viewBinding.powerStationConnectedIl.stationTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getConnecting()));
+ viewBinding.allTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getTotal()));
+ viewBinding.faultsTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getFault()));
+ viewBinding.offlineTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getOffline()));
+ viewBinding.connectedTotalTv.setText(HdlCommonLogic.convertString(statusOverviewBean.getConnecting()));
}
@Override
diff --git a/app/src/main/res/drawable/default_condition.png b/app/src/main/res/drawable/default_condition.png
index aea9459..09af658 100644
--- a/app/src/main/res/drawable/default_condition.png
+++ b/app/src/main/res/drawable/default_condition.png
Binary files differ
diff --git a/app/src/main/res/drawable/device_satte_ffb300.xml b/app/src/main/res/drawable/device_satte_ffb300.xml
new file mode 100644
index 0000000..926c4cb
--- /dev/null
+++ b/app/src/main/res/drawable/device_satte_ffb300.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="3.5dp" />
+ <solid android:color="#FFB300" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/device_state_ff38c494.xml b/app/src/main/res/drawable/device_state_ff38c494.xml
new file mode 100644
index 0000000..f2e793d
--- /dev/null
+++ b/app/src/main/res/drawable/device_state_ff38c494.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="3.5dp"/>
+ <solid android:color="#FF38C494"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/device_state_ffb9b9b9.xml b/app/src/main/res/drawable/device_state_ffb9b9b9.xml
new file mode 100644
index 0000000..369bda5
--- /dev/null
+++ b/app/src/main/res/drawable/device_state_ffb9b9b9.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="3.5dp" />
+ <solid android:color="#FFB9B9B9" />
+</shape>
+
diff --git a/app/src/main/res/drawable/device_state_fff55252.xml b/app/src/main/res/drawable/device_state_fff55252.xml
new file mode 100644
index 0000000..5656739
--- /dev/null
+++ b/app/src/main/res/drawable/device_state_fff55252.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="3.5dp"/>
+ <solid android:color="#FFF55252"/>
+</shape>
+
diff --git a/app/src/main/res/drawable/message_select.png b/app/src/main/res/drawable/message_select.png
deleted file mode 100644
index ace4cee..0000000
--- a/app/src/main/res/drawable/message_select.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/search_bj_ff05000000.xml b/app/src/main/res/drawable/search_bj_ff05000000.xml
index 652d985..139ac6d 100644
--- a/app/src/main/res/drawable/search_bj_ff05000000.xml
+++ b/app/src/main/res/drawable/search_bj_ff05000000.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_17" />
- <solid android:color="#0D000000" />
+ <solid android:color="@color/text_FF333738" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/search_path.png b/app/src/main/res/drawable/search_path.png
index e221c53..9d07633 100644
--- a/app/src/main/res/drawable/search_path.png
+++ b/app/src/main/res/drawable/search_path.png
Binary files differ
diff --git a/app/src/main/res/drawable/social_contribution_1.png b/app/src/main/res/drawable/social_contribution_1.png
index 223f452..0acbea5 100644
--- a/app/src/main/res/drawable/social_contribution_1.png
+++ b/app/src/main/res/drawable/social_contribution_1.png
Binary files differ
diff --git a/app/src/main/res/drawable/social_contribution_2.png b/app/src/main/res/drawable/social_contribution_2.png
index 91c0264..c26c6ac 100644
--- a/app/src/main/res/drawable/social_contribution_2.png
+++ b/app/src/main/res/drawable/social_contribution_2.png
Binary files differ
diff --git a/app/src/main/res/drawable/social_contribution_3.png b/app/src/main/res/drawable/social_contribution_3.png
index 31351a5..7940c44 100644
--- a/app/src/main/res/drawable/social_contribution_3.png
+++ b/app/src/main/res/drawable/social_contribution_3.png
Binary files differ
diff --git a/app/src/main/res/drawable/station_status_no_ffffff.xml b/app/src/main/res/drawable/station_status_no_ffffff.xml
index 64bcd73..eaf051e 100644
--- a/app/src/main/res/drawable/station_status_no_ffffff.xml
+++ b/app/src/main/res/drawable/station_status_no_ffffff.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/dp_8" />
- <solid android:color="#FFFFFF" />
+ <stroke
+ android:width="@dimen/dp_1"
+ android:color="@color/text_FF5C5F60" />
</shape>
diff --git a/app/src/main/res/drawable/station_status_yer_ffffff.xml b/app/src/main/res/drawable/station_status_yer_ffffff.xml
new file mode 100644
index 0000000..a23190f
--- /dev/null
+++ b/app/src/main/res/drawable/station_status_yer_ffffff.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="@dimen/dp_8" />
+ <solid android:color="@color/text_FF555859" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 5bbb558..37c28a7 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -525,6 +525,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16"
+ android:paddingBottom="@dimen/dp_16"
android:background="@drawable/bj_ff333738"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -702,7 +703,7 @@
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_marginStart="18.5dp"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
<TextView
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 9f0f42b..ff005f0 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -23,23 +23,22 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
- android:gravity="center_vertical"
+ android:gravity="center"
android:text="@string/power_station"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_20"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_18" />
<TextView
android:id="@+id/device_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:layout_centerVertical="true"
android:layout_marginStart="17dp"
- android:layout_marginEnd="-339dp"
android:layout_toEndOf="@+id/power_station_label"
- android:gravity="start|center_vertical"
+ android:gravity="center"
android:text="@string/device"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_16"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -84,7 +83,7 @@
<!--鎼滅储-->
<RelativeLayout
android:id="@+id/power_station_search_cl"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
@@ -118,7 +117,7 @@
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
android:text="@string/search_station"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -133,34 +132,160 @@
</RelativeLayout>
- <!--鏉′欢绛涢��-->
+ <!--鏉′欢绛涢�� 鍏ㄩ儴锛屾晠闅滐紝绂荤嚎锛屽緟鎺ュ叆-->
<LinearLayout
android:id="@+id/screening_condition_ll"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_56"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
+ <!--鍏ㄩ儴-->
+ <LinearLayout
+ android:id="@+id/all_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
- <include
- android:id="@+id/power_station_all_il"
- layout="@layout/item_station" />
+ <TextView
+ android:id="@+id/all_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
- <include
- android:id="@+id/power_station_faults_il"
- layout="@layout/item_station" />
+ <TextView
+ android:id="@+id/all_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/message_all"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
- <include
- android:id="@+id/power_station_offline_il"
- layout="@layout/item_station" />
+ <View
+ android:id="@+id/v1"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--鏁呴殰-->
+ <LinearLayout
+ android:id="@+id/faults_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
- <include
- android:id="@+id/power_station_connected_il"
- layout="@layout/item_station" />
+ <TextView
+ android:id="@+id/faults_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/faults_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/my_power_station_malfunction"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/v2"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--绂荤嚎-->
+ <LinearLayout
+ android:id="@+id/offline_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/offline_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/offline_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/my_power_station_off_line"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/v3"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <!--寰呮帴鍏�-->
+ <LinearLayout
+ android:id="@+id/connected_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/connected_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8.5dp"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_16" />
+
+ <TextView
+ android:id="@+id/connected_des_tv"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingStart="@dimen/dp_2"
+ android:paddingEnd="@dimen/dp_2"
+ android:text="@string/to_be_added"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_12" />
+ </LinearLayout>
</LinearLayout>
@@ -168,10 +293,10 @@
<LinearLayout
android:id="@+id/ascending_order_descending_order_parent_ll"
android:layout_width="0dp"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_12"
+ android:layout_marginTop="@dimen/dp_19"
+ android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -187,10 +312,10 @@
<TextView
android:id="@+id/station_name_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/station_name"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -198,6 +323,7 @@
android:id="@+id/station_name_iv"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
+ android:layout_centerVertical="true"
android:layout_toEndOf="@+id/station_name_tv"
android:background="@drawable/ascending_descending_order_select" />
@@ -219,10 +345,10 @@
<TextView
android:id="@+id/station_power_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/generated_power"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_power_iv"
@@ -248,10 +374,10 @@
<TextView
android:id="@+id/station_day_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/day_power_generation"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_day_iv"
@@ -278,10 +404,10 @@
<TextView
android:id="@+id/station_month_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="match_parent"
android:text="@string/month_power_generation"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/station_month_iv"
@@ -299,7 +425,7 @@
android:id="@+id/fragment_house_srl"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginTop="@dimen/dp_21"
+ android:layout_marginTop="18.5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index a3be9b4..fcdc37b 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -20,7 +20,7 @@
android:layout_height="@dimen/dp_148"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/ffffff_13">
+ android:background="@drawable/bj_ff333738">
<ImageView
android:id="@+id/device_details_image_iv"
@@ -32,45 +32,66 @@
android:scaleType="centerCrop" />
<TextView
- android:id="@+id/device_details_name_tv"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_19"
+ android:id="@+id/device_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
android:layout_marginStart="@dimen/dp_11"
+ android:layout_marginTop="@dimen/dp_21"
+ android:layout_toEndOf="@+id/device_details_image_iv"
+ android:background="@drawable/device_state_ff38c494" />
+
+ <TextView
+ android:id="@+id/device_details_name_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginStart="@dimen/dp_6"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="10dp"
- android:layout_toStartOf="@+id/fragment_house_list_line_state_tv"
- android:layout_toEndOf="@+id/device_details_image_iv"
+ android:layout_toEndOf="@+id/device_state_tv"
android:ellipsize="end"
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
+ />
<TextView
android:id="@+id/device_details_sn_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_below="@+id/device_details_name_tv"
- android:layout_alignStart="@+id/device_details_name_tv"
+ android:layout_alignStart="@+id/device_state_tv"
android:layout_marginTop="@dimen/dp_3"
android:gravity="center_vertical"
android:text="@string/string_capacity"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
<TextView
- android:id="@+id/fragment_house_list_line_state_tv"
- android:layout_width="69dp"
- android:layout_height="@dimen/dp_33"
- android:layout_alignParentTop="true"
- android:layout_alignParentEnd="true"
- android:background="@drawable/state_ffb300"
- android:gravity="center"
- android:text="@string/my_power_station_connecting"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12" />
+ android:id="@+id/device_details_value_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/device_details_name_tv"
+ android:layout_marginStart="3dp"
+ android:layout_toEndOf="@+id/device_details_sn_tv"
+ android:layout_marginTop="1.5dp"
+ android:text="0.00"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/kwp_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/device_details_value_tv"
+ android:layout_marginStart="4dp"
+ android:layout_marginBottom="2dp"
+ android:layout_toEndOf="@+id/device_details_value_tv"
+ android:text="kWp"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_10" />
+
<LinearLayout
android:id="@+id/screening_condition_ll"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 039ecca..1544822 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -283,7 +283,7 @@
<string name="no_equipment">No equipment!</string>
<string name="filtering">Select</string>
<string name="reset">Reset</string>
- <string name="string_capacity">String capacity</string>
+ <string name="string_capacity">String capacity:</string>
<string name="grid_connected_state">Grid-connected state</string>
<string name="grid_connected">Grid-tied</string>
<string name="off_network">Off-grid</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index dc541ce..e611ae3 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -281,7 +281,7 @@
<string name="no_equipment">鏆傛棤璁惧!</string>
<string name="filtering">绛涢��</string>
<string name="reset">閲嶇疆</string>
- <string name="string_capacity">缁勪覆瀹归噺</string>
+ <string name="string_capacity">缁勪覆瀹归噺:</string>
<string name="grid_connected_state">骞剁綉鐘舵��</string>
<string name="grid_connected">骞剁綉</string>
<string name="off_network">绂荤綉</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d20e4a8..73ae6f0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -61,5 +61,6 @@
<color name="text_FF36FFBA">#FF36FFBA</color>
<color name="text_33FFFFFF">#33FFFFFF</color>
<color name="text_FF555859">#FF555859</color>
+ <color name="text_FF5C5F60">#FF5C5F60</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc541ce..e611ae3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -281,7 +281,7 @@
<string name="no_equipment">鏆傛棤璁惧!</string>
<string name="filtering">绛涢��</string>
<string name="reset">閲嶇疆</string>
- <string name="string_capacity">缁勪覆瀹归噺</string>
+ <string name="string_capacity">缁勪覆瀹归噺:</string>
<string name="grid_connected_state">骞剁綉鐘舵��</string>
<string name="grid_connected">骞剁綉</string>
<string name="off_network">绂荤綉</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 54e48cf..c26457f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,13 @@
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/text_FFFFFFFF</item>
<!-- <item name="android:fontFamily"></item>-->
+ </style>
+
+ <!-- 鑷畾涔夊瓧浣撴牱寮� 椤甸潰涓�绾ф爣棰�-->
+ <style name="Text18Style">
+ <item name="android:textSize">@dimen/text_18</item>
+ <item name="android:textColor">@color/text_E6FFFFFF</item>
+ <!-- <item name="android:fontFamily"></item>-->
</style>
<!-- 鑷畾涔夊瓧浣撴牱寮� 鍐呭涓�绾ф爣棰�-->
@@ -26,8 +33,9 @@
<!-- 鑷畾涔夊瓧浣撴牱寮� -->
<style name="Text14Style">
<item name="android:textSize">@dimen/text_14</item>
- <item name="android:textColor">@color/text_66000000</item>
+ <item name="android:textColor">@color/text_66FFFFFF</item>
</style>
+
<style name="Text12Style">
<item name="android:textSize">@dimen/text_12</item>
<item name="android:textColor">@color/text_66FFFFFF</item>
--
Gitblit v1.8.0