From b34490ec2b458a48802778b2ea00850634325cbb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 02 四月 2025 13:32:59 +0800
Subject: [PATCH] 2025年04月02日13:32:56
---
app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 23
app/src/main/res/layout/activity_change_password.xml | 32
app/src/main/res/layout/activity_set.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java | 25
app/src/main/res/layout/fragment_message.xml | 12
app/src/main/res/layout/general_line.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 36
app/src/main/res/layout/dialog_agree_onagree.xml | 4
app/src/main/res/layout/fragment_me_line.xml | 2
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 4
app/src/main/res/layout/activity_home_login.xml | 22
app/src/main/res/layout/item_search_message.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/test/adapters/HomeAdapter.java | 5
app/src/main/res/layout/activity_message_center_list.xml | 10
app/src/main/res/layout/fragment_me.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java | 1
app/src/main/res/layout/activity_bind_phone.xml | 22
app/src/main/res/layout/item_search_device.xml | 6
app/src/main/res/layout/activity_device_search.xml | 8
app/debug/output-metadata.json | 18
app/src/main/res/layout/item_plant_details.xml | 521 +++++++++++---------
app/src/main/res/drawable/line_view.xml | 2
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 13
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 1
app/src/main/res/layout/dialog_confirm_cancel.xml | 8
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 50 -
app/src/main/res/layout/activity_as_regards.xml | 14
app/src/main/res/layout/activity_search_messge.xml | 8
app/src/main/res/layout/swipe_right_layout.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java | 2
app/src/main/res/layout/view_camera_album.xml | 6
app/src/main/res/drawable-xhdpi/location.png | 0
app/src/main/res/values/styles.xml | 8
app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 4
app/src/main/res/layout/activity_me_change_password.xml | 4
app/src/main/res/layout/toolbar_top_view_44.xml | 2
app/src/main/res/layout/item_message.xml | 6
app/src/main/res/layout/line_message_info.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 7
app/src/main/res/values/colors.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 1
app/src/main/res/layout/dialog_default_filtering.xml | 46
app/src/main/res/layout/item_house_line_c.xml | 2
app/src/main/res/layout/activity_unregister.xml | 14
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 52 +-
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 4
app/src/main/res/layout/dialog_confirm_input.xml | 10
app/src/main/res/layout/fragment_home_page.xml | 88 +-
app/src/main/res/layout/toolbar_top_view_52.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 8
app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java | 4
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 69 +-
app/src/main/res/layout/dialog_flashing_box.xml | 2
app/src/main/res/layout/item_device_details.xml | 32
app/src/main/res/layout/activity_power_stations_list.xml | 2
app/src/main/res/layout/item_history_title.xml | 2
app/src/main/res/layout/activity_message_info.xml | 6
app/src/main/res/layout/activity_contact_us.xml | 8
app/src/main/res/layout/me_change_password_line.xml | 6
app/src/main/res/layout/dialog_static_list.xml | 6
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 11
app/src/main/res/layout/item_search_house.xml | 4
app/src/main/res/layout/null_data_view.xml | 2
app/src/main/res/layout/item_house_move.xml | 2
app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java | 5
app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java | 28
app/src/main/res/layout/activity_bind_mail.xml | 16
app/src/main/res/layout/home_bottom_line.xml | 2
app/src/main/res/layout/item_message_c.xml | 6
app/src/main/res/layout/activity_register_account.xml | 34
app/src/main/res/layout/activity_house_search.xml | 8
app/src/main/res/layout/set_line.xml | 4
app/src/main/res/layout/dialog_update_confirm_cancel.xml | 10
/dev/null | 0
app/src/main/res/layout/activity_qr_code_main.xml | 6
app/src/main/res/layout/fragment_house_list.xml | 32
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 4
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 20
app/src/main/res/layout/item_language.xml | 2
app/src/main/res/layout/diaog_list_line.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 4
84 files changed, 750 insertions(+), 735 deletions(-)
diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json
new file mode 100644
index 0000000..6b777f3
--- /dev/null
+++ b/app/debug/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "com.hdl.photovoltaic",
+ "variantName": "processDebugResources",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "versionCode": 4,
+ "versionName": "1.1.0",
+ "outputFile": "photovoltaic_v1.1.0_202504012010_test.apk"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
index 13d1843..c393640 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -79,7 +79,7 @@
try {
switch (code) {
case 1000:
- return HDLApp.getInstance().getAppLocaleContext().getString(R.string.http_unknown);
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.no_network_connection);
case 1001:
return HDLApp.getInstance().getAppLocaleContext().getString(R.string.parse_error);
case 1002:
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
index 441f7b7..4720942 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
@@ -1,46 +1,32 @@
package com.hdl.photovoltaic.other;
-import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
-import android.os.SystemClock;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.style.ClickableSpan;
import android.view.View;
-import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
-import com.google.gson.JsonObject;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.QRCodeWriter;
-import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.config.ConstantManage;
-import com.hdl.photovoltaic.config.UserConfigManage;
-import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
-import com.hdl.sdk.link.core.callback.BaseCallBack;
import org.greenrobot.eventbus.EventBus;
-import org.json.JSONObject;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.net.InetSocketAddress;
-import java.net.Socket;
import java.util.Hashtable;
/**
@@ -200,11 +186,11 @@
}
/**
- * 杞崲(kWh)鍗曚綅
+ * 杞崲鐢甸噺(kWh)鍗曚綅
*
* @param value 鍊�
*/
- public static String convertKWUnit(String value) {
+ public static String convertKWHUnit(String value) {
try {
double doubleValue = Double.parseDouble(value);
if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
@@ -223,11 +209,11 @@
}
/**
- * 杞崲(kW)鍗曚綅
+ * 杞崲鍔熺巼(kW)鍗曚綅
*
* @param value 鍊�
*/
- public static String convertKWhUnit(String value) {
+ public static String convertKWUnit(String value) {
try {
double doubleValue = Double.parseDouble(value);
if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
@@ -246,11 +232,11 @@
}
/**
- * 杞崲(Wp)鍗曚綅
+ * 杞崲(kWp)鍗曚綅
*
* @param value 鍊�
*/
- public static String convertWPUnit(String value) {
+ public static String convertKWPUnit(String value) {
try {
double doubleValue = Double.parseDouble(value);
if (doubleValue > 1000 && doubleValue < 1000 * 1000) {
@@ -379,7 +365,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(HDLApp.getInstance().getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(HDLApp.getInstance().getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(isUnderline);
}
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 bfa90f6..d73a6e3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -7,7 +7,6 @@
import androidx.fragment.app.FragmentTransaction;
import android.Manifest;
-import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -17,9 +16,7 @@
import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
-import android.view.WindowManager;
import android.widget.TextView;
import com.google.gson.Gson;
@@ -40,7 +37,6 @@
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlESLocalJsonLogic;
-import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMessageLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
@@ -398,43 +394,43 @@
if (this.currentFragmentIndex == 0) {
//姒傝鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_selected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_FFACACAC));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
} else if (this.currentFragmentIndex == 1) {
//鐢电珯鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_selected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_FFACACAC));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
} else if (this.currentFragmentIndex == 2) {
//娑堟伅鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_selected));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_FFACACAC));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_unselected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
} else if (this.currentFragmentIndex == 3) {
//鎴戠殑鐣岄潰
viewBinding.myPowerStationBottomIl0.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.home_page_unselected));
- viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myPowerStationBottomIl0.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myPowerStationBottomIl1.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.power_station_unselected));
- viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myPowerStationBottomIl1.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myMessageBottomIl2.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.message_unselected));
- viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.myMessageBottomIl2.titleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
viewBinding.myMeBottomIl3.iconIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.me_selected));
- viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.myMeBottomIl3.titleTv.setTextColor(getColor(R.color.text_FFACACAC));
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index 34acf2d..aff6241 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -2,11 +2,7 @@
import android.content.Intent;
-import android.content.res.Configuration;
-import android.graphics.Color;
-import android.os.Build;
import android.os.Bundle;
-import android.os.LocaleList;
import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
@@ -16,8 +12,6 @@
import android.text.method.LinkMovementMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
-import android.text.style.StyleSpan;
-import android.util.DisplayMetrics;
import android.view.View;
import android.widget.TextView;
@@ -34,10 +28,8 @@
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
-import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
@@ -57,7 +49,6 @@
import com.hdl.photovoltaic.widget.adapter.ListDialogAdapter;
import java.util.List;
-import java.util.Locale;
/**
* 鐧诲綍鐨勭晫闈�
@@ -131,7 +122,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(true);
}
@@ -151,7 +142,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(true);
}
@@ -460,9 +451,9 @@
String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
boolean isEnabled = account.length() > 0 && password.length() > 0;
if (isEnabled) {
- viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.homeLoginTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.homeLoginTv.setEnabled(isEnabled);
if (password.length() < 6 || password.length() > 16) {
@@ -581,7 +572,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -604,7 +595,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -617,7 +608,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 9e91608..f2163fb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -8,7 +8,6 @@
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
-import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -22,20 +21,16 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.other.HdlCommonLogic;
-import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.sdk.link.HDLLinkLocalSdk;
import java.util.List;
import cn.jpush.android.api.JPushInterface;
-import io.dcloud.common.util.RuningAcitvityUtil;
/**
@@ -197,7 +192,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -220,7 +215,7 @@
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
- ds.setColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ ds.setColor(getResources().getColor(R.color.text_FFACACAC, null));
// 鍘绘帀涓嬪垝绾�
ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
}
@@ -233,7 +228,7 @@
}
textView.setText(spannable);
//涓�旈亣鍒扮偣鍑诲悗瀛椾綋鏄剧ず楂樹寒锛屽彇娑堥珮浜�
- textView.setHighlightColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ textView.setHighlightColor(getResources().getColor(R.color.text_FF5B5B5B, null));
//鏈�鍚庤缃彲鐐瑰嚮锛屽繀椤诲疄鐜帮紝鍚﹀垯鍙兘鏄剧ず鏍峰紡锛屾棤娉曞疄鐜扮偣鍑绘晥鏋�
textView.setMovementMethod(LinkMovementMethod.getInstance());
} catch (Exception ignored) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
index 481a171..91c829d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
@@ -5,18 +5,13 @@
import android.os.CountDownTimer;
import android.text.Editable;
import android.text.InputType;
-import android.text.SpannableStringBuilder;
-import android.text.TextPaint;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
-import android.text.style.ClickableSpan;
import android.view.View;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -374,7 +369,7 @@
long time = (millisUntilFinished / 1000);
String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
viewBinding.changePhoneVerificationTv.setText(str);
-// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changePhoneVerificationTv.setEnabled(false);
}
@@ -382,7 +377,7 @@
@Override
public void onFinish() {
viewBinding.changePhoneVerificationTv.setText(getString(R.string.home_login_verification_regain));
-// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changePhoneVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changePhoneVerificationTv.setEnabled(true);
@@ -398,7 +393,7 @@
String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
viewBinding.changeMailVerificationTv.setText(str);
-// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changeMailVerificationTv.setEnabled(false);
}
@@ -406,7 +401,7 @@
@Override
public void onFinish() {
viewBinding.changeMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
-// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+// viewBinding.changeMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changeMailVerificationTv.setEnabled(true);
}
@@ -420,12 +415,12 @@
//鎵嬫満鍙�
viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.changePhoneIc.accountTitleTv.setTextSize(18);
- viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+ viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changePhoneIc.lineV.setVisibility(View.VISIBLE);
viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
viewBinding.changeMailRl.accountTitleTv.setTextSize(14);
- viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
viewBinding.changeMailRl.lineV.setVisibility(View.GONE);
@@ -452,12 +447,12 @@
//閭
viewBinding.changePhoneIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.changePhoneIc.accountTitleTv.setTextSize(14);
- viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.changePhoneIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
viewBinding.changePhoneIc.lineV.setVisibility(View.GONE);
viewBinding.changeMailRl.accountTitleTv.setText(R.string.home_login_email);
viewBinding.changeMailRl.accountTitleTv.setTextSize(18);
- viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+ viewBinding.changeMailRl.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
viewBinding.changeMailRl.lineV.setVisibility(View.VISIBLE);
viewBinding.regionAccountRl.setVisibility(View.GONE);
@@ -500,9 +495,9 @@
}
boolean isEnabled = account.length() > 0 && psw1.length() > 0 && psw2.length() > 0 && verification_code.length() > 0;
if (isEnabled) {
- viewBinding.confirmTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.confirmTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.confirmTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.confirmTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.confirmTv.setEnabled(isEnabled);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
index 414d4ea..7b24c8e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
@@ -12,7 +12,6 @@
import android.view.View;
import androidx.appcompat.content.res.AppCompatResources;
-import androidx.constraintlayout.widget.ConstraintSet;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -29,15 +28,12 @@
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.utils.GPSManagerUtils;
-import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.photovoltaic.widget.ListStaticDialog;
import com.sahooz.library.countrypicker.Country;
import com.sahooz.library.countrypicker.CountryPickerFragment;
import com.sahooz.library.countrypicker.PickCountryCallback;
-
-import java.util.Locale;
/**
@@ -407,7 +403,7 @@
String str = time + "s" + getString(R.string.home_login_psw_verification_repeater);
viewBinding.registerMailVerificationTv.setText(str);
-// viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+// viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerMailVerificationTv.setEnabled(false);
}
@@ -415,7 +411,7 @@
@Override
public void onFinish() {
viewBinding.registerMailVerificationTv.setText(getString(R.string.home_login_verification_regain));
-// viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+// viewBinding.registerMailVerificationTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerMailVerificationTv.setEnabled(true);
}
@@ -447,12 +443,12 @@
//鎵嬫満鍙�
viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(18);
- viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.VISIBLE);
viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(14);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.GONE);
//鏄剧ず鍖哄彿
viewBinding.registerRegionAccountRl.setVisibility(View.VISIBLE);
@@ -478,12 +474,12 @@
//閭
viewBinding.registerPhoneTitleIc.accountTitleTv.setText(R.string.home_login_phone);
viewBinding.registerPhoneTitleIc.accountTitleTv.setTextSize(16);
- viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF, null));
+ viewBinding.registerPhoneTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B, null));
viewBinding.registerPhoneTitleIc.lineV.setVisibility(View.GONE);
viewBinding.registerMailTitleIc.accountTitleTv.setText(R.string.home_login_email);
viewBinding.registerMailTitleIc.accountTitleTv.setTextSize(18);
- viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ viewBinding.registerMailTitleIc.accountTitleTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
viewBinding.registerMailTitleIc.lineV.setVisibility(View.VISIBLE);
//闅愯棌鍖哄彿
@@ -527,9 +523,9 @@
}
boolean isEnabled = account.length() > 0 && psw1.length() > 0 && psw2.length() > 0 && verification_code.length() > 0;
if (isEnabled) {
- viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.registerCompleteTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.registerCompleteTv.setEnabled(isEnabled);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
index 906d1c7..611574c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
@@ -145,8 +145,8 @@
public MyViewHolder(@NonNull View itemView) {
super(itemView);
- device_icon_iv = itemView.findViewById(R.id.device_details_image_iv);
- homeNameTv = itemView.findViewById(R.id.device_details_name_tv);
+ device_icon_iv = itemView.findViewById(R.id.home_image_iv);
+ homeNameTv = itemView.findViewById(R.id.home_name_tv);
device_details_sn_tv = itemView.findViewById(R.id.device_details_value_tv);
device_label_run_state_value_tv = itemView.findViewById(R.id.device_label_run_state_value_tv);
device_label_power_value_tv = itemView.findViewById(R.id.device_label_power_value_tv);
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 b7ae1d2..c2e619e 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
@@ -14,13 +14,10 @@
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.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,20 +57,21 @@
HouseIdBean houseIdBean = this.mList.get(position);
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
- //瑁呮満瀹归噺
- String capacity = HdlCommonLogic.getBigDecimal(houseIdBean.getInstalledCapacity()).toString();
- holder.capacityTv.setText(capacity);
- //鍙戠數鍔熺巼
- holder.power_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getPower()));
- holder.power_kw_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getPower(), UnitType.kW));
- //褰撴棩鍙戠數閲�
- holder.day_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity()));
- holder.day_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getTodayElectricity(), UnitType.kWh));
- //鐢垫睜瀹归噺
- holder.month_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity()));
- holder.month_kwh_unit.setText(HdlCommonLogic.convertUnit(houseIdBean.getBatteryCapacity(), UnitType.kWh));
- holder.plant_details_location_tv.setText(houseIdBean.getHomeAddress());
+ //缁勪覆瀹归噺(鍒涘缓鐢电珯鏃惰緭鍏ョ殑缁勪覆瀹归噺)
+ holder.pv_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInstalledCapacity()));
+ holder.pv_kw_unit.setText(HdlCommonLogic.convertKWPUnit(houseIdBean.getInstalledCapacity()));
+ //褰撴棩鍙戠數
+ holder.generation_today_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getTodayElectricity()));
+ holder.generation_today_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getTodayElectricity()));
+ //閫嗗彉鍣ㄩ瀹氬姛鐜囷紙鍗曚釜閫嗗彉鍣ㄩ瀹氬姛鐜�*閫嗗彉鍣ㄦ暟閲忥級
+ holder.output_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getInvPower()));
+ holder.output_kw_unit.setText(HdlCommonLogic.convertKWUnit(houseIdBean.getInvPower()));
+ //鐢垫睜鑳介噺
+ holder.battery_storage_value_tv.setText(HdlCommonLogic.convertDoubleValue(houseIdBean.getBatteryCapacity()));
+ holder.battery_storage_kw_unit.setText(HdlCommonLogic.convertKWHUnit(houseIdBean.getBatteryCapacity()));
+
+ holder.home_location_tv.setText(houseIdBean.getHomeAddress());
holder.item_parent_rl.setTag(position);
setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, 6);
@@ -218,36 +216,39 @@
public ImageView homeIconIv;//浣忓畢鍥剧墖
public TextView homeNameTv;//浣忓畢鍚嶇О
- public TextView capacityTv;//瑁呮満瀹归噺
- 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 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 stateTv;//鐢电珯鐘舵��(杩炴帴涓�,杩愯,绂荤嚎,鏁呴殰);
public RelativeLayout item_parent_rl;//鏉＄洰鐖跺鍣�
public LinearLayout move_home_ll;//绉诲姩鐢电珯浣嶇疆
public LinearLayout del_home_ll;//鍒犻櫎鐢电珯
- public TextView plant_details_location_tv;//鐢电珯鍦板潃
+ 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);
- 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);
+ homeIconIv = itemView.findViewById(R.id.home_image_iv);
+ homeNameTv = itemView.findViewById(R.id.home_name_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);
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);
- plant_details_location_tv = itemView.findViewById(R.id.plant_details_location_tv);
+ 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/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index c81b539..1001175 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -13,7 +13,7 @@
private String homeId;//鐢电珯id
private String powerStationImage;//鐢电珯鍥剧墖
private String homeName;//鐢电珯鍚嶇О
- private String installedCapacity;//瑁呮満瀹归噺
+ private String installedCapacity;//缁勪覆瀹归噺(鍒涘缓鐢电珯鏃惰緭鍏ョ殑缁勪覆瀹归噺)
private String power;//鍙戠數鍔熺巼
private String todayElectricity;//褰撴棩鍙戠數閲�
private String monthElectricity;//褰撴湀鍙戠數閲�
@@ -21,6 +21,17 @@
private String batteryCapacity;//鐢垫睜瀹归噺
+ private String invPower;//閫嗗彉鍣ㄩ瀹氬姛鐜囷紙鍗曚釜閫嗗彉鍣ㄩ瀹氬姛鐜�*閫嗗彉鍣ㄦ暟閲忥級
+
+
+ public String getInvPower() {
+ return invPower == null ? "" : invPower;
+ }
+
+ public void setInvPower(String invPower) {
+ this.invPower = invPower;
+ }
+
private int powerStationStatus;//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
private String localSecret;//鏈湴閫氳绉橀挜
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 5849454..0469a3c 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
@@ -11,7 +11,6 @@
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
@@ -65,7 +64,6 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -185,16 +183,16 @@
viewBinding.unitTv.setText(UnitType.kW);
viewBinding.unitTextTv.setText(getString(R.string.pv_power));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_FFACACAC));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.v1.setVisibility(View.GONE);
viewBinding.v2.setVisibility(View.VISIBLE);
@@ -219,16 +217,16 @@
viewBinding.unitTv.setText(UnitType.kWh);
viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_FFACACAC));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.v1.setVisibility(View.GONE);
viewBinding.v2.setVisibility(View.GONE);
@@ -253,16 +251,16 @@
viewBinding.unitTv.setText(UnitType.kWh);
viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_FFACACAC));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.v1.setVisibility(View.VISIBLE);
viewBinding.v2.setVisibility(View.GONE);
@@ -285,16 +283,16 @@
viewBinding.unitTv.setText(UnitType.kWh);
viewBinding.unitTextTv.setText(getString(R.string.generation));
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_FFACACAC));
viewBinding.v1.setVisibility(View.VISIBLE);
viewBinding.v2.setVisibility(View.VISIBLE);
@@ -399,12 +397,12 @@
// .setTitleText(_mActivity.getString(R.string.time_selectd))//鏍囬鏂囧瓧
.setOutSideCancelable(true)//鐐瑰嚮灞忓箷锛岀偣鍦ㄦ帶浠跺閮ㄨ寖鍥存椂锛屾槸鍚﹀彇娑堟樉绀�
.isCyclic(false)//鏄惁寰幆婊氬姩
-// .setTitleColor(_mActivity.getColor(R.color.text_E6FFFFFF))//鏍囬鏂囧瓧棰滆壊
- .setSubmitColor(_mActivity.getColor(R.color.text_E6FFFFFF))//纭畾鎸夐挳鏂囧瓧棰滆壊
+// .setTitleColor(_mActivity.getColor(R.color.text_FFACACAC))//鏍囬鏂囧瓧棰滆壊
+ .setSubmitColor(_mActivity.getColor(R.color.text_FFACACAC))//纭畾鎸夐挳鏂囧瓧棰滆壊
.setCancelColor(_mActivity.getColor(R.color.text_FF8E8E8E))//鍙栨秷鎸夐挳鏂囧瓧棰滆壊
.setTitleBgColor(_mActivity.getColor(R.color.text_FF222222))//鏍囬鑳屾櫙棰滆壊 Night mode
.setBgColor(_mActivity.getColor(R.color.text_FF222222))//婊氳疆鑳屾櫙棰滆壊 Night mode
- .setTextColorCenter(_mActivity.getColor(R.color.text_E6FFFFFF)).setDate(selectedDate)// 濡傛灉涓嶈缃殑璇濓紝榛樿鏄郴缁熸椂闂�*/
+ .setTextColorCenter(_mActivity.getColor(R.color.text_FFACACAC)).setDate(selectedDate)// 濡傛灉涓嶈缃殑璇濓紝榛樿鏄郴缁熸椂闂�*/
.setRangDate(startDate, endDate)//璧峰缁堟骞存湀鏃ヨ瀹�
.setLabel(_mActivity.getString(R.string.year), _mActivity.getString(R.string.month), _mActivity.getString(R.string.day), _mActivity.getString(R.string.hour), _mActivity.getString(R.string.minute), _mActivity.getString(R.string.seconds))//榛樿璁剧疆涓哄勾鏈堟棩鏃跺垎绉�
.isCenterLabel(false) //鏄惁鍙樉绀轰腑闂撮�変腑椤圭殑label鏂囧瓧锛宖alse鍒欐瘡椤筰tem鍏ㄩ儴閮藉甫鏈塴abel銆�
@@ -455,13 +453,13 @@
viewBinding.dayTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.time_selected_39383d));
- viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_E6FFFFFF));
+ viewBinding.dayTv.setTextColor(_mActivity.getColor(R.color.text_FFACACAC));
viewBinding.monthTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.monthTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.yearTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.yearTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.lifeCycleTv.setBackground(AppCompatResources.getDrawable(_mActivity, R.color.text_00000000));
- viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_66FFFFFF));
+ viewBinding.lifeCycleTv.setTextColor(_mActivity.getColor(R.color.text_FF5B5B5B));
viewBinding.v1.setVisibility(View.GONE);
viewBinding.v2.setVisibility(View.VISIBLE);
viewBinding.v3.setVisibility(View.VISIBLE);
@@ -539,7 +537,7 @@
}
String capacityValue = HdlCommonLogic.divideByOneThousandAndFormat(dataOverBean.getInstalledCapacity()).toString();
viewBinding.infoRl1Text1Tv.setText(capacityValue);
- viewBinding.kwpUnit.setText(HdlCommonLogic.convertWPUnit(dataOverBean.getInstalledCapacity()));
+ viewBinding.kwpUnit.setText(HdlCommonLogic.convertKWPUnit(dataOverBean.getInstalledCapacity()));
viewBinding.infoRl1Text3Tv.setText(HdlCommonLogic.convertDoubleValue(dataOverBean.getPower()));
// String str = dataOverBean.getPowerRatio() + "%";
@@ -549,7 +547,7 @@
// //璁剧疆绗竴閮ㄥ垎鏂囧瓧鐨勫瓧浣撳ぇ灏�
// spannableString.setSpan(new AbsoluteSizeSpan((int) UnitConversionUtils.dpToPx(HDLApp.getInstance(), 12)), startIndex, endIndex, 0);
// // 鍒涘缓涓�涓狥oregroundColorSpan瀵硅薄锛屽弬鏁版槸棰滆壊鍊�
-// ForegroundColorSpan colorSpan = new ForegroundColorSpan(HDLApp.getInstance().getColor(R.color.text_66FFFFFF));
+// ForegroundColorSpan colorSpan = new ForegroundColorSpan(HDLApp.getInstance().getColor(R.color.text_FF5B5B5B));
// spannableString.setSpan(colorSpan, startIndex, endIndex, 0);
// viewBinding.infoRl1FText1Tv.setText(spannableString);
viewBinding.infoRl1FText1Tv.setText(dataOverBean.getPowerRatio());
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
index 05583af..faf6411 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
@@ -4,18 +4,14 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
-import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.View;
-
-import androidx.appcompat.content.res.AppCompatResources;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.bean.NewVersionBean;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
-import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityAsRegardsBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -23,7 +19,6 @@
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;
-import com.hdl.photovoltaic.widget.FlashingIconBoxDialog;
import com.hdl.photovoltaic.widget.apkwgtupload.ApkDownLoadService;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.UpdateConfirmationCancelDialog;
@@ -67,7 +62,7 @@
if (newVersionBean != null) {
//todo 鍙戠幇鏂扮増鏈�,鏀瑰彉UI鏍峰紡
viewBinding.asRegardsRlRightContentTv.setText(R.string.app_discover_new_version);
- viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF, null));
+ viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
index f8fed77..0adf4c8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
@@ -11,8 +11,6 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityBpersonalDataBinding;
-import java.io.File;
-
/**
* B绔釜浜鸿祫鏂欑殑鐣岄潰
@@ -92,13 +90,13 @@
viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.default_image));
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
- viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_FFACACAC));
String bingEmail = TextUtils.isEmpty(UserConfigManage.getInstance().getBingEmail()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingEmail();
viewBinding.personalDataMailIl.sllLlRlRightContentTv.setText(bingEmail);
- viewBinding.personalDataMailIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.personalDataMailIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_FFACACAC));
String bingPhone = TextUtils.isEmpty(UserConfigManage.getInstance().getBingPhone()) ? _mActivity.getString(R.string.set_not_bind) : UserConfigManage.getInstance().getBingPhone();
viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setText(bingPhone);
- viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_FFACACAC));
viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
index c46cbe6..428d112 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
@@ -195,9 +195,9 @@
String verificationCode = viewBinding.changeMailVerificationEt.getText().toString().replace(" ", "");
boolean isEnabled = account.length() > 0 && verificationCode.length() > 0;
if (isEnabled) {
- viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.bindPhoneTv.setEnabled(isEnabled);
return isEnabled;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index dcb82f3..cb5864d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -226,9 +226,9 @@
String verificationCode = viewBinding.changePhoneVerificationEt.getText().toString().replace(" ", "");
boolean isEnabled = account.length() > 0 && verificationCode.length() > 0;
if (isEnabled) {
- viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.bindPhoneTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.bindPhoneTv.setEnabled(isEnabled);
return isEnabled;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
index bae8d1f..2798636 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
@@ -190,9 +190,9 @@
String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString();
boolean isEnabled = oldPsw.length() > 0 && newPsw.length() > 0 && affirmPsw.length() > 0;
if (isEnabled) {
- viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_E6FFFFFF));
+ viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_FFACACAC));
} else {
- viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_66FFFFFF));
+ viewBinding.homeAffirmTv.setTextColor(getColor(R.color.text_FF5B5B5B));
}
viewBinding.homeAffirmTv.setEnabled(isEnabled);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
index d7f4968..5b8011c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
@@ -412,6 +412,7 @@
if (isShowLoading) {
hideLoading();
}
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index 73ec0cb..476ebb8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -433,6 +433,7 @@
if (isShowLoading) {
hideLoading();
}
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
index 481fc76..7ab4658 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListEdit.java
@@ -204,6 +204,8 @@
viewBinding.fragmentHouseSrl.setRefreshing(false);
}
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
+
}
}, _mActivity, ShowErrorMode.YES);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
index b0b4bf7..9ef7f82 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
@@ -169,6 +169,7 @@
//鍏抽棴涓嬫媺鍒锋柊鐨勫湀鍦�
viewBinding.fragmentHouseSrl.setRefreshing(false);
}
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
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 262e719..ac38b08 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,18 +1,13 @@
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.Bundle;
-import android.os.SystemClock;
import android.provider.Settings;
-import android.util.Log;
import android.view.View;
-import android.view.Window;
import android.widget.ImageView;
import android.widget.RelativeLayout;
@@ -45,7 +40,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;
@@ -57,7 +51,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;
@@ -175,10 +168,10 @@
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
- viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
+ viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -193,10 +186,10 @@
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
- viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
+ viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -211,10 +204,10 @@
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_yes_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
- viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
+ viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -228,10 +221,10 @@
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_yes_ffffff));
- viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
+ viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -575,10 +568,10 @@
viewBinding.offlineLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
viewBinding.connectedLl.setBackground(AppCompatResources.getDrawable(_mActivity, R.drawable.station_status_no_ffffff));
- viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_E6FFFFFF));
- viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
- viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_66FFFFFF));
+ viewBinding.allDesTv.setTextColor(getResources().getColor(R.color.text_FFACACAC));
+ viewBinding.faultsDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.offlineDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
+ viewBinding.connectedDesTv.setTextColor(getResources().getColor(R.color.text_FF5B5B5B));
//鐢电珯鏍囩
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
@@ -865,7 +858,7 @@
if (isRefreshing) {
hideLoading();
}
-
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
}
@@ -934,6 +927,7 @@
if (isRefreshing) {
hideLoading();
}
+ HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
}
}, _mActivity, ShowErrorMode.YES);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
index a5313bc..fe74ce6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestLogActivity.java
@@ -163,8 +163,8 @@
* 鍒濆鍖栫晫闈�
*/
private void initView() {
- String homeId = "娴嬭瘯浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
- String homeName = "娴嬭瘯浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
+ String homeId = "鏃ュ織浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
+ String homeName = "鏃ュ織浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
viewBinding.homeIdTv.setText(homeId);
viewBinding.homeNameTv.setText(homeName);
showLoading();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
index be05aa2..d5db2d9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -85,8 +85,8 @@
private void initView() {
this.mHomeId = UserConfigManage.getInstance().getHomeId();
this.mHomeName = UserConfigManage.getInstance().getHomeName();
- String homeId = "鐢电珯Id=" + this.mHomeId;
- String homeName = "鐢电珯鍚嶇О=" + this.mHomeName;
+ String homeId = "娴嬭瘯鐢电珯Id=" + this.mHomeId;
+ String homeName = "娴嬭瘯鐢电珯鍚嶇О=" + this.mHomeName;
viewBinding.homeIdTv.setText(homeId);
viewBinding.homeNameTv.setText(homeName);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/adapters/HomeAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/adapters/HomeAdapter.java
index 6faaac9..1e95891 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/adapters/HomeAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/adapters/HomeAdapter.java
@@ -41,7 +41,8 @@
public void onBindViewHolder(@NonNull HomeAdapter.MyViewHolder holder, int position) {
try {
HouseIdBean houseIdBean = this.mList.get(position);
- holder.item_lift_name_tv.setText(houseIdBean.getHomeName());
+ String str = houseIdBean.getHomeName() + "(" + houseIdBean.getHomeId() + ")";
+ holder.item_lift_name_tv.setText(str);
if (position == this.mList.size() - 1) {
holder.item_bottom_line_v.setVisibility(View.GONE);
}
@@ -73,7 +74,7 @@
this.mList = list;
}
- public void setNoOnclickListener( HomeAdapter.OnclickListener onclickListener) {
+ public void setNoOnclickListener(HomeAdapter.OnclickListener onclickListener) {
this.noOnclickListener = onclickListener;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
index 385151c..051456d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMPSDKManager.java
@@ -137,7 +137,6 @@
//鏆傛椂閫氳繃杩欎釜澶勭悊灏忕▼搴忓悓鏃跺鏉＄浉鍚岀殑璇锋眰
if (data == null) {
HdlLogLogic.print("鏀跺埌灏忕▼搴忛�氱煡,data鏁版嵁涓簄ull銆�", true);
-
return;
}
// String key= MD5Utils.getMd5(event+data.toString());
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
index b8f3464..e325346 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/ListDialogAdapter.java
@@ -10,7 +10,6 @@
import androidx.recyclerview.widget.RecyclerView;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import java.util.List;
@@ -40,9 +39,9 @@
public void onBindViewHolder(@NonNull ListDialogAdapter.MyViewHolder holder, int position) {
LanguageAdapter.ItemData itemData = this.mList.get(position);
holder.list_item_title_tv.setText(itemData.getTitle());
- holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_66FFFFFF));
+ holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_FF5B5B5B));
if (itemData.isState()) {
- holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_E6FFFFFF));
+ holder.list_item_title_tv.setTextColor(mContext.getColor(R.color.text_FFACACAC));
}
if (position == this.mList.size() - 1) {
holder.list_item_line_v.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java
index 76c850f..751b839 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java
@@ -47,7 +47,7 @@
}
holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_FF8E8E8E));
if (mSelectType.equals(title)) {
- holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_E6FFFFFF));
+ holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_FFACACAC));
}
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/app/src/main/res/drawable-xhdpi/location.png b/app/src/main/res/drawable-xhdpi/location.png
new file mode 100644
index 0000000..97829ee
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/location.png
Binary files differ
diff --git a/app/src/main/res/drawable/line_view.xml b/app/src/main/res/drawable/line_view.xml
index 36ea081..05470c3 100644
--- a/app/src/main/res/drawable/line_view.xml
+++ b/app/src/main/res/drawable/line_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <solid android:color="@color/text_E6FFFFFF" />
+ <solid android:color="@color/text_FFACACAC" />
<corners android:radius="79.5dp" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/location.png b/app/src/main/res/drawable/location.png
deleted file mode 100644
index 543d36a..0000000
--- a/app/src/main/res/drawable/location.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index f295bbf..56e573b 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -47,7 +47,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_12"
android:text="@string/app_version_number"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -76,7 +76,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_12"
android:text="@string/app_scan_code_download"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -99,7 +99,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/app_version_upgrade"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -127,7 +127,7 @@
android:layout_marginEnd="@dimen/dp_9"
android:layout_toStartOf="@+id/as_regards_version_updating_ll"
android:text="@string/app_new_version"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<View
@@ -154,7 +154,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/app_service_agreement"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -197,7 +197,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/app_privacy_policy"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -241,7 +241,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/contact_us"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
diff --git a/app/src/main/res/layout/activity_bind_mail.xml b/app/src/main/res/layout/activity_bind_mail.xml
index 8339de0..1c68711 100644
--- a/app/src/main/res/layout/activity_bind_mail.xml
+++ b/app/src/main/res/layout/activity_bind_mail.xml
@@ -34,7 +34,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/home_login_email"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<RelativeLayout
@@ -61,8 +61,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -104,7 +104,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/verification"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<!--閭鑾峰彇楠岃瘉鐮�-->
@@ -128,7 +128,7 @@
android:paddingStart="@dimen/dp_16"
android:paddingEnd="@dimen/dp_0"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -151,8 +151,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -185,7 +185,7 @@
android:gravity="center"
android:text="@string/home_login_affirm"
android:enabled="false"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index 68b2ec0..0b2efb7 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -32,7 +32,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/home_phone_number"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<RelativeLayout
@@ -53,7 +53,7 @@
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
android:text="@string/home_chinese_mainland"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<TextView
@@ -65,7 +65,7 @@
android:layout_marginEnd="@dimen/dp_35"
android:gravity="center_vertical|end"
android:text="+86"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -99,7 +99,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/home_login_phone"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<RelativeLayout
@@ -124,8 +124,8 @@
android:inputType="phone"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -167,7 +167,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/verification"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<!--鎵嬫満鑾峰彇楠岃瘉鐮�-->
@@ -191,7 +191,7 @@
android:paddingStart="@dimen/dp_16"
android:paddingEnd="@dimen/dp_0"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -214,8 +214,8 @@
android:inputType="phone"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -248,7 +248,7 @@
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_affirm"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 26aea37..f0aa632 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -37,7 +37,7 @@
android:layout_marginTop="@dimen/dp_39"
android:text="@string/home_login_change_password"
android:textAlignment="center"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_28"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/change_back_tv" />
@@ -85,7 +85,7 @@
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
android:text="@string/home_chinese_mainland"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<TextView
@@ -97,7 +97,7 @@
android:layout_marginEnd="@dimen/dp_50"
android:gravity="center_vertical|end"
android:text="+86"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -140,8 +140,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<View
@@ -172,7 +172,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -195,8 +195,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -230,7 +230,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -253,8 +253,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -290,8 +290,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -332,8 +332,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -377,7 +377,7 @@
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_confirm_reset"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_contact_us.xml b/app/src/main/res/layout/activity_contact_us.xml
index e2cdd8c..e72e104 100644
--- a/app/src/main/res/layout/activity_contact_us.xml
+++ b/app/src/main/res/layout/activity_contact_us.xml
@@ -34,7 +34,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/wechat_id"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -46,7 +46,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_16"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<View
@@ -73,7 +73,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/email_address"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<TextView
@@ -83,7 +83,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_16"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index c05f88f..02d6ff8 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/app/src/main/res/layout/activity_device_search.xml
@@ -63,8 +63,8 @@
android:background="@null"
android:gravity="start|center_vertical"
android:hint="@string/enter_the_device_sn_and_device_name"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -86,7 +86,7 @@
android:layout_marginEnd="@dimen/dp_21"
android:gravity="center"
android:text="@string/search"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -109,7 +109,7 @@
android:layout_marginTop="@dimen/dp_23"
android:layout_marginEnd="@dimen/dp_21"
android:text="@string/history_search"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index df142a4..3674d2a 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:src="@drawable/language_pull_down"
android:text="@string/home_login_chinese"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -87,7 +87,7 @@
android:layout_height="@dimen/dp_39"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/app_name"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_28"
app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" />
@@ -115,7 +115,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_6"
android:text="@string/home_login_an_installer"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv"
@@ -137,8 +137,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -191,8 +191,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -234,7 +234,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/home_login_register"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" />
@@ -245,7 +245,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_24"
android:text="@string/home_login_forget_password"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
@@ -259,7 +259,7 @@
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_logoin"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
@@ -314,7 +314,7 @@
android:singleLine="false"
android:tag="click"
android:text="@string/home_login_consent_service_agreement"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml
index 15e039f..f4ceb7e 100644
--- a/app/src/main/res/layout/activity_house_search.xml
+++ b/app/src/main/res/layout/activity_house_search.xml
@@ -62,8 +62,8 @@
android:background="@null"
android:gravity="start|center_vertical"
android:hint="@string/search_station"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -85,7 +85,7 @@
android:layout_marginEnd="@dimen/dp_21"
android:gravity="center"
android:text="@string/search"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -108,7 +108,7 @@
android:layout_marginTop="@dimen/dp_23"
android:layout_marginEnd="@dimen/dp_21"
android:text="@string/history_search"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/activity_me_change_password.xml b/app/src/main/res/layout/activity_me_change_password.xml
index 05a2361..b19f265 100644
--- a/app/src/main/res/layout/activity_me_change_password.xml
+++ b/app/src/main/res/layout/activity_me_change_password.xml
@@ -46,7 +46,7 @@
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_20"
android:text="@string/home_login_least6"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/me_psw_ll" />
@@ -71,7 +71,7 @@
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_affirm"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index 2bbd37b..444d865 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -45,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alarm_all_device"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -77,7 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/alarm_all_grade"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_5"
android:text="@string/alarm_all_time"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -192,7 +192,7 @@
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
android:text="@string/alarm_device"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -221,7 +221,7 @@
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
android:text="@string/alarm_record"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 542c8b2..7d2f933 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -54,7 +54,7 @@
android:paddingStart="@dimen/dp_6"
android:paddingEnd="@dimen/dp_20"
android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
</LinearLayout>
@@ -156,7 +156,7 @@
android:background="@drawable/bj_ff555859_no"
android:gravity="center"
android:text="@string/message_alarm_details_back"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -170,7 +170,7 @@
android:background="@drawable/bj_ff39383d"
android:gravity="center"
android:text="@string/message_alarm_details_resolved"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_power_stations_list.xml b/app/src/main/res/layout/activity_power_stations_list.xml
index 61bf887..37d6bed 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_list.xml
@@ -53,7 +53,7 @@
android:background="@drawable/bj_ff39383d"
android:gravity="center"
android:text="@string/add_power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="14sp" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_qr_code_main.xml b/app/src/main/res/layout/activity_qr_code_main.xml
index 53b5e42..4fc4fce 100644
--- a/app/src/main/res/layout/activity_qr_code_main.xml
+++ b/app/src/main/res/layout/activity_qr_code_main.xml
@@ -52,7 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/qr_code_box"
@@ -64,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
@@ -79,7 +79,7 @@
android:background="@drawable/selected_8_ff39383d"
android:gravity="center"
android:text="@string/save_to_album"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/user_name_tv"
app:layout_constraintStart_toStartOf="@+id/user_name_tv"
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index a647d93..fc466ab 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/app/src/main/res/layout/activity_register_account.xml
@@ -47,7 +47,7 @@
android:layout_marginTop="@dimen/dp_39"
android:text="@string/home_login_register"
android:textAlignment="center"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_28"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/register_back_tv" />
@@ -98,7 +98,7 @@
android:layout_toEndOf="@+id/region_iv"
android:gravity="center_vertical"
android:text="HDL China"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
@@ -136,7 +136,7 @@
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
android:text="@string/home_chinese_mainland"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<TextView
@@ -148,7 +148,7 @@
android:layout_marginEnd="@dimen/dp_50"
android:gravity="center_vertical|end"
android:text="+964"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -191,8 +191,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<View
@@ -224,8 +224,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -266,8 +266,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -308,7 +308,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -331,8 +331,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -368,7 +368,7 @@
android:gravity="center"
android:padding="@dimen/dp_16"
android:text="@string/home_login_send_mail"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -391,8 +391,8 @@
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
@@ -430,7 +430,7 @@
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_register"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_search_messge.xml b/app/src/main/res/layout/activity_search_messge.xml
index 7cfa3ed..a9de490 100644
--- a/app/src/main/res/layout/activity_search_messge.xml
+++ b/app/src/main/res/layout/activity_search_messge.xml
@@ -62,8 +62,8 @@
android:background="@null"
android:gravity="start|center_vertical"
android:hint="@string/enter_alarm_name"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -85,7 +85,7 @@
android:layout_marginEnd="@dimen/dp_21"
android:gravity="center"
android:text="@string/search"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -108,7 +108,7 @@
android:layout_marginTop="@dimen/dp_23"
android:layout_marginEnd="@dimen/dp_21"
android:text="@string/history_search"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index f3fe5b2..9b68d5e 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -60,7 +60,7 @@
android:background="@drawable/bj_ff39383d"
android:gravity="center"
android:text="@string/set_logout"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_unregister.xml b/app/src/main/res/layout/activity_unregister.xml
index fa3e1ae..6c3f3c0 100644
--- a/app/src/main/res/layout/activity_unregister.xml
+++ b/app/src/main/res/layout/activity_unregister.xml
@@ -27,7 +27,7 @@
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:text="@string/account_not_recoverable"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -48,7 +48,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/account"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<RelativeLayout
@@ -73,7 +73,7 @@
android:inputType="phone"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -94,7 +94,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/psw"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<!--杈撳叆鐧诲綍瀵嗙爜-->
@@ -121,8 +121,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -150,7 +150,7 @@
android:background="@drawable/bj_ff39383d"
android:gravity="center"
android:text="@string/immediate_cancellation"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_agree_onagree.xml b/app/src/main/res/layout/dialog_agree_onagree.xml
index 1df2794..0dde711 100644
--- a/app/src/main/res/layout/dialog_agree_onagree.xml
+++ b/app/src/main/res/layout/dialog_agree_onagree.xml
@@ -76,7 +76,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/loading_on_agree"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -99,7 +99,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/loading_agree"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_confirm_cancel.xml b/app/src/main/res/layout/dialog_confirm_cancel.xml
index 064a519..ecc307d 100644
--- a/app/src/main/res/layout/dialog_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_confirm_cancel.xml
@@ -26,7 +26,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +43,7 @@
android:gravity="center"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
android:lineSpacingExtra="@dimen/dp_2"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
@@ -79,7 +79,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -102,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_affirm"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_confirm_input.xml b/app/src/main/res/layout/dialog_confirm_input.xml
index ef8edab..139e1a7 100644
--- a/app/src/main/res/layout/dialog_confirm_input.xml
+++ b/app/src/main/res/layout/dialog_confirm_input.xml
@@ -28,7 +28,7 @@
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_20"
android:text="wifi_ssid"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<androidx.constraintlayout.widget.ConstraintLayout
@@ -55,8 +55,8 @@
android:maxLines="1"
android:paddingStart="@dimen/dp_16"
android:paddingEnd="@dimen/dp_16"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -108,7 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -131,7 +131,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_affirm"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 7c2e55a..cd50b72 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -28,7 +28,7 @@
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="@string/loading_cancel"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -41,7 +41,7 @@
android:layout_toEndOf="@+id/cancel_ll"
android:gravity="center"
android:text="@string/filtering"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/dp_18"
android:visibility="gone" />
@@ -58,7 +58,7 @@
android:layout_height="match_parent"
android:gravity="center_vertical|start"
android:text="@string/loading_affirm"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -78,7 +78,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_18"
android:text="@string/string_capacity"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cancel_affirm_cl" />
@@ -104,8 +104,8 @@
android:gravity="center"
android:hint="@string/min"
android:inputType="number"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<View
@@ -132,8 +132,8 @@
android:gravity="center"
android:hint="@string/max"
android:inputType="number"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -156,7 +156,7 @@
android:gravity="center"
android:tag="0-5"
android:text="0 ~ 5"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -172,7 +172,7 @@
android:gravity="center"
android:tag="5-10"
android:text="5 ~ 10"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -188,7 +188,7 @@
android:gravity="center"
android:tag="10-15"
android:text="10 ~ 15"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
@@ -213,7 +213,7 @@
android:gravity="center"
android:tag="15-30"
android:text="15 ~ 30"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -229,7 +229,7 @@
android:gravity="center"
android:tag="30-100"
android:text="30 ~ 100"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -245,7 +245,7 @@
android:gravity="center"
android:tag="100-300"
android:text="100 ~ 300"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
@@ -270,7 +270,7 @@
android:gravity="center"
android:tag="300-500"
android:text="300 ~ 500"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -286,7 +286,7 @@
android:gravity="center"
android:tag="500+"
android:text="500+"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -308,7 +308,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="37dp"
android:text="@string/grid_connected_state"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line3_ll" />
@@ -332,7 +332,7 @@
android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/message_all"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -347,7 +347,7 @@
android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/be_debugging"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -362,7 +362,7 @@
android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/debugging_completed"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -385,7 +385,7 @@
android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/delivered"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -400,7 +400,7 @@
android:background="@drawable/config_129"
android:gravity="center"
android:text="@string/authorization_debugging"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<View
@@ -444,7 +444,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
</RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_flashing_box.xml b/app/src/main/res/layout/dialog_flashing_box.xml
index df51b53..ce7d606 100644
--- a/app/src/main/res/layout/dialog_flashing_box.xml
+++ b/app/src/main/res/layout/dialog_flashing_box.xml
@@ -23,7 +23,7 @@
android:gravity="center"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_static_list.xml b/app/src/main/res/layout/dialog_static_list.xml
index ef968c6..dbe651f 100644
--- a/app/src/main/res/layout/dialog_static_list.xml
+++ b/app/src/main/res/layout/dialog_static_list.xml
@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="HDL China"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="HDL Bahrain"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -69,7 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
/>
diff --git a/app/src/main/res/layout/dialog_update_confirm_cancel.xml b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
index 0becbe0..371aefe 100644
--- a/app/src/main/res/layout/dialog_update_confirm_cancel.xml
+++ b/app/src/main/res/layout/dialog_update_confirm_cancel.xml
@@ -26,7 +26,7 @@
android:layout_marginTop="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_20"
android:text="@string/app_discover_new_version"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +44,7 @@
android:layout_marginBottom="@dimen/dp_0"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
app:layout_constraintBottom_toTopOf="@+id/loading_confirmation_content2_tv"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
android:layout_marginBottom="@dimen/dp_34"
android:singleLine="false"
android:tag="click"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
app:layout_constraintBottom_toTopOf="@+id/dialog_confirm_bottom_line_ly"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -98,7 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_cancel"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -121,7 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_update_now"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/diaog_list_line.xml b/app/src/main/res/layout/diaog_list_line.xml
index a0507ae..a4b84ea 100644
--- a/app/src/main/res/layout/diaog_list_line.xml
+++ b/app/src/main/res/layout/diaog_list_line.xml
@@ -13,7 +13,7 @@
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_17"
android:gravity="center"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index da6e24c..6b82695 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/power_home_page"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<ImageView
@@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -96,7 +96,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/message_all"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
<!--鏁呴殰-->
@@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -123,7 +123,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/my_power_station_malfunction"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
<!--绂荤嚎-->
@@ -141,7 +141,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/my_power_station_off_line"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
<!--寰呮帴鍏�-->
@@ -168,7 +168,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -177,7 +177,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/to_be_added"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -216,7 +216,7 @@
android:layout_marginStart="@dimen/dp_41"
android:layout_marginTop="@dimen/dp_32"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_26" />
<!--鍏堥殣钘�-->
<TextView
@@ -228,7 +228,7 @@
android:layout_marginBottom="6.5dp"
android:layout_toEndOf="@+id/info_rl1_f_text1_tv"
android:text="%"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
android:visibility="visible" />
@@ -251,7 +251,7 @@
android:layout_alignStart="@+id/info_rl1_f_text1_tv"
android:layout_marginTop="@dimen/dp_8"
android:text="@string/radio"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -274,7 +274,7 @@
android:layout_marginStart="42.5dp"
android:layout_marginTop="16.5dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -286,7 +286,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/info_rl1_text1_tv"
android:text="kWp"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -296,7 +296,7 @@
android:layout_below="@+id/info_rl1_text1_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:text="@string/string_capacity"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -307,7 +307,7 @@
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:layout_marginTop="@dimen/dp_18"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -319,7 +319,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/info_rl1_text3_tv"
android:text="kW"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -329,7 +329,7 @@
android:layout_below="@+id/info_rl1_text3_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:text="@string/generated_power"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -359,7 +359,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="18dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -371,7 +371,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/day"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -381,7 +381,7 @@
android:layout_below="@+id/day_unit"
android:layout_alignStart="@+id/day"
android:text="@string/day_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<!--骞�-->
@@ -393,7 +393,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="20dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -405,7 +405,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/year"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -415,7 +415,7 @@
android:layout_below="@+id/year_unit"
android:layout_alignStart="@+id/year"
android:text="@string/year_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
@@ -452,7 +452,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="18dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -464,7 +464,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/month"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -474,7 +474,7 @@
android:layout_below="@+id/month_unit"
android:layout_alignStart="@+id/month"
android:text="@string/month_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<!--绱鍙戠數閲�-->
@@ -486,7 +486,7 @@
android:layout_marginStart="40.5dp"
android:layout_marginTop="20dp"
android:text="0.00"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -498,7 +498,7 @@
android:layout_marginBottom="2dp"
android:layout_toEndOf="@+id/Total"
android:text="kWh"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
<TextView
@@ -508,7 +508,7 @@
android:layout_below="@+id/Total_unit"
android:layout_alignStart="@+id/month"
android:text="@string/cumulative_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
@@ -539,7 +539,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:text="@string/energy_generation_statistics"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -661,7 +661,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:text="2024/03/07"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -708,7 +708,7 @@
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_marginStart="18.5dp"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -727,7 +727,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_16"
android:text="@string/pv_power"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
</RelativeLayout>
@@ -771,7 +771,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:text="@string/social_contribution"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -808,7 +808,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="13.14"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -819,7 +819,7 @@
android:layout_marginStart="2.5dp"
android:layout_toEndOf="@+id/social_contribution_data_1_tv"
android:text="@string/t"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -830,7 +830,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_8"
android:text="@string/saving_standard_coal"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
@@ -861,7 +861,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="13.14"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -872,7 +872,7 @@
android:layout_marginStart="2.5dp"
android:layout_toEndOf="@+id/social_contribution_data_2_tv"
android:text="@string/t"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
/>
@@ -885,7 +885,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_8"
android:text="@string/co_reduction_rate"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
@@ -916,7 +916,7 @@
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:text="13.14"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_16" />
<TextView
@@ -927,7 +927,7 @@
android:layout_marginStart="2.5dp"
android:layout_toEndOf="@+id/social_contribution_data_3_tv"
android:text="@string/number"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -938,7 +938,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_8"
android:text="@string/quantity_of_equivalent_values"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 16b7882..06f5911 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,7 +37,7 @@
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"
/>
@@ -109,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>
@@ -153,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
@@ -164,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>
@@ -190,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
@@ -201,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>
@@ -227,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
@@ -238,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>
@@ -264,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
@@ -275,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>
@@ -306,7 +306,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/pv"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -339,7 +339,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/output"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
@@ -368,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
@@ -396,7 +396,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/day_generation"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
@@ -493,7 +493,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/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 2ba1ba9..6a4024a 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/me"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
@@ -79,7 +79,7 @@
android:gravity="end|center_vertical"
android:paddingStart="@dimen/dp_0"
android:paddingEnd="@dimen/dp_3"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<ImageView
@@ -109,7 +109,7 @@
android:gravity="end|center_vertical"
android:paddingStart="@dimen/dp_0"
android:paddingEnd="@dimen/dp_3"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
diff --git a/app/src/main/res/layout/fragment_me_line.xml b/app/src/main/res/layout/fragment_me_line.xml
index a4db41d..2a8efd0 100644
--- a/app/src/main/res/layout/fragment_me_line.xml
+++ b/app/src/main/res/layout/fragment_me_line.xml
@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_7"
android:text="@string/me_set"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="@id/fragment_me_line_left_icon_iv"
app:layout_constraintStart_toEndOf="@+id/fragment_me_line_left_icon_iv"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 3064492..f73f310 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/message_nascent"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<TextView
@@ -35,7 +35,7 @@
android:layout_marginEnd="36dp"
android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
android:text="@string/alarm_record"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -95,7 +95,7 @@
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
android:text="@string/enter_alarm_name"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -122,7 +122,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_device"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -155,7 +155,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_grade"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -187,7 +187,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_time"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
diff --git a/app/src/main/res/layout/general_line.xml b/app/src/main/res/layout/general_line.xml
index 77fae00..6031028 100644
--- a/app/src/main/res/layout/general_line.xml
+++ b/app/src/main/res/layout/general_line.xml
@@ -19,7 +19,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="@string/set_nickname"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14"
android:visibility="gone" />
</LinearLayout>
diff --git a/app/src/main/res/layout/home_bottom_line.xml b/app/src/main/res/layout/home_bottom_line.xml
index 64e5360..9b9536a 100644
--- a/app/src/main/res/layout/home_bottom_line.xml
+++ b/app/src/main/res/layout/home_bottom_line.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/icon_iv"
android:layout_centerInParent="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<TextView
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index b5da7ad..152339d 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -28,7 +28,7 @@
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"
@@ -43,7 +43,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_11"
android:layout_marginTop="14.5dp"
- android:layout_toEndOf="@+id/device_details_image_iv"
+ android:layout_toEndOf="@+id/home_image_iv"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -54,7 +54,7 @@
android:background="@drawable/device_state_ff38c494" />
<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"
@@ -63,7 +63,7 @@
android:paddingEnd="@dimen/dp_20"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -77,7 +77,7 @@
android:layout_marginTop="2.5dp"
android:gravity="center_vertical"
android:text="SN:"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -88,14 +88,14 @@
android:layout_marginStart="3dp"
android:layout_marginTop="1.5dp"
android:layout_toEndOf="@+id/device_details_sn_tv"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<LinearLayout
android:id="@+id/screening_condition_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_37"
- android:layout_below="@+id/device_details_image_iv"
+ android:layout_below="@+id/home_image_iv"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_32"
@@ -113,7 +113,7 @@
android:layout_height="@dimen/dp_18"
android:gravity="start"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_15" />
<TextView
@@ -123,7 +123,7 @@
android:layout_marginTop="3dp"
android:gravity="start"
android:text="@string/device_run_state"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -158,7 +158,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<TextView
@@ -168,7 +168,7 @@
android:layout_marginStart="3dp"
android:gravity="bottom"
android:text="kW"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
</LinearLayout>
@@ -179,7 +179,7 @@
android:layout_marginTop="3dp"
android:gravity="start|center_horizontal"
android:text="@string/active_power"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -213,7 +213,7 @@
android:layout_height="match_parent"
android:gravity="center_vertical|start"
android:text="0"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<TextView
@@ -223,7 +223,7 @@
android:layout_marginStart="3dp"
android:gravity="bottom"
android:text="kW"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_10" />
</LinearLayout>
@@ -235,7 +235,7 @@
android:layout_marginTop="3dp"
android:gravity="start"
android:text="@string/day_power_generation"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -276,7 +276,7 @@
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/item_history_title.xml b/app/src/main/res/layout/item_history_title.xml
index e399f06..1c8bd60 100644
--- a/app/src/main/res/layout/item_history_title.xml
+++ b/app/src/main/res/layout/item_history_title.xml
@@ -21,7 +21,7 @@
android:layout_marginStart="@dimen/dp_16"
android:ellipsize="end"
android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_house_line_c.xml b/app/src/main/res/layout/item_house_line_c.xml
index eae0213..db8d0c4 100644
--- a/app/src/main/res/layout/item_house_line_c.xml
+++ b/app/src/main/res/layout/item_house_line_c.xml
@@ -15,7 +15,7 @@
android:ellipsize="end"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
diff --git a/app/src/main/res/layout/item_house_move.xml b/app/src/main/res/layout/item_house_move.xml
index f0fda73..b37b811 100644
--- a/app/src/main/res/layout/item_house_move.xml
+++ b/app/src/main/res/layout/item_house_move.xml
@@ -29,7 +29,7 @@
android:paddingEnd="@dimen/dp_16"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<ImageView
diff --git a/app/src/main/res/layout/item_language.xml b/app/src/main/res/layout/item_language.xml
index 20f2ca0..35474a7 100644
--- a/app/src/main/res/layout/item_language.xml
+++ b/app/src/main/res/layout/item_language.xml
@@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index ce05044..a31dcc5 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -45,7 +45,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/item_estate_tv"
@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="16.5dp"
android:layout_marginTop="14.5dp"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />
@@ -67,7 +67,7 @@
android:layout_height="16.5dp"
android:layout_marginTop="@dimen/dp_8"
android:gravity="center_vertical"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/item_estate_tv"
app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />
diff --git a/app/src/main/res/layout/item_message_c.xml b/app/src/main/res/layout/item_message_c.xml
index 235b356..ccbe1ed 100644
--- a/app/src/main/res/layout/item_message_c.xml
+++ b/app/src/main/res/layout/item_message_c.xml
@@ -53,7 +53,7 @@
android:paddingStart="@dimen/dp_6"
android:paddingEnd="@dimen/dp_20"
android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
</LinearLayout>
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="14.5dp"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/ll"
app:layout_constraintTop_toBottomOf="@+id/ll" />
@@ -74,7 +74,7 @@
android:layout_height="@dimen/dp_17"
android:layout_marginTop="@dimen/dp_8"
android:gravity="center_vertical"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/ll"
app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 8c4ef06..a83ff48 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -12,18 +12,18 @@
<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_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"
@@ -35,275 +35,312 @@
android:id="@+id/home_name_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
- android:layout_marginStart="@dimen/dp_11"
+ android:layout_marginStart="@dimen/dp_5"
android:layout_marginTop="14.5dp"
- android:layout_toEndOf="@+id/device_details_image_iv"
+ android:layout_toEndOf="@+id/home_image_iv"
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/device_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: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"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/home_name_ll"
- android:layout_alignStart="@+id/home_name_ll"
- android:layout_marginTop="2.5dp"
- android:gravity="center_vertical"
- android:text="@string/string_capacity"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/device_details_value_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/home_name_ll"
- android:layout_marginStart="3dp"
- android:layout_marginTop="1.5dp"
- android:layout_toEndOf="@+id/device_details_sn_tv"
- 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"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_37"
- android:layout_below="@+id/device_details_image_iv"
- android:layout_alignStart="@+id/device_details_image_iv"
- android:layout_marginTop="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_32"
- android:orientation="horizontal">
-
- <LinearLayout
- android:id="@+id/power_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">
-
- <TextView
- android:id="@+id/power_value_tv"
- 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" />
-
- <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>
-
- <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">
-
- <TextView
- android:id="@+id/day_value_tv"
- 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" />
-
-
- <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" />
- </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">
-
- <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/month_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">
-
- <TextView
- android:id="@+id/month_value_tv"
- 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" />
-
- <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>
-
-
- <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" />
-
- </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
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_35"
- android:layout_below="@+id/line"
- android:layout_marginStart="11dp">
+ android:layout_height="@dimen/dp_19"
+ android:layout_below="@+id/home_name_ll"
+ android:layout_alignStart="@+id/home_name_ll">
<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:id="@+id/home_location_tv"
+ android:layout_width="280dp"
+ android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
- </RelativeLayout>
+ </LinearLayout>
+
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/home_image_iv"
+ android:layout_alignStart="@+id/home_image_iv"
+ android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:orientation="horizontal">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <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:orientation="vertical">
+
+ <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>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <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:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20">
+
+ <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>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_32">
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_gravity="center"
+ android:background="@color/text_1AFFFFFF" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="37.5dp"
+ android:orientation="horizontal">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+
+ <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:orientation="vertical">
+
+ <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">
+
+ <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>
</RelativeLayout>
diff --git a/app/src/main/res/layout/item_search_device.xml b/app/src/main/res/layout/item_search_device.xml
index 458aeb4..2005c7d 100644
--- a/app/src/main/res/layout/item_search_device.xml
+++ b/app/src/main/res/layout/item_search_device.xml
@@ -45,7 +45,7 @@
android:ellipsize="end"
android:gravity="center_vertical|start"
android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -58,7 +58,7 @@
android:layout_marginTop="@dimen/dp_6"
android:layout_toEndOf="@+id/device_search_name_tv"
android:gravity="center_vertical"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
<TextView
@@ -69,7 +69,7 @@
android:layout_alignStart="@+id/device_search_state_tv"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center_vertical"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/item_search_house.xml b/app/src/main/res/layout/item_search_house.xml
index 2a1f6b2..fac81aa 100644
--- a/app/src/main/res/layout/item_search_house.xml
+++ b/app/src/main/res/layout/item_search_house.xml
@@ -30,7 +30,7 @@
android:layout_marginStart="@dimen/dp_16"
android:ellipsize="end"
android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -39,7 +39,7 @@
android:id="@+id/power_station_location_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_11"
app:layout_constraintStart_toStartOf="@+id/message_name_tv"
app:layout_constraintTop_toBottomOf="@+id/message_name_tv" />
diff --git a/app/src/main/res/layout/item_search_message.xml b/app/src/main/res/layout/item_search_message.xml
index 59e50ba..b156a5b 100644
--- a/app/src/main/res/layout/item_search_message.xml
+++ b/app/src/main/res/layout/item_search_message.xml
@@ -44,7 +44,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:singleLine="true"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/message_state_tv"
@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="@dimen/dp_6"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/message_state_tv"
app:layout_constraintTop_toBottomOf="@+id/message_name_tv" />
@@ -65,7 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
android:layout_marginTop="@dimen/dp_6"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_12"
app:layout_constraintStart_toStartOf="@+id/message_state_tv"
app:layout_constraintTop_toBottomOf="@+id/message_content_tv" />
diff --git a/app/src/main/res/layout/line_message_info.xml b/app/src/main/res/layout/line_message_info.xml
index d6b64e2..a7854ef 100644
--- a/app/src/main/res/layout/line_message_info.xml
+++ b/app/src/main/res/layout/line_message_info.xml
@@ -12,7 +12,7 @@
android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:gravity="center"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
<TextView
@@ -22,7 +22,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:gravity="end"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
diff --git a/app/src/main/res/layout/me_change_password_line.xml b/app/src/main/res/layout/me_change_password_line.xml
index 1a2fed3..99780e5 100644
--- a/app/src/main/res/layout/me_change_password_line.xml
+++ b/app/src/main/res/layout/me_change_password_line.xml
@@ -18,7 +18,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_21"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
/>
@@ -46,8 +46,8 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
- android:textColorHint="@color/text_66FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
diff --git a/app/src/main/res/layout/null_data_view.xml b/app/src/main/res/layout/null_data_view.xml
index f6f9ac7..24ea66a 100644
--- a/app/src/main/res/layout/null_data_view.xml
+++ b/app/src/main/res/layout/null_data_view.xml
@@ -19,7 +19,7 @@
android:layout_width="0dp"
android:layout_height="22.5dp"
android:gravity="center"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
index 73e0a28..8f9762c 100644
--- a/app/src/main/res/layout/set_line.xml
+++ b/app/src/main/res/layout/set_line.xml
@@ -21,7 +21,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_16"
android:text="--"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_15"
/>
@@ -58,7 +58,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_9"
android:layout_toStartOf="@+id/sll_ll_rl_right_icon_ll"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_15"
android:visibility="gone" />
<!--搴曢儴鐨勭嚎,榛樿闅愯棌-->
diff --git a/app/src/main/res/layout/swipe_right_layout.xml b/app/src/main/res/layout/swipe_right_layout.xml
index d5e349a..f3ea601 100644
--- a/app/src/main/res/layout/swipe_right_layout.xml
+++ b/app/src/main/res/layout/swipe_right_layout.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="66dp"
- android:layout_height="148dp"
+ android:layout_height="194.5dp"
android:orientation="vertical">
<LinearLayout
diff --git a/app/src/main/res/layout/toolbar_top_view_44.xml b/app/src/main/res/layout/toolbar_top_view_44.xml
index d018155..bd47b7a 100644
--- a/app/src/main/res/layout/toolbar_top_view_44.xml
+++ b/app/src/main/res/layout/toolbar_top_view_44.xml
@@ -34,7 +34,7 @@
android:gravity="center"
android:maxLines="1"
android:text=""
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<!--3.鏇村鎸夐挳 榛樿闅愯棌-->
diff --git a/app/src/main/res/layout/toolbar_top_view_52.xml b/app/src/main/res/layout/toolbar_top_view_52.xml
index 9e49e51..4f49473 100644
--- a/app/src/main/res/layout/toolbar_top_view_52.xml
+++ b/app/src/main/res/layout/toolbar_top_view_52.xml
@@ -35,7 +35,7 @@
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:maxLines="1"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<!--3.鏇村鎸夐挳 榛樿闅愯棌-->
diff --git a/app/src/main/res/layout/view_camera_album.xml b/app/src/main/res/layout/view_camera_album.xml
index ee6b9f0..3c53cfd 100644
--- a/app/src/main/res/layout/view_camera_album.xml
+++ b/app/src/main/res/layout/view_camera_album.xml
@@ -12,7 +12,7 @@
android:layout_height="@dimen/dp_54"
android:gravity="center"
android:text="@string/me_personal_data_photograph"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="14sp" />
<View
@@ -26,7 +26,7 @@
android:layout_height="@dimen/dp_54"
android:gravity="center"
android:text="@string/me_personal_data_select_album"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="14sp" />
<View
@@ -40,7 +40,7 @@
android:layout_height="@dimen/dp_54"
android:gravity="center"
android:text="@string/loading_cancel"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="14sp" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1155413..4230e27 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -54,9 +54,9 @@
<color name="text_FFECECEC">#FFECECEC</color>
<color name="text_FF161616">#FF161616</color>
<color name="text_FF333738">#FF333738</color>
- <color name="text_66FFFFFF">#FF5B5B5B</color>
+ <color name="text_FF5B5B5B">#FF5B5B5B</color>
<color name="text_1AFFFFFF">#1AFFFFFF</color>
- <color name="text_E6FFFFFF">#FFACACAC</color>
+ <color name="text_FFACACAC">#FFACACAC</color>
<color name="text_FF36FFBA">#FF36FFBA</color>
<color name="text_33FFFFFF">#33FFFFFF</color>
<color name="text_FF555859">#FF555859</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3c8c847..673f19f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,7 +19,7 @@
<!-- 鑷畾涔夊瓧浣撴牱寮� 椤甸潰涓�绾ф爣棰�-->
<style name="Text18Style">
<item name="android:textSize">@dimen/text_18</item>
- <item name="android:textColor">@color/text_E6FFFFFF</item>
+ <item name="android:textColor">@color/text_FFACACAC</item>
<!-- <item name="android:fontFamily"></item>-->
</style>
@@ -33,16 +33,16 @@
<!-- 鑷畾涔夊瓧浣撴牱寮� -->
<style name="Text14Style">
<item name="android:textSize">@dimen/text_14</item>
- <item name="android:textColor">@color/text_66FFFFFF</item>
+ <item name="android:textColor">@color/text_FF5B5B5B</item>
</style>
<style name="Text12Style">
<item name="android:textSize">@dimen/text_12</item>
- <item name="android:textColor">@color/text_66FFFFFF</item>
+ <item name="android:textColor">@color/text_FF5B5B5B</item>
</style>
<style name="Text13Style">
<item name="android:textSize">@dimen/text_13</item>
- <item name="android:textColor">@color/text_66FFFFFF</item>
+ <item name="android:textColor">@color/text_FF5B5B5B</item>
</style>
<!-- 鑷畾涔夊瓧浣撴牱寮� -->
<style name="Text16Style">
--
Gitblit v1.8.0