diff --git a/.gitignore b/.gitignore index bf50d10..ab6f2ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ *.iml .gradle -/.idea +.idea/ /local.properties /.idea/caches /.idea/libraries diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 1b134ca..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 20b78c9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java index d6625b7..9581612 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/BaseFragment.java @@ -24,7 +24,6 @@ import com.hjq.toast.ToastUtils; import com.jcodecraeer.xrecyclerview.progressindicator.AVLoadingIndicatorView; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import com.tenlionsoft.baselib.R; -import com.tenlionsoft.baselib.utils.LogUtils; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; @@ -55,6 +54,7 @@ public abstract class BaseFragment extends Fragment { protected TextView mTvFragmentOption; protected TextView mTvFragmentTitle; private ActivityResultLauncher mLauncher; + private String tag; @Override public void onCreate(Bundle savedInstanceState) { @@ -88,6 +88,7 @@ public abstract class BaseFragment extends Fragment { setDataToView(mDataView); return contentView; } + /** * 将view的点击区域放大 * @@ -107,6 +108,7 @@ public abstract class BaseFragment extends Fragment { parentView.setTouchDelegate(touchDelegate); }); } + /** * 设置是否显示titlebar */ @@ -238,6 +240,7 @@ public abstract class BaseFragment extends Fragment { break; } } + public void showSoftKeyboard(EditText editText) { if (editText != null) { editText.setFocusable(true); @@ -250,6 +253,7 @@ public abstract class BaseFragment extends Fragment { inputManager.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_NOT_ALWAYS); } } + public Context getApplicationContext() { return context; } @@ -270,6 +274,14 @@ public abstract class BaseFragment extends Fragment { setContentView((ViewGroup) inflater.inflate(layoutResID, container, false)); } + public String getCustomTag() { + return tag; + } + + public void setCustomTag(String tag) { + this.tag = tag; + } + public void setContentView(View view) { contentView = view; } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/FragmentUtils.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/FragmentUtils.java index 8284278..4378392 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/FragmentUtils.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/widget/base/FragmentUtils.java @@ -40,6 +40,7 @@ public class FragmentUtils { public static BaseFragment getFragment(String path, String tag) { BaseFragment fragment = (BaseFragment) ARouter.getInstance().build(path).setTag(tag).navigation(); + fragment.setCustomTag(tag); return fragment; } diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java index f8c80c1..98a771c 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/record/UserRecordDetailActivity.java @@ -206,8 +206,8 @@ public class UserRecordDetailActivity extends BaseActivity { private void chooseFragment(String type) { for (int i = 0; i < mFragments.size(); i++) { BaseFragment fragment = mFragments.get(i); - LogUtils.e(fragment.getTag()); - if (type.equals(fragment.getTag())) { + LogUtils.e(fragment.getCustomTag()); + if (type.equals(fragment.getCustomTag())) { mVpContent.setCurrentItem(i, false); break; }