From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 95 +++++++++++++++++++++++++++++++++--------------
1 files changed, 67 insertions(+), 28 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 6102fc9..8090819 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -19,6 +19,7 @@
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;
@@ -43,21 +44,21 @@
private String mStateValue = GridType.All;
public DefaultFilteringDialog(@NonNull Context context) {
- super(context, R.style.DefaultFilteringDialog);
+ super(context, R.style.Custom_Dialog);
this.mContext = context;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
+ setContentView(viewBinding.getRoot());
Window window = getWindow();
if (window != null) {
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
window.setGravity(Gravity.BOTTOM);
}
- viewBinding = DialogDefaultFilteringBinding.inflate(getLayoutInflater());
- setContentView(viewBinding.getRoot());
-
+// setCanceledOnTouchOutside(false);
//鍒濆鍖栫晫闈㈡帶浠�
initView();
//鍒濆鍖栫晫闈㈡暟鎹�
@@ -116,8 +117,8 @@
public void onClick(View v) {
setBackgroundColor(null, TitleType.string_capacity);
setSelectedText("");
- setBackgroundColor(viewBinding.allTv, TitleType.GridConnectedState);
- mStateValue = GridType.All;
+ setBackgroundColor(viewBinding.allTv, TitleType.debuggingState);
+ mStateValue = DebugStatus.All;
}
});
viewBinding.text1Tv.setOnClickListener(new View.OnClickListener() {
@@ -177,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);
- mStateValue = GridType.All;
+ 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);
- mStateValue = GridType.FULL_GRID;
+ 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);
- mStateValue = GridType.OFFLINE;
+ 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;
}
});
@@ -248,8 +269,10 @@
viewBinding.text8Tv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
} else {
viewBinding.allTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
- viewBinding.gridConnectedTv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.config_129));
- viewBinding.offNetworkTv.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.config_yes_129));
@@ -292,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) {
}
@@ -317,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) {
@@ -337,7 +376,7 @@
public enum TitleType {
string_capacity,//缁勪覆瀹归噺
- GridConnectedState//骞剁綉鐘舵��
+ debuggingState//璋冭瘯鐘舵��
}
--
Gitblit v1.8.0