From 57e16d05ef4924a480a5895cdb485556cc820e9b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 09:45:53 +0800
Subject: [PATCH] Merge branch 'wjc'
---
app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/example/photovoltaic/base/BaseFragment.java b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
similarity index 96%
rename from app/src/main/java/com/example/photovoltaic/base/BaseFragment.java
rename to app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
index ac6a787..4a88c53 100644
--- a/app/src/main/java/com/example/photovoltaic/base/BaseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/base/BaseFragment.java
@@ -1,14 +1,14 @@
-package com.example.photovoltaic.base;
+package com.hdl.photovoltaic.base;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.FrameLayout;
-import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -16,11 +16,9 @@
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Lifecycle;
-import com.example.photovoltaic.listener.BaseView;
+import com.hdl.photovoltaic.listener.BaseView;
import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
import java.util.Locale;
@@ -39,6 +37,7 @@
_mActivity = getActivity();
}
+
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
--
Gitblit v1.8.0