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 b77b0b5..87e589c 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -306,4 +306,5 @@ public class PathConfig { public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_APPLY = "/oamodule/fragment/oaFlowCenter";//发起流程 public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_TODO = "/oamodule/fragment/mineUpcoming";//我的待办、已办 public static final String PATH_MODULE_OA_FRAGMENT_OA_FLOW_MINE_READ = "/oamodule/fragment/mineRead";//我的待阅、已阅 + public static final String NOTICE_CONFIG_ID ="bce4ab73-45dc-41a1-ac9d-305e83300e49"; } diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java index 9fbbadf..9276857 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/core/retrofit_net/BaseUrlApi.java @@ -7,8 +7,8 @@ package com.tenlionsoft.baselib.core.retrofit_net; */ public class BaseUrlApi { - public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */ -// public static final String IP = "http://121.36.71.250/";/* 测试IP */ +// public static final String IP = "http://192.168.0.120:8080/";/* 测试IP */ + public static final String IP = "http://121.36.71.250/";/* 测试IP */ // public static final String IP = "http://www.wlcbsyzl.cn/";/* 正式IP */ public static final String SYS_USERCENTER = "usercenter/"; public static final String SYS_POPULATION = "population/";/*人口系统*/ diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeListActivity.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeListActivity.java index 669a96c..5fccd58 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeListActivity.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/activity/notify/NoticeListActivity.java @@ -10,6 +10,9 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.bigkoo.pickerview.builder.TimePickerBuilder; @@ -32,8 +35,6 @@ import com.tenlionsoft.oamodule.net.OAApi; import java.util.ArrayList; import java.util.List; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; import io.reactivex.rxjava3.annotations.NonNull; @@ -100,9 +101,9 @@ public class NoticeListActivity extends BaseActivity { mRlvContent.setLayoutManager(new LinearLayoutManager(mActivity)); mRlvContent.setAdapter(mAdapter); mAdapter.addOnItemClickListener(bean -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_OA_ACTIVITY_NOTICE_DETAIL) - .withString("id", bean.getNoticeId()) - .navigation()); + .build(PathConfig.PATH_MODULE_OA_ACTIVITY_NOTICE_DETAIL) + .withString("id", bean.getNoticeId()) + .navigation()); mSrlContent.setOnRefreshListener(v -> doRefresh()); mSrlContent.setOnLoadMoreListener(v -> doLoadMore()); mTvBaseSearchCancel.setOnClickListener(v -> doResetCondition()); @@ -167,13 +168,13 @@ public class NoticeListActivity extends BaseActivity { break; } }) - .setTitleText("请选时间") - .setCancelColor(Color.parseColor("#1189FF")) - .setSubmitColor(Color.parseColor("#1189FF")) - .isDialog(false) - .setType(new boolean[]{true, true, true, false, false, false}) - .setTitleColor(Color.parseColor("#1189FF")) - .build(); + .setTitleText("请选时间") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .isDialog(false) + .setType(new boolean[]{true, true, true, false, false, false}) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); mTimePickerView.show(); } @@ -234,69 +235,69 @@ public class NoticeListActivity extends BaseActivity { } /** - * 我接受的工作 + * 通知公告列表 */ private void getNoticeList(int currentPage) { mCurrentPage = currentPage; String start = mTvStartDate.getText().toString().trim(); String end = mTvEndDate.getText().toString().trim(); RetrofitManager.getInstance() - .create(OAApi.class) - .getNoticeList(start, end, mKeywords, mCurrentPage + "", "20") - .compose(RxTransformer.getTransformer()) - .subscribe(new Observer() { - @Override - public void onSubscribe(@NonNull Disposable d) { + .create(OAApi.class) + .getNoticeList("2", PathConfig.NOTICE_CONFIG_ID, start, end, mKeywords, mCurrentPage + "", "20") + .compose(RxTransformer.getTransformer()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { - } + } - @Override - public void onNext(@NonNull NoticeListBean listBean) { - if (listBean.getRows() != null && listBean.getRows().size() > 0) { - ++mCurrentPage; - if (currentPage == 1) { - mDatas.clear(); - mDatas.addAll(listBean.getRows()); + @Override + public void onNext(@NonNull NoticeListBean listBean) { + if (listBean.getRows() != null && listBean.getRows().size() > 0) { + ++mCurrentPage; + if (currentPage == 1) { + mDatas.clear(); + mDatas.addAll(listBean.getRows()); + } else { + mDatas.addAll(listBean.getRows()); + } + refreshPageState(STATE_LOAD_SUCCESS); + mAdapter.notifyDataSetChanged(); + mSrlContent.finishRefresh(); + if (mDatas.size() >= listBean.getTotal()) { + mSrlContent.finishLoadMore(); + mSrlContent.setNoMoreData(true); + } else { + mSrlContent.finishLoadMore(); + mSrlContent.setNoMoreData(false); + } } else { - mDatas.addAll(listBean.getRows()); - } - refreshPageState(STATE_LOAD_SUCCESS); - mAdapter.notifyDataSetChanged(); - mSrlContent.finishRefresh(); - if (mDatas.size() >= listBean.getTotal()) { + mSrlContent.finishRefresh(); mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(true); - } else { - mSrlContent.finishLoadMore(); - mSrlContent.setNoMoreData(false); - } - } else { - mSrlContent.finishRefresh(); - mSrlContent.finishLoadMore(); - if (currentPage > 1) { - mSrlContent.setNoMoreData(true); - } else { - refreshPageState(STATE_LOAD_EMPTY); - if (!TextUtils.isEmpty(mKeywords)) { - ToastUtils.show("未查询到相关内容"); + if (currentPage > 1) { + mSrlContent.setNoMoreData(true); + } else { + refreshPageState(STATE_LOAD_EMPTY); + if (!TextUtils.isEmpty(mKeywords)) { + ToastUtils.show("未查询到相关内容"); + } } } } - } - @Override - public void onError(@NonNull Throwable e) { - mSrlContent.finishLoadMore(); - mSrlContent.finishRefresh(); - ExceptionHandler.handleException(e); - refreshPageState(STATE_LOAD_ERROR); - } + @Override + public void onError(@NonNull Throwable e) { + mSrlContent.finishLoadMore(); + mSrlContent.finishRefresh(); + ExceptionHandler.handleException(e); + refreshPageState(STATE_LOAD_ERROR); + } - @Override - public void onComplete() { + @Override + public void onComplete() { - } - }); + } + }); } @Override diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/fragments/OaMainFragment.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/fragments/OaMainFragment.java index bc20f41..1c755b4 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/fragments/OaMainFragment.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/fragments/OaMainFragment.java @@ -268,7 +268,7 @@ public class OaMainFragment extends BaseFragment { private void getNoticeList() { RetrofitManager.getInstance() .create(OAApi.class) - .getNoticeList("", "", "", "1", "15") + .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,"", "", "", "1", "15") .compose(RxTransformer.getTransformer()) .subscribe(new Observer() { @Override diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/net/OAApi.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/net/OAApi.java index e80415c..c0dbdd2 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/net/OAApi.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/net/OAApi.java @@ -674,8 +674,14 @@ public interface OAApi { * 获取通知公告列表 */ @Headers({"base_url_name:oa", "need_token:true", "Content-Type: application/json", "Accept: application/json"}) - @GET("app/notice/listpage") - Observable getNoticeList(@Query("startTime") String start, @Query("endTime") String end, @Query("keywords") String key, @Query("page") String page, @Query("rows") String rows); + @GET("app/notice/mylistpage") + Observable getNoticeList(@Query("noticeCheckStatus")String status, + @Query("noticeConfigId") String id, + @Query("startTime") String start, + @Query("endTime") String end, + @Query("keywords") String key, + @Query("page") String page, + @Query("rows") String rows); /** * 获取通知公告详情 diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java index 3599023..91cdfa0 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/PadOaMainFragment.java @@ -440,7 +440,7 @@ public class PadOaMainFragment extends BaseFragment { private void getNoticeList() { RetrofitManager.getInstance() .create(OAApi.class) - .getNoticeList("", "", "", "1", "10") + .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,"", "", "", "1", "10") .compose(RxTransformer.getTransformer()) .subscribe(new Observer() { @Override diff --git a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/notice/NoticeListFragment.java b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/notice/NoticeListFragment.java index 89e1191..6400c36 100644 --- a/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/notice/NoticeListFragment.java +++ b/oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/notice/NoticeListFragment.java @@ -262,7 +262,7 @@ public class NoticeListFragment extends BaseFragment { String end = mTvEndDate.getText().toString().trim(); RetrofitManager.getInstance() .create(OAApi.class) - .getNoticeList(start, end, mKeywords, mCurrentPage + "", "10") + .getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,start, end, mKeywords, mCurrentPage + "", "10") .compose(RxTransformer.getTransformer()) .subscribe(new Observer() { @Override