From 438e4880f3f43021b222b201378377c1ec34c634 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 11 五月 2024 14:59:10 +0800
Subject: [PATCH] 2024年05月11日14:59:03
---
app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java | 4 ++
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 64 ++++++++++++-------------------
app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java | 35 +++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 2 +
4 files changed, 66 insertions(+), 39 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 77eda60..03200e1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -303,6 +303,7 @@
//鎵撳紑鎵嬫満Wifi璁剧疆鐣岄潰
case HDLUniMP.UNI_EVENT_REPLY_OPEN_WIFI_SETTINGS: {
Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
HDLApp.getInstance().startActivity(intent);
}
break;
@@ -428,6 +429,7 @@
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(HDLApp.getInstance(), SetActivity.class);
HDLApp.getInstance().startActivity(intent);
+
}
break;
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 a9457f6..466190d 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
@@ -151,21 +151,7 @@
viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.up);
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.show();
- typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
- @Override
- public void onClick(int position, String title) {
-
- viewBinding.allDeviceTitleTv.setText(title);
- mDeviceTypeFilterKye = FilterType.deviceType;
- mDeviceTypeFilterValue = findFilterValueString(title);
- loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
-
- }
- });
-
+ setTypeTitleListDialog(viewBinding.allDeviceTitleTv, FilterType.deviceType, getTypeList(FilterType.deviceType));
}
});
@@ -176,18 +162,8 @@
viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.down);
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.show();
- typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
- @Override
- public void onClick(int position, String title) {
- viewBinding.allGradeTitleTv.setText(title);
- mTypeFilterKye = FilterType.type;
- mTypeFilterValue = findFilterValueString(title);
- loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
- }
- });
+ setTypeTitleListDialog(viewBinding.allGradeTitleTv, FilterType.type, getTypeList(FilterType.type));
+
}
});
//鍏ㄩ儴鏃堕棿(褰撳ぉ銆佽繎3澶┿�佽繎7澶┿�佽繎30澶�)鎸夐挳
@@ -197,18 +173,7 @@
viewBinding.allDeviceTitleIv.setBackgroundResource(R.drawable.down);
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.show();
- typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
- @Override
- public void onClick(int position, String title) {
- viewBinding.allTimeTitleTv.setText(title);
- mTimeTypeFilterKye = FilterType.timeType;
- mTimeTypeFilterValue = findFilterValueString(title);
- loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
- }
- });
+ setTypeTitleListDialog(viewBinding.allTimeTitleTv, FilterType.timeType, getTypeList(FilterType.timeType));
}
});
@@ -257,6 +222,27 @@
}
}
+ /**
+ * 绫诲瀷绛涢��
+ *
+ * @param textView 缁勪欢鏄剧ず
+ * @param filterType 杩囨护绫诲瀷
+ * @param stringList 杩囨护绫诲瀷鍊艰〃
+ */
+ private void setTypeTitleListDialog(TextView textView, String filterType, List<String> stringList) {
+ TypeTitleListDialog typeTitleListDialog = new TypeTitleListDialog(_mActivity, stringList);
+ typeTitleListDialog.show();
+ typeTitleListDialog.setOnListener(new TypeTitleListDialog.OnClickListener() {
+ @Override
+ public void onClick(int position, String title) {
+ textView.setText(title);
+ mTimeTypeFilterKye = filterType;
+ mTimeTypeFilterValue = findFilterValueString(title);
+ loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
+ }
+ });
+ }
+
private void initView() {
if (isAlarmDeviceClick) {
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..82614bd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/DefaultFilteringDialog.java
@@ -4,6 +4,8 @@
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;
@@ -52,6 +54,8 @@
// initData(mMinValue, mMaxValue, mStateValue);
//鍒濆鍖栫晫闈㈡帶浠剁殑浜嬩欢
initEvent();
+
+
}
private void initEvent() {
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 60bace3..3b17eeb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/TypeTitleListDialog.java
@@ -3,8 +3,16 @@
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.Context;
+import android.graphics.Color;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.view.Gravity;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -15,6 +23,8 @@
import com.hdl.photovoltaic.widget.adapter.TypeListDialogAdapter;
import java.util.List;
+
+import io.dcloud.common.util.DensityUtils;
public class TypeTitleListDialog extends BaseDialog {
@@ -52,6 +62,31 @@
}
}
});
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ // 鑾峰彇绐楀彛瀵硅薄
+ Window dialogWindow = this.getWindow();
+ if (dialogWindow != null) {
+ // 鑾峰彇瀵硅瘽妗嗗綋鍓嶇殑鍙傛暟鍊�
+ WindowManager.LayoutParams p = dialogWindow.getAttributes();
+ p.width = LinearLayout.LayoutParams.MATCH_PARENT;
+ p.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+ p.dimAmount = 0.6f;
+ dialogWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+ p.gravity = Gravity.BOTTOM;
+ p.y = DensityUtils.dip2px(mContext, 70);
+// //杩欓噷璁剧疆鐨勫楂樹紭鍏堢骇楂樹簬XML涓殑甯冨眬璁剧疆
+// if (this.enumBoxType == BoxType.PhotoAlbumBox) {
+// p.gravity = Gravity.BOTTOM;
+// } else if (this.enumBoxType == BoxType.FlashingBox) {
+// p.dimAmount = 0f;
+// }
+ // 璁剧疆鍒板睘鎬ч厤缃腑
+ dialogWindow.setAttributes(p);
+ }
}
--
Gitblit v1.8.0