From a032069debc3972f628f2390c98826e50aa2f1c4 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 10 May 2022 14:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E6=97=A5=E5=B8=B8=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baselib/constant/PathConfig.java | 5 + .../core/widget/base/BaseFragment.java | 14 +- .../core/widget/base/FragmentUtils.java | 22 + baselib/src/main/res/values/styles.xml | 2 +- oamodule/src/main/AndroidManifest.xml | 2 +- .../activity/car/ByCarAddActivity.java | 14 +- .../activity/car/ByCarEditActivity.java | 14 +- .../meeting/MeetingApplyActivity.java | 14 +- .../activity/notify/NoticeListActivity.java | 19 +- .../routine/ApplyRoutineWorkActivity.java | 18 +- .../activity/routine/RoutineWorkActivity.java | 20 +- .../schedule/ScheduleAddActivity.java | 16 +- .../schedule/ScheduleEditActivity.java | 16 +- .../activity/supervise/SuperviseActivity.java | 20 +- .../pad/activitys/home/PadMainActivity.java | 47 +- .../home/meeting/MeetingAddFragment.java | 16 +- .../home/notice/NoticeListFragment.java | 17 +- .../routinework/RoutineWorkAddFragment.java | 463 +++++++++++++++++ .../RoutineWorkDetailFragment.java | 283 +++++++++++ .../home/routinework/RoutineWorkFragment.java | 419 +++++++++++++++ .../RoutineWorkTransactFragment.java | 421 +++++++++++++++ .../home/schedule/ScheduleAddFragment.java | 15 +- .../home/schedule/ScheduleEditFragment.java | 17 +- .../home/supervise/SuperviseFragment.java | 19 +- .../main/res/layout/fragment_routine_work.xml | 205 ++++++++ .../res/layout/fragment_routine_work_add.xml | 358 +++++++++++++ .../layout/fragment_routine_work_detail.xml | 481 ++++++++++++++++++ .../layout/fragment_routine_work_transact.xml | 436 ++++++++++++++++ 28 files changed, 3279 insertions(+), 114 deletions(-) create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/routinework/RoutineWorkAddFragment.java create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/routinework/RoutineWorkDetailFragment.java create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/routinework/RoutineWorkFragment.java create mode 100644 oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/routinework/RoutineWorkTransactFragment.java create mode 100644 oamodule/src/main/res/layout/fragment_routine_work.xml create mode 100644 oamodule/src/main/res/layout/fragment_routine_work_add.xml create mode 100644 oamodule/src/main/res/layout/fragment_routine_work_detail.xml create mode 100644 oamodule/src/main/res/layout/fragment_routine_work_transact.xml 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 -