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/base/BaseFragment.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 82120dc..8eee042 100644
--- a/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
@@ -15,10 +15,10 @@
 import androidx.lifecycle.Lifecycle;
 
 import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.bean.BaseEventBus;
 import com.hdl.photovoltaic.listener.BaseView;
 import com.hdl.photovoltaic.other.HdlThreadLogic;
 import com.hdl.photovoltaic.widget.LoadingDialog;
+import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
 
 
 import org.greenrobot.eventbus.EventBus;
@@ -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() {
@@ -122,6 +123,11 @@
         }
     }
 
+    /**
+     * 鏀跺埌EventBUs閫氱煡
+     *
+     * @param eventBus 鏁版嵁
+     */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMessage(BaseEventBus eventBus) {
 
@@ -178,6 +184,7 @@
      * 寮�濮婰oading
      */
     protected void showLoading() {
+        getLoadingDialog().setText("");
         getLoadingDialog().start();
     }
 

--
Gitblit v1.8.0