Merge branch 'feature/v1.4.0' into feature/v1.4.1

mac

2024-06-05 c1755223fd042d0411ab29708c5a848085c4cee9

 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 @@
     * 开始Loading
     */
    protected void showLoading() {
        getLoadingDialog().setText("");
        getLoadingDialog().start();
    }