From 748e302167a333b08fb5813b6f48806210e53091 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 11:49:29 +0800
Subject: [PATCH] 2024年05月29日11:49:20
---
app/src/main/java/com/hdl/photovoltaic/widget/adapter/TypeListDialogAdapter.java | 9 +
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 10 +
app/src/main/res/layout/dialog_type_title_list.xml | 4
app/src/main/res/values/strings.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java | 12 ++
app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java | 6
app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java | 6
app/src/main/res/layout/dialog_type_title_list_b.xml | 4
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 15 ++
app/src/main/res/values/colors.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 6
app/src/main/res/layout/dialog_default_filtering.xml | 9 +
app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java | 14 ++
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 7
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 2
app/src/main/res/values-zh/strings.xml | 62 ++++++++++++
app/src/main/res/layout/fragment_home_page.xml | 12 +-
app/src/main/res/layout/spinner_dialog.xml | 26 +++++
app/src/main/res/values-en/strings.xml | 61 ++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 2
20 files changed, 241 insertions(+), 31 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index 6d5693f..43a2774 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
@@ -156,6 +156,7 @@
}
break;
+ case 5:
case 2: {
text = mContext.getString(R.string.my_power_station_off_line);
drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
@@ -167,7 +168,6 @@
}
break;
case 4:
- case 5:
{
text = mContext.getString(R.string.my_power_station_malfunction);
drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
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 5e19164..94e18bd 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
@@ -572,7 +572,7 @@
}
viewBinding.socialContributionData1Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getCoal())));
viewBinding.socialContributionData2Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getCo2())));
- viewBinding.socialContributionData3Tv.setText(HdlCommonLogic.convertString(HdlCommonLogic.getBigDecimal(socialContributionBean.getTreePlanting())));
+ viewBinding.socialContributionData3Tv.setText(HdlCommonLogic.convertString(socialContributionBean.getTreePlanting()));
}
@Override
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 be05d76..979a2b6 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
@@ -30,6 +30,7 @@
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.widget.BTypeTitleListDialog;
+import com.hdl.photovoltaic.widget.TypeTitleListDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -106,7 +107,7 @@
viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade));
viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
isAlarmDeviceClick = true;
- isRefreshTotalCount=true;
+ isRefreshTotalCount = true;
viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style);
viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style);
viewBinding.allClearTv.setVisibility(View.VISIBLE);
@@ -130,7 +131,7 @@
viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade));
viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
isAlarmDeviceClick = false;
- isRefreshTotalCount=true;
+ isRefreshTotalCount = true;
viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style);
viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style);
viewBinding.allClearTv.setVisibility(View.GONE);
@@ -261,7 +262,7 @@
* @param stringList 杩囨护绫诲瀷鍊艰〃
*/
private void setTypeTitleListDialog(TextView textView, String filterType, List<String> stringList) {
- BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList);
+ BTypeTitleListDialog typeTitleListDialog = new BTypeTitleListDialog(_mActivity, stringList, textView.getText().toString());
typeTitleListDialog.show();
typeTitleListDialog.setOnListener(new BTypeTitleListDialog.OnClickListener() {
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
index 854a21f..067e6f3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
@@ -170,6 +170,16 @@
@Override
public void onClick(int position, String title) {
viewBinding.messageSearchEt.setText(title);
+ //鎼滅储鍏抽敭瀛�
+ currSearchText = viewBinding.messageSearchEt.getText().toString().replace(" ", "");
+ if (TextUtils.isEmpty(currSearchText)) {
+ HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
+ return;
+ }
+ viewBinding.historyListParent.setVisibility(View.GONE);
+ viewBinding.listParent.setVisibility(View.VISIBLE);
+ addSearchTextToList();
+ loadNextPageMessageList(true, 1, viewBinding.messageSearchEt.getText().toString(), true);
}
});
//娑堟伅鐐瑰嚮鏄簨浠�
@@ -177,7 +187,7 @@
@Override
public void onClick(int position, MessageBean messageBean) {
Intent intent = new Intent();
- intent.putExtra("messageBean",new Gson().toJson(messageBean));
+ intent.putExtra("messageBean", new Gson().toJson(messageBean));
intent.setClass(_mActivity, MessageInfoActivity.class);
startActivity(intent);
}
@@ -389,7 +399,7 @@
Collections.reverse(searchHistoryTitleList);
if (searchHistoryTitleList.size() > maxValue) {
//鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
- searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue + 1));
+ searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue));
}
}
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 1cd481a..e5e7875 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
@@ -149,7 +149,7 @@
viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down);
viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down);
List<String> stringList = getTypeList(FilterType.deviceType);
- TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+ TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allDeviceTitleTv.getText().toString());
typeTitleListDialog.show();
typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
@Override
@@ -174,7 +174,7 @@
viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.up);
viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.down);
List<String> stringList = getTypeList(FilterType.type);
- TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+ TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allGradeTitleTv.getText().toString());
typeTitleListDialog.show();
typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
@Override
@@ -195,7 +195,7 @@
viewBinding.allGradeTitleIv.setBackgroundResource(R.drawable.down);
viewBinding.allTimeTitleIv.setBackgroundResource(R.drawable.up);
List<String> stringList = getTypeList(FilterType.timeType);
- TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+ TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList, viewBinding.allTimeTitleTv.getText().toString());
typeTitleListDialog.show();
typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
index 14fd13f..045b1b8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
@@ -179,6 +179,16 @@
@Override
public void onClick(int position, String title) {
viewBinding.powerStationSearchEt.setText(title);
+ //鎼滅储鍏抽敭瀛�
+ currSearchText = viewBinding.powerStationSearchEt.getText().toString().replace(" ", "");
+ if (TextUtils.isEmpty(currSearchText)) {
+ HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
+ return;
+ }
+ viewBinding.historyListParent.setVisibility(View.GONE);
+ viewBinding.listParent.setVisibility(View.VISIBLE);
+ addSearchTextToList();
+ loadNextPageHouseList(true, 1, true);
}
});
//璁惧鐐瑰嚮鏄簨浠�
@@ -402,9 +412,10 @@
searchHistoryTitleList.add(currSearchText);
// 鍊掑簭鎺掑垪鏁版嵁(鎼滅储鏈�鍚庢帓鍦ㄥ墠闈�)
Collections.reverse(searchHistoryTitleList);
- if (searchHistoryTitleList.size() > 10) {
+ int maxValue = 10;
+ if (searchHistoryTitleList.size() > maxValue) {
//鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
- searchHistoryTitleList.remove(searchHistoryTitleList.get(11));
+ searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue));
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
index 3a0a6c9..96835b0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseSearchActivity.java
@@ -173,6 +173,16 @@
@Override
public void onClick(int position, String title) {
viewBinding.powerStationSearchEt.setText(title);
+ //鎼滅储鍏抽敭瀛�
+ currSearchText = viewBinding.powerStationSearchEt.getText().toString().replace(" ", "");
+ if (TextUtils.isEmpty(currSearchText)) {
+ HdlThreadLogic.toast(_mActivity, R.string.search_content_null);
+ return;
+ }
+ viewBinding.historyListParent.setVisibility(View.GONE);
+ viewBinding.listParent.setVisibility(View.VISIBLE);
+ addSearchTextToList();
+ loadNextPageHouseList(true, 1, true);
}
});
//鐢电珯鐐瑰嚮鏄簨浠�
@@ -386,7 +396,7 @@
Collections.reverse(searchHistoryTitleList);
if (searchHistoryTitleList.size() > maxValue) {
//鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
- searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue + 1));
+ searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue));
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
index 52ebcfe..8668333 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/BTypeTitleListDialog.java
@@ -23,13 +23,15 @@
private TypeListDialogAdapter typeListDialogAdapter;
private Context mContext;
+ String mSelectType;
private List<String> mList;
- public BTypeTitleListDialog(@NonNull Context context, List<String> list) {
+ public BTypeTitleListDialog(@NonNull Context context, List<String> list,String selectType) {
super(context, R.style.Custom_Dialog);
this.mContext = context;
this.mList = list;
+ this.mSelectType=selectType;
}
@Override
@@ -39,7 +41,7 @@
setContentView(viewBinding.getRoot());
setDialogTouchOutsideCloseable(this);
LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
- typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext);
+ typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext,this.mSelectType);
viewBinding.typeListRl.setLayoutManager(linearLayout);
viewBinding.typeListRl.setAdapter(typeListDialogAdapter);
typeListDialogAdapter.setItemOnclickListener(new TypeListDialogAdapter.OnclickListener() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
index 75f3d09..a92d567 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.widget;
+import android.annotation.SuppressLint;
+import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
@@ -45,7 +47,7 @@
viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
//绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
- setCanceledOnTouchOutside(false);
+// setCanceledOnTouchOutside(true);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
@@ -57,6 +59,12 @@
}
private void initEvent() {
+ viewBinding.clickRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
viewBinding.affirmLl.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
index c0f7fed..8291962 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
@@ -34,13 +34,15 @@
private TypeListDialogAdapter typeListDialogAdapter;
private Context mContext;
+ String mSelectType;
private List<String> mList;
- public TypeTitleListDialog(@NonNull Context context, List<String> list) {
+ public TypeTitleListDialog(@NonNull Context context, List<String> list, String selectType) {
super(context, R.style.Custom_Dialog);
this.mContext = context;
this.mList = list;
+ this.mSelectType = selectType;
}
@Override
@@ -50,7 +52,7 @@
setContentView(viewBinding.getRoot());
setDialogTouchOutsideCloseable(this);
LinearLayoutManager linearLayout = new LinearLayoutManager(mContext);
- typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext);
+ typeListDialogAdapter = new TypeListDialogAdapter(this.mList, mContext, this.mSelectType);
viewBinding.typeListRl.setLayoutManager(linearLayout);
viewBinding.typeListRl.setAdapter(typeListDialogAdapter);
typeListDialogAdapter.setItemOnclickListener(new TypeListDialogAdapter.OnclickListener() {
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 17e2409..97d27b4 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
@@ -18,12 +18,15 @@
private List<String> mList;
private final Context mContext;
+
+ String mSelectType;
private TypeListDialogAdapter.OnclickListener itemOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
- public TypeListDialogAdapter(List<String> list, Context context) {
+ public TypeListDialogAdapter(List<String> list, Context context, String selectType) {
this.mList = list;
this.mContext = context;
+ this.mSelectType = selectType;
}
@NonNull
@@ -42,6 +45,10 @@
if (position == this.mList.size() - 1) {
holder.type_line_v.setVisibility(View.GONE);
}
+ holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_161718));
+ if (mSelectType.equals(title)) {
+ holder.type_title_tv.setTextColor(mContext.getColor(R.color.text_38C494));
+ }
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/res/layout/dialog_default_filtering.xml b/app/src/main/res/layout/dialog_default_filtering.xml
index 6af9e25..65b8d8a 100644
--- a/app/src/main/res/layout/dialog_default_filtering.xml
+++ b/app/src/main/res/layout/dialog_default_filtering.xml
@@ -4,6 +4,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <RelativeLayout
+ android:id="@+id/click_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_0"
+ app:layout_constraintBottom_toTopOf="@+id/default_filtering_cl"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/default_filtering_cl"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_type_title_list.xml b/app/src/main/res/layout/dialog_type_title_list.xml
index 67cb300..b47740d 100644
--- a/app/src/main/res/layout/dialog_type_title_list.xml
+++ b/app/src/main/res/layout/dialog_type_title_list.xml
@@ -10,9 +10,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/dialog_parent_cl"
android:layout_width="match_parent"
- android:layout_height="270dp"
+ android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="113dp"
+ android:layout_marginTop="103dp"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/loading_ffffffff_4"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_type_title_list_b.xml b/app/src/main/res/layout/dialog_type_title_list_b.xml
index 307ea4d..1f27f4d 100644
--- a/app/src/main/res/layout/dialog_type_title_list_b.xml
+++ b/app/src/main/res/layout/dialog_type_title_list_b.xml
@@ -10,9 +10,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/dialog_parent_cl"
android:layout_width="match_parent"
- android:layout_height="270dp"
+ android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="155dp"
+ android:layout_marginTop="165dp"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/loading_ffffffff_4"
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 21b2eac..cad2c06 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -516,7 +516,7 @@
android:layout_alignBottom="@+id/social_contribution_data_1_tv"
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_1_tv"
- android:text="(T)"
+ android:text="@string/t"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
@@ -573,7 +573,7 @@
android:layout_alignBottom="@+id/social_contribution_data_2_tv"
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_2_tv"
- android:text="(T)"
+ android:text="@string/t"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_12"
@@ -616,7 +616,7 @@
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_16"
- android:text="13.14"
+ android:text="13"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
@@ -628,11 +628,9 @@
android:layout_alignBottom="@+id/social_contribution_data_3_tv"
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_3_tv"
- android:text="(T)"
+ android:text="@string/number"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_12"
-
- />
+ android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/social_contribution_des_3_tv"
diff --git a/app/src/main/res/layout/spinner_dialog.xml b/app/src/main/res/layout/spinner_dialog.xml
new file mode 100644
index 0000000..3e01930
--- /dev/null
+++ b/app/src/main/res/layout/spinner_dialog.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/dialog_parent_cl"
+ android:layout_width="match_parent"
+ android:layout_height="270dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="155dp"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:background="@drawable/loading_ffffffff_4"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+<!-- <Spinner-->
+<!-- android:id="@+id/spinner"-->
+<!-- android:layout_width="100dp"-->
+<!-- android:layout_height="@dimen/dp_50"-->
+<!-- />-->
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 8432041..3eae335 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -247,4 +247,65 @@
<string name="restarting_please_wait">Restarting, please wait</string>
<string name="port_conflict">Application conflicts. You need to close onpro or other versions of debugging application and then restart the this to try</string>
+
+ <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string>
+ <string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string>
+ <string name="download_firmware_upgrade_file_failed">涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.</string>
+ <string name="found_locally_firmware_upgrade_file">鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+ <string name="notify_gateway_firmware_upgrade_failed">閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
+ <string name="local_service_fails">鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇.</string>
+ <string name="writing_drive_memory_succeeded">鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.</string>
+ <string name="download_drive_file_failed">涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触.</string>
+ <string name="found_locally_drive_file">鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+ <string name="notify_gateway_drive_failed">閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
+ <string name="time_selectd">鏃堕棿閫夋嫨</string>
+ <string name="life_cycle">鐢熷懡鏈�</string>
+ <string name="year">骞�</string>
+ <string name="month">鏈�</string>
+ <string name="day">鏃�</string>
+ <string name="hour">鏃�</string>
+ <string name="minutc">鍒�</string>
+ <string name="seconds">绉�</string>
+ <string name="the_query_date_is_exceeded">瓒呭嚭鏌ヨ鏃ユ湡.</string>
+ <string name="energy_generation_statistics">鍙戠數閲忕粺璁�</string>
+ <string name="social_contribution">绀句細璐＄尞</string>
+ <string name="day_power_generation">褰撴棩鍙戠數閲�</string>
+ <string name="month_power_generation">褰撴湀鍙戠數閲�</string>
+ <string name="year_power_generation">褰撳勾鍙戠數閲�</string>
+ <string name="cumulative_power_generation">绱鍙戠數閲�</string>
+ <string name="generated_power">鍙戠數鍔熺巼</string>
+ <string name="installed_capacity">瑁呮満瀹归噺</string>
+ <string name="generation">鍙戠數閲�</string>
+ <string name="station_name">鐢电珯鍚嶇О</string>
+ <string name="search">鎼滅储</string>
+ <string name="history_search">鍘嗗彶鎼滅储</string>
+ <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
+ <string name="no_equipment">鏆傛棤璁惧.</string>
+ <string name="filtering">绛涢��</string>
+ <string name="reset">閲嶇疆</string>
+ <string name="string_capacity">缁勪覆瀹归噺锛坘Wp)</string>
+ <string name="grid_connected_state">骞剁綉鐘舵��</string>
+ <string name="grid_connected">骞剁綉</string>
+ <string name="off_network">绂荤綉</string>
+ <string name="the_input_value_has_been_exceeded">杈撳叆鍊煎凡缁忚秴杩�</string>
+ <string name="all_read">鍏ㄩ儴宸茶</string>
+ <string name="contact_us">鑱旂郴鎴戜滑</string>
+ <string name="wechat_id">寰俊鍙�</string>
+ <string name="email_address">閭鍦板潃</string>
+ <string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
+ <string name="to_be_added">寰呮帴鍏�</string>
+ <string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</string>
+ <string name="co_reduction_rate">CO2鍑忔帓</string>
+ <string name="quantity_of_equivalent_values">绛夋晥妞嶆爲閲�</string>
+ <string name="pv_power">鍙戠數鍔熺巼</string>
+ <string name="device_run_state">璁惧杩愯鐘舵��</string>
+ <string name="search_station">鎼滅储鐢电珯</string>
+ <string name="enter_the_device_sn_and_device_name">杈撳叆璁惧SN鍙�/璁惧鍚嶇О</string>
+ <string name="enter_alarm_name">杈撳叆鎶ヨ鍚嶇О</string>
+ <string name="device">璁惧</string>
+ <string name="Offline_fault">绂荤嚎鏈夋晠闅�</string>
+ <string name="active_power">鏈夊姛鍔熺巼</string>
+ <string name="t">t</string>
+ <string name="number"></string>
+
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 9c00139..d18aa6b 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -248,4 +248,66 @@
<string name="port_conflict">搴旂敤鍐茬獊锛岄渶瑕佸叧闂璷npro鎴栬�呭叾瀹冪増鏈殑璋冭瘯杞欢鐒跺悗鍐嶉噸鏂板惎鍔ㄨ繖涓蒋浠惰瘯璇�</string>
+
+ <string name="cancel_download_successfully">鍙栨秷涓嬭浇鎴愬姛.</string>
+ <string name="writing_firmware_upgrade_memory_succeeded">鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.</string>
+ <string name="download_firmware_upgrade_file_failed">涓嬭浇鍥轰欢鍗囩骇鏂囦欢澶辫触.</string>
+ <string name="found_locally_firmware_upgrade_file">鏈湴鎵句笉鍒板崌绾у浐浠舵枃浠�,璇蜂笅杞藉ソ鍥轰欢鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+ <string name="notify_gateway_firmware_upgrade_failed">閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
+ <string name="local_service_fails">鏈湴鏈嶅姟鏈夊紓甯稿け璐�,鏃犳硶鍗囩骇.</string>
+ <string name="writing_drive_memory_succeeded">鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.</string>
+ <string name="download_drive_file_failed">涓嬭浇椹卞姩鍗囩骇鏂囦欢澶辫触.</string>
+ <string name="found_locally_drive_file">鏈湴鎵句笉鍒板崌绾ч┍鍔ㄦ枃浠�,璇蜂笅杞藉ソ椹卞姩鏂囦欢,鍐嶉噸鏂板崌绾�.</string>
+ <string name="notify_gateway_drive_failed">閫氱煡缁欑綉鍏冲崌绾ч┍鍔ㄦ枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.</string>
+ <string name="time_selectd">鏃堕棿閫夋嫨</string>
+ <string name="life_cycle">鐢熷懡鏈�</string>
+ <string name="year">骞�</string>
+ <string name="month">鏈�</string>
+ <string name="day">鏃�</string>
+ <string name="hour">鏃�</string>
+ <string name="minutc">鍒�</string>
+ <string name="seconds">绉�</string>
+ <string name="the_query_date_is_exceeded">瓒呭嚭鏌ヨ鏃ユ湡.</string>
+ <string name="energy_generation_statistics">鍙戠數閲忕粺璁�</string>
+ <string name="social_contribution">绀句細璐＄尞</string>
+ <string name="day_power_generation">褰撴棩鍙戠數閲�</string>
+ <string name="month_power_generation">褰撴湀鍙戠數閲�</string>
+ <string name="year_power_generation">褰撳勾鍙戠數閲�</string>
+ <string name="cumulative_power_generation">绱鍙戠數閲�</string>
+ <string name="generated_power">鍙戠數鍔熺巼</string>
+ <string name="installed_capacity">瑁呮満瀹归噺</string>
+ <string name="generation">鍙戠數閲�</string>
+ <string name="station_name">鐢电珯鍚嶇О</string>
+ <string name="search">鎼滅储</string>
+ <string name="history_search">鍘嗗彶鎼滅储</string>
+ <string name="search_content_null">鎼滅储鍐呭涓嶈兘涓虹┖.</string>
+ <string name="no_equipment">鏆傛棤璁惧.</string>
+ <string name="filtering">绛涢��</string>
+ <string name="reset">閲嶇疆</string>
+ <string name="string_capacity">缁勪覆瀹归噺锛坘Wp)</string>
+ <string name="grid_connected_state">骞剁綉鐘舵��</string>
+ <string name="grid_connected">骞剁綉</string>
+ <string name="off_network">绂荤綉</string>
+ <string name="the_input_value_has_been_exceeded">杈撳叆鍊煎凡缁忚秴杩�</string>
+ <string name="all_read">鍏ㄩ儴宸茶</string>
+ <string name="contact_us">鑱旂郴鎴戜滑</string>
+ <string name="wechat_id">寰俊鍙�</string>
+ <string name="email_address">閭鍦板潃</string>
+ <string name="successful_replication">宸插鍒跺埌鍓垏鏉�</string>
+ <string name="to_be_added">寰呮帴鍏�</string>
+ <string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</string>
+ <string name="co_reduction_rate">CO2鍑忔帓</string>
+ <string name="quantity_of_equivalent_values">绛夋晥妞嶆爲閲�</string>
+ <string name="pv_power">鍙戠數鍔熺巼</string>
+ <string name="device_run_state">璁惧杩愯鐘舵��</string>
+ <string name="search_station">鎼滅储鐢电珯</string>
+ <string name="enter_the_device_sn_and_device_name">杈撳叆璁惧SN鍙�/璁惧鍚嶇О</string>
+ <string name="enter_alarm_name">杈撳叆鎶ヨ鍚嶇О</string>
+ <string name="device">璁惧</string>
+ <string name="Offline_fault">绂荤嚎鏈夋晠闅�</string>
+ <string name="active_power">鏈夊姛鍔熺巼</string>
+ <string name="t">鍚�</string>
+ <string name="number">妫�</string>
+
+
</resources>
\ 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 c6e82d4..b62d4c3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -50,6 +50,7 @@
<color name="text_C2EDDE">#C2EDDE</color>
<color name="text_C1C1C1">#C1C1C1</color>
<color name="text_1238C494">#1238C494</color>
+ <color name="text_161718">#FF161718</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18f0454..7424c44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -295,7 +295,7 @@
<string name="to_be_added">寰呮帴鍏�</string>
<string name="saving_standard_coal">鑺傜害鏍囧噯鐓�</string>
<string name="co_reduction_rate">CO2鍑忔帓</string>
- <string name="quantity_of_equivalent_values">绛夋晥鍊兼暟閲�</string>
+ <string name="quantity_of_equivalent_values">绛夋晥妞嶆爲閲�</string>
<string name="pv_power">鍙戠數鍔熺巼</string>
<string name="device_run_state">璁惧杩愯鐘舵��</string>
<string name="search_station">鎼滅储鐢电珯</string>
@@ -304,5 +304,7 @@
<string name="device">璁惧</string>
<string name="Offline_fault">绂荤嚎鏈夋晠闅�</string>
<string name="active_power">鏈夊姛鍔熺巼</string>
+ <string name="t">鍚�</string>
+ <string name="number">妫�</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0