From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
index 8aa49e0..8eee042 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
@@ -49,7 +49,7 @@
view = inflater.inflate((int) getContentView(), container, false);
} else if (getContentView() instanceof View) {
view = (View) getContentView();
- FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+ ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
view.setLayoutParams(layoutParams);
} else {
view = null;
@@ -61,6 +61,7 @@
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
+ view.setClickable(true);
view.postDelayed(new Runnable() {
@Override
public void run() {
@@ -183,6 +184,7 @@
* 寮�濮婰oading
*/
protected void showLoading() {
+ getLoadingDialog().setText("");
getLoadingDialog().start();
}
--
Gitblit v1.8.0