From 73919e36e6c84a665a2c4352fa3b22d1b2e9e6bb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 18 六月 2024 13:08:19 +0800
Subject: [PATCH] 2024年06月18日13:08:14
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
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 82614bd..c03eb47 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -1,11 +1,11 @@
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;
import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -15,6 +15,9 @@
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding;
import com.hdl.photovoltaic.enums.GridType;
+import com.hdl.photovoltaic.enums.UnitType;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
public class DefaultFilteringDialog extends BaseDialog {
@@ -47,7 +50,7 @@
viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
//绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
- setCanceledOnTouchOutside(false);
+// setCanceledOnTouchOutside(true);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
@@ -59,6 +62,12 @@
}
private void initEvent() {
+ viewBinding.clickRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
viewBinding.affirmLl.setOnClickListener(new View.OnClickListener() {
@Override
@@ -171,7 +180,7 @@
@Override
public void onClick(View v) {
setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.allTv.getTag().toString());
+ mStateValue = GridType.All;
}
});
viewBinding.gridConnectedTv.setOnClickListener(new View.OnClickListener() {
@@ -179,7 +188,7 @@
@Override
public void onClick(View v) {
setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.gridConnectedTv.getTag().toString());
+ mStateValue = GridType.FULL_GRID;
}
});
viewBinding.offNetworkTv.setOnClickListener(new View.OnClickListener() {
@@ -187,7 +196,7 @@
@Override
public void onClick(View v) {
setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.offNetworkTv.getTag().toString());
+ mStateValue = GridType.OFFLINE;
}
});
@@ -211,8 +220,6 @@
minValue = min_max[0];
maxValue = min_max[1];
}
- } else {
- mStateValue = value;
}
viewBinding.minEt.setText(minValue);
@@ -229,28 +236,28 @@
private void setBackgroundColor(TextView textView, TitleType titleType) {
if (titleType == TitleType.string_capacity) {
viewBinding.text1Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text1Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text1Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text2Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text2Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text3Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text3Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text4Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text4Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text5Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text5Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text6Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text6Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text7Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text7Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text8Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text8Tv.setTextColor(mContext.getColor(R.color.text_E6000000));
} else {
viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.allTv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.allTv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.gridConnectedTv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.gridConnectedTv.setTextColor(mContext.getColor(R.color.text_E6000000));
viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.offNetworkTv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.offNetworkTv.setTextColor(mContext.getColor(R.color.text_E6000000));
}
if (textView != null) {
textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.selected_38c494));
@@ -308,6 +315,8 @@
private void initView() {
+ String s = mContext.getString(R.string.string_capacity) + "(" + UnitType.kWp + ")";
+ viewBinding.capacityTv.setText(s);
viewBinding.text1Tv.setTag(text1);
viewBinding.text2Tv.setTag(text2);
viewBinding.text3Tv.setTag(text3);
--
Gitblit v1.8.0