From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 141 ++++++++++++++++++++++++++++++----------------
1 files changed, 92 insertions(+), 49 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 5fd99bc..8090819 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -1,18 +1,27 @@
package com.hdl.photovoltaic.widget;
+import android.app.Activity;
import android.content.Context;
+import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
+import android.view.Gravity;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.content.ContextCompat;
+import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.BaseDialog;
import com.hdl.photovoltaic.databinding.DialogDefaultFilteringBinding;
+import com.hdl.photovoltaic.enums.DebugStatus;
import com.hdl.photovoltaic.enums.GridType;
+import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.other.HdlThreadLogic;
public class DefaultFilteringDialog extends BaseDialog {
@@ -44,14 +53,20 @@
super.onCreate(savedInstanceState);
viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
setContentView(viewBinding.getRoot());
- //绌虹櫧澶勪笉鑳藉彇娑堝姩鐢�
- setCanceledOnTouchOutside(false);
+ Window window = getWindow();
+ if (window != null) {
+ window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ window.setGravity(Gravity.BOTTOM);
+ }
+// setCanceledOnTouchOutside(false);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
// initData(mMinValue, mMaxValue, mStateValue);
//鍒濆鍖栫晫闈㈡帶浠剁殑浜嬩欢
initEvent();
+
+
}
private void initEvent() {
@@ -97,11 +112,13 @@
}
});
- viewBinding.resetTv.setOnClickListener(new View.OnClickListener() {
+ viewBinding.resetRl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setBackgroundColor(null, TitleType.string_capacity);
setSelectedText("");
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
+ mStateValue = DebugStatus.All;
}
});
viewBinding.text1Tv.setOnClickListener(new View.OnClickListener() {
@@ -161,29 +178,49 @@
setSelectedText(viewBinding.text8Tv.getTag().toString());
}
});
-
+ //鍏ㄩ儴
viewBinding.allTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.allTv.getTag().toString());
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
+ mStateValue = DebugStatus.All;
}
});
- viewBinding.gridConnectedTv.setOnClickListener(new View.OnClickListener() {
+ //璋冭瘯涓�
+ viewBinding.beDebuggingTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.gridConnectedTv.getTag().toString());
+ setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
+ mStateValue = DebugStatus.Debugging;
}
});
- viewBinding.offNetworkTv.setOnClickListener(new View.OnClickListener() {
+ //璋冭瘯瀹屾垚
+ viewBinding.debuggingcOmpletedTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
- setSelectedText(viewBinding.offNetworkTv.getTag().toString());
+ setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
+ mStateValue = DebugStatus.WAIT_DELIVERED;
+ }
+ });
+ //宸蹭氦浠�
+ viewBinding.deliveredTv.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
+ mStateValue = DebugStatus.Delivered;
+ }
+ });
+ //鎺堟潈璋冭瘯
+ viewBinding.authorizationDebuggingTv.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
+ mStateValue = DebugStatus.SECONDARY_DEBUGGIN;
}
});
@@ -207,8 +244,6 @@
minValue = min_max[0];
maxValue = min_max[1];
}
- } else {
- mStateValue = value;
}
viewBinding.minEt.setText(minValue);
@@ -224,33 +259,23 @@
*/
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.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text2Tv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text3Tv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text4Tv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text5Tv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text6Tv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text7Tv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.text8Tv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.text1Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.text2Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.text3Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.text4Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.text5Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.text6Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.text7Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
} else {
- viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.allTv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.gridConnectedTv.setTextColor(mContext.getColor(R.color.text_90000000));
- viewBinding.offNetworkTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.search_bj_ff05000000));
- viewBinding.offNetworkTv.setTextColor(mContext.getColor(R.color.text_90000000));
+ viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.beDebuggingTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.debuggingcOmpletedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.deliveredTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
+ viewBinding.authorizationDebuggingTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
}
if (textView != null) {
- textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.selected_38c494));
- textView.setTextColor(mContext.getColor(R.color.text_FFFFFFFF));
+ textView.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_yes_129));
}
}
@@ -290,12 +315,26 @@
break;
}
}
- if (TextUtils.isEmpty(stateValue)) {
- setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
- } else if (stateValue.equals(GridType.FULL_GRID)) {
- setBackgroundColor(viewBinding.gridConnectedTv, TitleType.GridConnectedState);
- } else {
- setBackgroundColor(viewBinding.offNetworkTv, TitleType.GridConnectedState);
+ switch (stateValue) {
+ case DebugStatus.All:
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.Debugging:
+ setBackgroundColor(viewBinding.beDebuggingTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.WAIT_DELIVERED:
+ setBackgroundColor(viewBinding.debuggingcOmpletedTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.Delivered:
+ setBackgroundColor(viewBinding.deliveredTv, TitleType.debuggingState);
+ break;
+ case DebugStatus.SECONDARY_DEBUGGIN:
+ setBackgroundColor(viewBinding.authorizationDebuggingTv, TitleType.debuggingState);
+ break;
+ default: {
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
+ break;
+ }
}
} catch (Exception ignored) {
}
@@ -304,6 +343,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);
@@ -313,11 +354,13 @@
viewBinding.text7Tv.setTag(text7);
viewBinding.text8Tv.setTag(text8);
- viewBinding.allTv.setTag(GridType.All);
- viewBinding.gridConnectedTv.setTag(GridType.FULL_GRID);
- viewBinding.offNetworkTv.setTag(GridType.OFFLINE);
+ viewBinding.allTv.setTag(DebugStatus.All);
+ viewBinding.beDebuggingTv.setTag(DebugStatus.Debugging);
+ viewBinding.debuggingcOmpletedTv.setTag(DebugStatus.WAIT_DELIVERED);
+ viewBinding.deliveredTv.setTag(DebugStatus.Delivered);
+ viewBinding.authorizationDebuggingTv.setTag(DebugStatus.SECONDARY_DEBUGGIN);
setBackgroundColor(null, TitleType.string_capacity);
- setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
}
public void setOnClickListener(OnClickListener onClickListener) {
@@ -333,7 +376,7 @@
public enum TitleType {
string_capacity,//缁勪覆瀹归噺
- GridConnectedState//骞剁綉鐘舵��
+ debuggingState//璋冭瘯鐘舵��
}
--
Gitblit v1.8.0