diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index 60ab9ac..3d85085 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -230,4 +230,9 @@ public class PathConfig { public static final String PATH_MODULE_PAD_OA_FRAGMENT_NOTICE_LIST = "/oamodule/fragment/noticeList";//通知公告 public static final String PATH_MODULE_PAD_OA_FRAGMENT_NOTICE_DETAIL = "/oamodule/fragment/noticeDetail";//通知公告详情 + public static final String PATH_MODULE_PAD_OA_FRAGMENT_ROUTINE_WORK = "/oamodule/fragment/routineWork";//日常工作 + public static final String PATH_MODULE_PAD_OA_FRAGMENT_ROUTINE_WORK_ADD = "/oamodule/fragment/routineWorkAdd";//发起日常工作 + public static final String PATH_MODULE_PAD_OA_FRAGMENT_ROUTINE_WORK_DETAIL = "/oamodule/fragment/routineWorkDetail";//日常工作详情 + public static final String PATH_MODULE_PAD_OA_FRAGMENT_ROUTINE_WORK_TRANSACT = "/oamodule/fragment/routineWorkTransact";//完成日常工作 + } 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 e2f1e09..bb2841e 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 @@ -20,6 +20,7 @@ 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; @@ -103,9 +104,10 @@ public abstract class BaseFragment extends Fragment { protected abstract void loadMoreData(); -protected void checkHasManage(){ + protected void checkHasManage() { + + } -} @Override public void onDestroyView() { super.onDestroyView(); @@ -157,10 +159,6 @@ protected void checkHasManage(){ } - @Override - public void setUserVisibleHint(boolean isVisibleToUser) { - super.setUserVisibleHint(isVisibleToUser); - } /** * 选择加载状态 @@ -223,6 +221,10 @@ protected void checkHasManage(){ return context; } + @Override + public void setUserVisibleHint(boolean isVisibleToUser) { + super.setUserVisibleHint(isVisibleToUser); + } /** * 刷新视图 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 d34e358..7f71171 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 @@ -1,8 +1,12 @@ package com.tenlionsoft.baselib.core.widget.base; +import com.alibaba.android.arouter.facade.Postcard; import com.alibaba.android.arouter.launcher.ARouter; import com.tenlionsoft.baselib.constant.PathConfig; +import java.io.Serializable; +import java.util.Map; + /** * 生成fragment的工具类 */ @@ -47,4 +51,22 @@ public class FragmentUtils { .navigation(); return fragment; } + + public static BaseFragment getFragmentMap(String path, Map params) { + Postcard build = ARouter.getInstance() + .build(path); + for (Map.Entry entry : params.entrySet()) { + Object value = entry.getValue(); + if (value instanceof String) { + build.withString(entry.getKey(), (String) value); + } else if (value instanceof Integer) { + build.withInt(entry.getKey(), (Integer) value); + } else if (value instanceof Boolean) { + build.withBoolean(entry.getKey(), (Boolean) value); + } else if (value instanceof Serializable) { + build.withSerializable(entry.getKey(), (Serializable) value); + } + } + return (BaseFragment) build.navigation(); + } } diff --git a/baselib/src/main/res/values/styles.xml b/baselib/src/main/res/values/styles.xml index 9b793ae..f07fe36 100755 --- a/baselib/src/main/res/values/styles.xml +++ b/baselib/src/main/res/values/styles.xml @@ -605,7 +605,7 @@ false -