gaojian/oasystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新闻

Browse Source
This commit is contained in:
itgaojian163 2022-12-09 11:05:28 +08:00
parent d9548a4184
commit b0accf1e3c
3 changed files with 168 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/news/NewsCenterActivity.java
View File

@ -8,6 +8,10 @@ import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter; import com.alibaba.android.arouter.launcher.ARouter;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
@ -34,9 +38,6 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.core.Observer;

3
oamodule/src/main/java/com/tenlionsoft/oamodule/activity/news/NewsDetailActivity.java
View File

@ -13,6 +13,8 @@ import android.webkit.WebViewClient;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.hjq.toast.ToastUtils; import com.hjq.toast.ToastUtils;
import com.tenlionsoft.baselib.constant.PathConfig; import com.tenlionsoft.baselib.constant.PathConfig;
@ -26,7 +28,6 @@ import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.beans.NewsDetailBean; import com.tenlionsoft.oamodule.beans.NewsDetailBean;
import com.tenlionsoft.oamodule.net.OAApi; import com.tenlionsoft.oamodule.net.OAApi;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.core.Observer;

19
oamodule/src/main/java/com/tenlionsoft/oamodule/pad/fragments/home/notice/NoticeListFragment.java
View File

@ -1,5 +1,10 @@
package com.tenlionsoft.oamodule.pad.fragments.home.notice; package com.tenlionsoft.oamodule.pad.fragments.home.notice;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_EMPTY;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_ERROR;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_LOADING;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_SUCCESS;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.text.TextUtils; import android.text.TextUtils;
@ -11,6 +16,9 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; 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.facade.annotation.Route;
import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.builder.TimePickerBuilder;
import com.bigkoo.pickerview.view.TimePickerView; import com.bigkoo.pickerview.view.TimePickerView;
@ -26,9 +34,7 @@ import com.tenlionsoft.baselib.utils.LogUtils;
import com.tenlionsoft.baselib.utils.TimeUtils; import com.tenlionsoft.baselib.utils.TimeUtils;
import com.tenlionsoft.oamodule.R; import com.tenlionsoft.oamodule.R;
import com.tenlionsoft.oamodule.R2; import com.tenlionsoft.oamodule.R2;
import com.tenlionsoft.oamodule.adapter.NewsTypeAdapter;
import com.tenlionsoft.oamodule.adapter.NoticeAdapter; import com.tenlionsoft.oamodule.adapter.NoticeAdapter;
import com.tenlionsoft.oamodule.beans.NewsTypeBean;
import com.tenlionsoft.oamodule.beans.NoticeListBean; import com.tenlionsoft.oamodule.beans.NoticeListBean;
import com.tenlionsoft.oamodule.net.OAApi; import com.tenlionsoft.oamodule.net.OAApi;
import com.tenlionsoft.oamodule.pad.activitys.home.PadMainActivity; import com.tenlionsoft.oamodule.pad.activitys.home.PadMainActivity;
@ -38,19 +44,12 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.annotations.NonNull;
import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.core.Observer;
import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.disposables.Disposable;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_EMPTY;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_ERROR;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_LOADING;
import static com.tenlionsoft.baselib.core.widget.base.BaseActivity.STATE_LOAD_SUCCESS;
/** /**
* 作者: adam * 作者: adam
* 日期: 2022/5/9 - 17:21 * 日期: 2022/5/9 - 17:21
@ -262,7 +261,7 @@ public class NoticeListFragment extends BaseFragment {
String end = mTvEndDate.getText().toString().trim(); String end = mTvEndDate.getText().toString().trim();
RetrofitManager.getInstance() RetrofitManager.getInstance()
.create(OAApi.class) .create(OAApi.class)
.getNoticeList("2",PathConfig.NOTICE_CONFIG_ID,start, end, mKeywords, mCurrentPage + "", "10") .getNoticeList("2", PathConfig.NOTICE_CONFIG_ID, start, end, mKeywords, mCurrentPage + "", "10")
.compose(RxTransformer.getTransformer()) .compose(RxTransformer.getTransformer())
.subscribe(new Observer<NoticeListBean>() { .subscribe(new Observer<NoticeListBean>() {
@Override @Override