事件列表

app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/SplashActivity.java

@@ -36,7 +36,7 @@ public class SplashActivity extends AppCompatActivity {
                         public void onGranted(List<String> permissions, boolean allGranted) {
                             if (allGranted) {
                                 ToastUtils.show(String.format(getString(R.string.demo_obtain_permission_success_hint), PermissionNameConvert.getPermissionString(SplashActivity.this, permissions)));
-                                Intent intent = new Intent(SplashActivity.this, MainActivity.class);
+                                Intent intent = new Intent(SplashActivity.this, LoginActivity.class);
                                 startActivity(intent);
                                 finish();
                             } else {

app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/EventCenterAdapter.java

@@ -0,0 +1,41 @@
+package com.sjkj.appthreefloor_tsgz.adapter;
+
+import android.content.Context;
+import android.view.View;
+
+import com.sjkj.appthreefloor_tsgz.R;
+import com.sjkj.appthreefloor_tsgz.bean.EventBean;
+import com.sjkj.appthreefloor_tsgz.databinding.ItemEventListBinding;
+import com.sjkj.base_lib.adapter.BaseRecAdapter;
+
+import java.util.List;
+
+public class EventCenterAdapter extends BaseRecAdapter<EventBean, ItemEventListBinding> {
+
+    public EventCenterAdapter(Context context) {
+        super(context);
+    }
+
+    public EventCenterAdapter(Context context, List<EventBean> list) {
+        super(context, list);
+    }
+
+    @Override
+    protected int getLayoutResId(int viewType) {
+        return R.layout.item_event_list;
+    }
+
+    @Override
+    protected void onBindItem(ItemEventListBinding binding, EventBean bean, int position) {
+        binding.setModel(bean);
+        binding.executePendingBindings();
+//        binding.titleTv TODO
+        if (bean.getEventStatus().equals("是")){
+            binding.tvCui.setVisibility(View.VISIBLE);
+        }else {
+            binding.tvCui.setVisibility(View.GONE);
+        }
+    }
+
+
+}

app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/EventBean.java

@@ -0,0 +1,130 @@
+package com.sjkj.appthreefloor_tsgz.bean;
+
+public class EventBean {
+    private String id;
+    private String img;
+    private String title;
+    private String content;
+    private String time;
+
+    private String eventType;
+    private String eventTypeValue;
+    private String eventStatus;
+    private String eventStatusValue;
+    private String attachId;
+    private String eventCode;
+    private String eventSource;
+
+    public EventBean() {
+    }
+
+    public EventBean(String id, String title, String content, String time, String eventType, String eventTypeValue, String eventStatus, String eventStatusValue, String attachId, String eventCode, String eventSource) {
+        this.id = id;
+        this.title = title;
+        this.content = content;
+        this.time = time;
+        this.eventType = eventType;
+        this.eventTypeValue = eventTypeValue;
+        this.eventStatus = eventStatus;
+        this.eventStatusValue = eventStatusValue;
+        this.attachId = attachId;
+        this.eventCode = eventCode;
+        this.eventSource = eventSource;
+    }
+
+    public String getEventSource() {
+        return eventSource;
+    }
+
+    public void setEventSource(String eventSource) {
+        this.eventSource = eventSource;
+    }
+
+    public String getEventCode() {
+        return eventCode;
+    }
+
+    public void setEventCode(String eventCode) {
+        this.eventCode = eventCode;
+    }
+
+    public String getEventTypeValue() {
+        return eventTypeValue;
+    }
+
+    public void setEventTypeValue(String eventTypeValue) {
+        this.eventTypeValue = eventTypeValue;
+    }
+
+    public String getEventStatusValue() {
+        return eventStatusValue;
+    }
+
+    public void setEventStatusValue(String eventStatusValue) {
+        this.eventStatusValue = eventStatusValue;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    public String getEventStatus() {
+        return eventStatus;
+    }
+
+    public void setEventStatus(String eventStatus) {
+        this.eventStatus = eventStatus;
+    }
+
+    public String getAttachId() {
+        return attachId;
+    }
+
+    public void setAttachId(String attachId) {
+        this.attachId = attachId;
+    }
+}

app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/EventCenterListBean.java

@@ -0,0 +1,87 @@
+package com.sjkj.appthreefloor_tsgz.bean;
+
+public class EventCenterListBean {
+
+/*
+            "createTime": "2022-08-30 16:43:47",
+            "eventName": "1",
+            "eventType": "3",
+            "id": "8e2523091a084a9ba0c82981cd0363d4",
+            "isUrged": "否",
+            "reportSource": "PC",
+            "reportTime": "2022-08-30 14:59:41"*/
+     private String createTime;
+     private String eventName;
+     private String eventType;
+     private String id;
+     private String isUrged;
+     private String eventCode;
+
+    public String getEventCode() {
+        return eventCode;
+    }
+
+    public void setEventCode(String eventCode) {
+        this.eventCode = eventCode;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getEventName() {
+        return eventName;
+    }
+
+    public void setEventName(String eventName) {
+        this.eventName = eventName;
+    }
+
+    public String getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(String eventType) {
+        this.eventType = eventType;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIsUrged() {
+        return isUrged;
+    }
+
+    public void setIsUrged(String isUrged) {
+        this.isUrged = isUrged;
+    }
+
+    public String getReportSource() {
+        return reportSource;
+    }
+
+    public void setReportSource(String reportSource) {
+        this.reportSource = reportSource;
+    }
+
+    public String getReportTime() {
+        return reportTime;
+    }
+
+    public void setReportTime(String reportTime) {
+        this.reportTime = reportTime;
+    }
+
+    private String reportSource;
+     private String reportTime;
+
+}

app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventFragment.java

@@ -1,309 +1,317 @@
 package com.sjkj.appthreefloor_tsgz.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.tabs.TabLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.sjkj.appthreefloor_tsgz.R;
+import com.sjkj.appthreefloor_tsgz.adapter.EventCenterAdapter;
+import com.sjkj.appthreefloor_tsgz.app.App;
+import com.sjkj.appthreefloor_tsgz.bean.EventBean;
+import com.sjkj.appthreefloor_tsgz.bean.EventCenterListBean;
+import com.sjkj.appthreefloor_tsgz.databinding.FragmentEventBinding;
+import com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel;
+import com.sjkj.appthreefloor_tsgz.net.EventListRequest;
+import com.sjkj.base_lib.adapter.BaseRecAdapter;
+import com.sjkj.base_lib.divider.DividerItem;
+import com.sjkj.base_lib.entity.Params;
+import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
+import com.sjkj.base_lib.utils.Constants;
+import com.sjkj.base_lib.view.BaseActivity;
 import com.sjkj.base_lib.view.BaseFragment;
+import com.sjkj.base_lib.weight.LoadingDialog;
+
+import java.util.List;
 
 public class EventFragment extends BaseFragment /*implements View.OnClickListener */ {
+    private FragmentEventBinding binding;
+    private EventFargmentViewModel viewModel;
+    private String[] eventStatusNames = new String[]{"待签收", "处理中", "已完成", "归档"};
+    private String[] eventStatusValues = new String[]{"forest_event_status_7", "forest_event_status_2", "forest_event_status_5", "forest_event_status_6"};
+    private int currentPage = 1;
+    private EventCenterAdapter adapter;
+    public EventListRequest eventListRequest = new EventListRequest(App.getInstance());
+    private List<EventBean> eventItemList;
     @Override
     protected int initLayout() {
-        return 0;
+        return R.layout.fragment_event;
     }
 
     @Override
     public View initBinding(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-        return null;
+        binding = (FragmentEventBinding) getViewDataBing(inflater, container);
+        viewModel = new ViewModelProvider(getActivity(), new ViewModelProvider.NewInstanceFactory()).get(EventFargmentViewModel.class);
+        binding.setViewModel(viewModel);
+        binding.setLifecycleOwner(this);
+        return binding.getRoot();
     }
 
     @Override
     public void initView() {
+        initTab();
+        LinearLayoutManager manager = new LinearLayoutManager(getActivity());
+        manager.setOrientation(RecyclerView.VERTICAL);
+        binding.recyclerView.setLayoutManager(manager);
+        adapter = new EventCenterAdapter(getActivity());
+        adapter.setItemClick(new BaseRecAdapter.OnItemClick<EventBean>() {
+            @Override
+            public void onItemClick(EventBean bean, int position) {
+//                Intent intent = new Intent(getActivity(), EventDetailsActivity.class);
+//                intent.putExtra("eventCode", bean.getEventCode());
+//                intent.putExtra("id", bean.getId());
+//                intent.putExtra("str", "1");
+//                startActivityForResult(intent, 1000);
+            }
+        });
+        binding.recyclerView.setAdapter(adapter);
+        binding.smartRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(RefreshLayout refreshLayout) {
+                requestListRefresh();
+            }
+        });
+        binding.smartRefreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
+            @Override
+            public void onLoadMore(RefreshLayout refreshLayout) {
+                requestListLoadMore();
+            }
+        });
+        binding.recyclerView.addItemDecoration(new DividerItem(getActivity()));
 
     }
 
-    @Override
-    public void initListener() {
+    private void initTab() {
+        for (int i = 0; i < eventStatusNames.length; i++) {
+            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(eventStatusNames[i]).setTag(eventStatusValues[i]));
+        }
+    }
+
+    private void requestListRefresh() {
+        showLoadingDialog();
+        currentPage = 1;
+        Params params = new Params();
+        params.put("pageSize", Constants.ITEM_NUMBERS);
+        params.put("pageNum", currentPage);
+        params.put("eventStatusValue", viewModel.eventStatusValue.get());
+        params.put("eventType", viewModel.eventTypeValue.get());
+        params.put("satrtTime", viewModel.satrtTime.get());
+        params.put("endTime", viewModel.endTime.get());
+        params.put("pid", viewModel.parentId.get());
+        if (!TextUtils.isEmpty(viewModel.keyword.get())) {
+            params.put("eventName", viewModel.keyword.get());
+        }
+        eventListRequest.setParams(params);
+        eventListRequest.execute(new ProcessErrorSubscriber<List<EventCenterListBean>>() {
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                finishRefreshOrLoadMore(binding.smartRefreshLayout);
+                hideLoadingDialog(LoadingDialog.LOADING_FAILED);
+            }
+
+            @Override
+            public void onNext(List<EventCenterListBean> bean) {
+                super.onNext(bean);
+                finishRefreshOrLoadMore(binding.smartRefreshLayout);
+                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
+                eventItemList.clear();
+                if (bean != null && bean.size() > 0) {
+                    for (int i = 0; i < bean.size(); i++) {
+                        String id = bean.get(i).getId();
+                        String title = bean.get(i).getEventName();
+                        String content = bean.get(i).getReportTime();
+                        String time = bean.get(i).getReportTime();
+                        String type = bean.get(i).getEventType();
+                        String eventSource = bean.get(i).getReportSource();
+                        String eventCode = bean.get(i).getEventCode();
+                        String isUrged = "";
+                        if (viewModel.eventStatusValue.get().equals("forest_event_status_5") || viewModel.eventStatusValue.get().equals("forest_event_status_6")) {
+                            isUrged = "否";
+                        } else {
+                            isUrged = bean.get(i).getIsUrged();
+                        }
+
+
+                        EventBean eventBean = new EventBean(id, title, content, time, type, "", isUrged, "", "", eventCode, eventSource);
+                        eventItemList.add(eventBean);
+                    }
+
+                } /*else {
+                   ToastUtils.show("暂无数据");
+                }*/
+                adapter.refreshList(eventItemList);
+            }
+        });
 
     }
 
-    @Override
-    public void loadData() {
+    private void requestListLoadMore() {
+       showLoadingDialog();
+        Params params = new Params();
+        params.put("pageSize", Constants.ITEM_NUMBERS);
+        params.put("pageNum", currentPage + 1);
+        params.put("eventStatusValue", viewModel.eventStatusValue.get());
+        params.put("eventType", viewModel.eventTypeValue.get());
+        params.put("satrtTime", viewModel.satrtTime.get());
+        params.put("endTime", viewModel.endTime.get());
+        params.put("pid", viewModel.parentId.get());
+        if (!TextUtils.isEmpty(viewModel.keyword.get())) {
+            params.put("eventName", viewModel.keyword.get());
+        }
+        eventListRequest.setParams(params);
+        eventListRequest.execute(new ProcessErrorSubscriber<List<EventCenterListBean>>() {
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                finishRefreshOrLoadMore(binding.smartRefreshLayout);
+                hideLoadingDialog(LoadingDialog.LOADING_FAILED);
+            }
+
+            @Override
+            public void onNext(List<EventCenterListBean> bean) {
+                super.onNext(bean);
+                finishRefreshOrLoadMore(binding.smartRefreshLayout);
+                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
+                if (bean != null) {
+                    //  if (AppTools.ceil(bean.getTotal()) > currentPage) {
+                    if (bean != null && bean.size() > 0) {
+                        currentPage = currentPage + 1;
+                        for (int i = 0; i < bean.size(); i++) {
+                            String id = bean.get(i).getId();
+                            String title = bean.get(i).getEventName();
+                            String content = bean.get(i).getReportTime();
+                            String time = bean.get(i).getReportTime();
+                            String type = bean.get(i).getEventType();
+                            String eventSource = bean.get(i).getReportSource();
+                            String eventCode = bean.get(i).getEventCode();
+                            String isUrged = "";
+                            if (viewModel.eventStatusValue.get().equals("forest_event_status_5") || viewModel.eventStatusValue.get().equals("forest_event_status_6")) {
+                                isUrged = "否";
+                            } else {
+                                isUrged = bean.get(i).getIsUrged();
+                            }
+                            EventBean eventBean = new EventBean(id, title, content, time, type, "", isUrged, "", "", eventCode, eventSource);
+                            eventItemList.add(eventBean);
+                        }
+                        adapter.refreshList(eventItemList);
+                    }
+                }
+                // }
 
+            }
+        });
     }
 
-//    private FragmentMainBinding binding;
-//    private MainViewModel viewModel;
-//    private BannerRequest bannerRequest = new BannerRequest(App.getInstance());
-//    private List<String> banners;
-//    private MainMenuAdapter adapter;
-//
-//    @Override
-//    protected int initLayout() {
-//        return R.layout.fragment_main;
-//    }
-//
-//    @Override
-//    public View initBinding(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-//        binding = (FragmentMainBinding) getViewDataBing(inflater, container);
-//        viewModel = new ViewModelProvider(getActivity(), new ViewModelProvider.NewInstanceFactory()).get(MainViewModel.class);
-//        binding.setViewModel(viewModel);
-//        binding.setLifecycleOwner(this);
-//        return binding.getRoot();
-//    }
-//
-//    @Override
-//    public void initView() {
-//        binding.banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR);
-//        binding.banner.setDelayTime(2000);
-//        binding.banner.setBannerAnimation(Transformer.Default);
-//        binding.banner.setIndicatorGravity(BannerConfig.CENTER);
-//        binding.banner.setImageLoader(new ImageLoader() {
-//            @Override
-//            public void displayImage(Context context, Object path, ImageView imageView) {
-//                if (TextUtils.equals("default", path.toString())) {
-//                    imageView.setImageResource(R.drawable.bg_tsgz_banner);
-//                    return;
-//                }
-//                Glide.with(getActivity()).load(path.toString()).diskCacheStrategy(DiskCacheStrategy.NONE).into(imageView);
-//            }
-//        });
-//        binding.banner.setOnBannerListener(new OnBannerListener() {
-//            @Override
-//            public void OnBannerClick(int position) {
-////                ToastUtils.show(position + "");
-//            }
-//        });
-//        banners = new ArrayList<>();
-//        banners.add("default");
-//        binding.banner.setImages(banners);
-//        binding.banner.start();
-////        GridLayoutManager manager = new GridLayoutManager(getActivity(), 4);
-////        manager.setOrientation(RecyclerView.VERTICAL);
-////        binding.recyclerView.setLayoutManager(manager);
-//        adapter = new MainMenuAdapter(getActivity());
-//        adapter.setItemClick(new MainMenuAdapter.OnItemClick() {
-//            @Override
-//            public void onItemClick(MenuMainItemBean bean, int position) {
-//                if (bean != null) {
-//                    if ("icon_daily".equals(bean.getIcon())) {//日报管理
-//                        startActivity(new Intent(getActivity(), DailyActivity.class));
-//                    } else if ("icon_leave".equals(bean.getIcon())) {//考勤管理
-//                        startActivity(new Intent(getActivity(), WorkManagementActivity.class));
-//                    } else if ("icon_emergency".equals(bean.getIcon())) {//应急预案
-//                        startActivity(new Intent(getActivity(), EmergencyPlanActivity.class));
-//                    } else if ("icon_policy".equals(bean.getIcon())) {//政策法规
-//                        startActivity(new Intent(getActivity(), PolicyActivity.class));
-//                    } else if ("icon_file".equals(bean.getIcon())) {//文件管理
-//                        startActivity(new Intent(getActivity(), FileFolderActivity.class));
-//                    } else if ("icon_event".equals(bean.getIcon())) {//事件中心
-//                        startActivity(new Intent(getActivity(), EventCenterSystemMenuActivity.class).putExtra("menuId", bean.getMenuId()));
-////                        EventCenterActivity
-//                    } else if ("icon_task".equals(bean.getIcon())) {//任务中心
-//                        startActivity(new Intent(getActivity(), TaskCenterActivity.class));
-//                    } else if ("icon_monitor".equals(bean.getIcon())) {//监控中心
-//                        startActivity(new Intent(getActivity(), MonitoringCenterActivity.class).putExtra("titleName", getString(R.string.monitor_center)));
-//                    } else if ("icon_data_center".equals(bean.getIcon())) {//数据中心
-//                        startActivity(new Intent(getActivity(), DataCenterNewActivity.class).putExtra("menuId", bean.getMenuId()));
-//                    } else if ("icon_locus".equals(bean.getIcon())) {//轨迹
-//                        startActivity(new Intent(getActivity(), LocusTypeListActivity.class));
-//                    } else if ("icon_ziyuan".equals(bean.getIcon())) {//资源可视
-//                        startActivity(new Intent(getActivity(), TSGZDataMenuActivity.class).putExtra("menuId", bean.getMenuId()).putExtra("assort", "app"));
-//                    } else if ("icon_huiyi".equals(bean.getIcon())) {//移动会议
-//                        openAppWithPackageName("com.huawei.CloudLink");
-//                    } else if ("icon_comprehensive".equals(bean.getIcon())) {//数字综治
-//                        startActivity(new Intent(getActivity(), ComprehensiveMainActivity.class));
-//                    }
-//                }
-//            }
-//        });
-//
-//        binding.gridView.setAdapter(adapter);
-//        adapter.refreshList(AppSystemUtils.menuList);
-//    }
-//
-//    @Override
-//    public void initListener() {
-////        binding.dailyManageTv.setOnClickListener(this);
-////        binding.leaveManageTv.setOnClickListener(this);
-////        binding.emergencyManageTv.setOnClickListener(this);
-////        binding.policyManageTv.setOnClickListener(this);
-////        binding.fileManageTv.setOnClickListener(this);
-////        binding.eventCenterTv.setOnClickListener(this);
-////        binding.taskCenterTv.setOnClickListener(this);
-////        binding.monitorCenterTv.setOnClickListener(this);
-////        binding.digitalAgricultureTv.setOnClickListener(this);
-////        binding.digitalForestryTv.setOnClickListener(this);
-////        binding.digitalWaterTv.setOnClickListener(this);
-////        binding.digitalEmergencyTv.setOnClickListener(this);
-////        binding.digitalFireTv.setOnClickListener(this);
-////        binding.digitalTrafficTv.setOnClickListener(this);
-////        binding.digitalResourcesTv.setOnClickListener(this);
-////        binding.digitalEnvironmentalTv.setOnClickListener(this);
-////        binding.partyMassesServiceTv.setOnClickListener(this);
-////        binding.socialManagementTv.setOnClickListener(this);
-////        binding.partyMassesServiceTv.setOnClickListener(this);
-////        binding.locusTv.setOnClickListener(this);
-////        binding.dataCenterTv.setOnClickListener(this);
-////        binding.ziyuanTv.setOnClickListener(this);
-////        binding.huiyiTv.setOnClickListener(this);
-//    }
-//
-////    @Override
-////    public void onClick(View v) {
-////        switch (v.getId()) {
-////            case R.id.daily_manage_tv://日报管理
-////                startActivity(new Intent(getActivity(), DailyActivity.class));
-////                break;
-////            case R.id.leave_manage_tv://考勤管理
-////                startActivity(new Intent(getActivity(), WorkManagementActivity.class));
-////                break;
-////            case R.id.emergency_manage_tv://应急预案
-////                startActivity(new Intent(getActivity(), EmergencyPlanActivity.class));
-////
-////                break;
-////
-////            case R.id.huiyi_tv://移动会议
-////                openAppWithPackageName("com.huawei.CloudLink");
-////                break;
-////            case R.id.ziyuan_tv://资源可视
-////                startActivity(new Intent(getActivity(), TSGZDataMenuActivity.class));
-////                break;
-////            case R.id.policy_manage_tv://政策法规
-////                startActivity(new Intent(getActivity(), PolicyActivity.class));
-////                break;
-////            case R.id.file_manage_tv://文件管理
-////                startActivity(new Intent(getActivity(), FileFolderActivity.class));
-////                break;
-////            case R.id.event_center_tv://事件中心
-////                startActivity(new Intent(getActivity(), EventCenterActivity.class));
-////                break;
-////            case R.id.task_center_tv://任务中心
-////                startActivity(new Intent(getActivity(), TaskCenterActivity.class));
-////                break;
-////            case R.id.monitor_center_tv://监控中心
-////                startActivity(new Intent(getActivity(), MonitoringCenterActivity.class));
-////                break;
-////            case R.id.digital_agriculture_tv://农业
-////                startActivity(new Intent(getActivity(), DigitalAgricultureActivity.class));
-////                break;
-////            case R.id.digital_forestry_tv://林业
-////                startActivity(new Intent(getActivity(), DigitalForestryActivity.class));
-////                break;
-////            case R.id.digital_water_tv://水利
-////                startActivity(new Intent(getActivity(), DigitalWaterActivity.class));
-////                break;
-////            case R.id.digital_emergency_tv://应急
-//////                   startActivity(new Intent(getActivity(), EmergencyHomeActivity.class));
-////                startActivity(new Intent(getActivity(), DigitalEmergencyActivity.class));
-////                break;
-////            case R.id.digital_fire_tv://消防
-////                startActivity(new Intent(getActivity(), DigitalFiretvActivity.class));
-////
-////                break;
-////            case R.id.digital_traffic_tv://交通
-////                startActivity(new Intent(getActivity(), DigitalTrafficActivity.class));
-////                break;
-////            case R.id.digital_resources_tv://资源
-////                startActivity(new Intent(getActivity(), DigitalResourcesActivity.class));
-////                break;
-////            case R.id.digital_environmental_tv://环保
-////                startActivity(new Intent(getActivity(), DigitaEnvironmentalActivity.class));
-////                break;
-////            case R.id.party_masses_service_tv://党群社区
-////                startActivity(new Intent(getActivity(), PartyMassesMainActivity.class));
-////                break;
-////            case R.id.social_management_tv://社管通
-////                startActivity(new Intent(getActivity(), SocialMainActivity.class));
-////                break;
-////            case R.id.locus_tv://轨迹
-////                startActivity(new Intent(getActivity(), LocusTypeListActivity.class));
-////                break;
-////            case R.id.data_center_tv://数据中心
-////                startActivity(new Intent(getActivity(), DataCenterNewActivity.class));
-////                break;
-////            default:
-////                break;
-////        }
-////    }
-//
-//    @Override
-//    public void loadData() {
-//        bannerRequest.setParams(new Params());
-//        bannerRequest.execute(new ProcessErrorSubscriber<BannerDataBean>() {
+    @Override
+    public void initListener() {
+        binding.llChongzhi.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                viewModel.keyword.set("");
+                viewModel.eventTypeValue.set("");
+                viewModel.satrtTime.set("");
+                viewModel.endTime.set("");
+                binding.inputEt.setHint(getResources().getString(R.string.input_content));
+
+
+                binding.tvSerch.setText("条件筛选");
+                binding.tvSerch.setTextColor(getResources().getColor(R.color.black));
+                binding.llSerch.setBackground(getResources().getDrawable(R.drawable.shape_background_white_5));
+                binding.ivS.setBackground(getResources().getDrawable(R.drawable.icon_arrow_right));
+
+
+                binding.tvStartTime.setText("时间筛选");
+                binding.tvStartTime.setTextColor(getResources().getColor(R.color.black));
+                binding.llTime.setBackground(getResources().getDrawable(R.drawable.shape_background_white_5));
+                binding.ivT.setBackground(getResources().getDrawable(R.drawable.icon_arrow_right));
+                requestListRefresh();
+            }
+        });
+        binding.llSerch.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //startActivityForResult(new Intent(getActivity(), EventCenterSerchActivity.class).putExtra("parentId",getIntent().getStringExtra("parentId")), 2000);
+            }
+        });
+        binding.llTime.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+               // startActivityForResult(new Intent(getActivity(), EventCenterSerchTimeActivity.class).putExtra("starttime", viewModel.satrtTime.get()).putExtra("endtime", viewModel.endTime.get()), 3000);
+            }
+        });
+//        setTitleListener(new BaseActivity.TitleListener() {
 //            @Override
-//            public void onError(Throwable e) {
-//                super.onError(e);
+//            public void onRightClick() {
+//                startActivityForResult(new Intent(getActivity(), NewEventActivity.class), 1000);
 //            }
 //
 //            @Override
-//            public void onNext(BannerDataBean bannerDataBean) {
-//                super.onNext(bannerDataBean);
-//                if (bannerDataBean != null) {
-//                    List<BannerDataBean.ListBean> list = bannerDataBean.getList();
-//                    List<String> imgs = new ArrayList<>();
-//                    if (list != null && list.size() > 0) {
-//                        for (int i = 0; i < list.size(); i++) {
-//                            if (list.get(i) != null && !TextUtils.isEmpty(list.get(i).getPath())) {
-//                                imgs.add(list.get(i).getPath());
-//                            }
-//                        }
-//                        if (imgs.size() > 0) {
-//                            binding.banner.update(imgs);
-//                        }
-//                    }
+//            public void onBackClick() {
 //
-//                }
 //            }
 //        });
-//    }
-//
-//    /**
-//     * 打开外部App
-//     *
-//     * @param packagename
-//     */
-//    private void openAppWithPackageName(String packagename) {
-//        // 通过包名获取此APP详细信息，包括Activities、services、versioncode、name等等
-//        PackageInfo packageinfo = null;
-//        try {
-//            packageinfo = getActivity().getPackageManager().getPackageInfo(packagename, 0);
-//        } catch (PackageManager.NameNotFoundException e) {
-//            e.printStackTrace();
-//            ToastUtils.show("App尚未安装");
-//        }
-//        if (packageinfo == null) {
-//            return;
-//        }
-//
-//        // 创建一个类别为CATEGORY_LAUNCHER的该包名的Intent
-//        Intent resolveIntent = new Intent(Intent.ACTION_MAIN, null);
-//        resolveIntent.addCategory(Intent.CATEGORY_LAUNCHER);
-//        resolveIntent.setPackage(packageinfo.packageName);
-//        // 通过getPackageManager()的queryIntentActivities方法遍历
-//        List<ResolveInfo> resolveinfoList = getActivity().getPackageManager()
-//                .queryIntentActivities(resolveIntent, 0);
-//
-//        if (!resolveinfoList.iterator().hasNext()) {
-//            return;
-//        }
-//        ResolveInfo resolveinfo = resolveinfoList.iterator().next();
-//        if (resolveinfo != null) {
-//            // packagename = 参数packname
-//            String packageName = resolveinfo.activityInfo.packageName;
-//            // 这个就是我们要找的该APP的LAUNCHER的Activity[组织形式：packagename.mainActivityname]
-//            String className = resolveinfo.activityInfo.name;
-//            // LAUNCHER Intent
-//            Intent intent = new Intent(Intent.ACTION_MAIN);
-//            intent.addCategory(Intent.CATEGORY_LAUNCHER);
-//            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);//重点是加这个
-//
-//            // 设置ComponentName参数1:packagename参数2:MainActivity路径
-//            ComponentName cn = new ComponentName(packageName, className);
-//            intent.setComponent(cn);
-//            startActivity(intent);
-//        }
-//    }
+        binding.inputEt.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                viewModel.keyword.set(s.toString().trim());
+            }
+        });
+        binding.searchTv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                requestListRefresh();
+            }
+        });
+        binding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                viewModel.eventStatus.set(tab.getText().toString());
+                viewModel.eventStatusValue.set(tab.getTag().toString());
+                requestListRefresh();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
+
+    }
+
+    @Override
+    public void loadData() {
+        viewModel.eventStatus.set(eventStatusNames[0]);
+        viewModel.eventStatusValue.set(eventStatusValues[0]);
+        requestListRefresh();
+    }
+
+
 }

app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/viewModel/EventFargmentViewModel.java

@@ -0,0 +1,63 @@
+package com.sjkj.appthreefloor_tsgz.fragment.viewModel;
+
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableField;
+import androidx.databinding.ObservableInt;
+
+import com.sjkj.appthreefloor_tsgz.bean.EventBean;
+import com.sjkj.base_lib.view.SingleLiveData;
+import com.sjkj.base_lib.vm.BaseViewModel;
+
+import java.util.List;
+
+public class EventFargmentViewModel extends BaseViewModel {
+    public ObservableField<String> NameValues = new ObservableField<>();
+    public ObservableInt version = new ObservableInt();
+    public ObservableField<List<String>> EventPhones = new ObservableField<>();
+    //public ObservableField<List<MapMarkBean>> markListBean = new ObservableField<>();
+    public ObservableField<String> title = new ObservableField<>("");
+    public ObservableField<String> address = new ObservableField<>("");
+    public ObservableField<String> eventCode = new ObservableField<>("");
+    public ObservableField<String> eventId = new ObservableField<>("");
+    public ObservableField<String> keyword = new ObservableField<>("");
+    public ObservableField<String> state = new ObservableField<>("");
+    public ObservableField<String> eventType = new ObservableField<>("");
+    public ObservableField<String> eventTypeValue1 = new ObservableField<>("");
+    public ObservableField<String> eventTypeValue2 = new ObservableField<>("");
+    public ObservableField<String> eventTypeValue3 = new ObservableField<>("");
+    public ObservableField<String> eventTypeValuEName = new ObservableField<>("");
+    public ObservableField<String> eventTypeName2 = new ObservableField<>("");
+    public ObservableField<String> deptId = new ObservableField<>("");
+    public ObservableField<String> deptName = new ObservableField<>("");
+    public ObservableField<String> ChildDeptId = new ObservableField<>("");
+    public ObservableField<String> ChildDeptName = new ObservableField<>("");
+    public ObservableField<String> eventStatus = new ObservableField<>("");
+    public ObservableField<String> eventStatusValue = new ObservableField<>("");
+    public ObservableField<String> eventTypeValue = new ObservableField<>("");
+    public ObservableField<String> satrtTime = new ObservableField<>("");
+    public ObservableField<String> endTime = new ObservableField<>("");
+    public ObservableField<String> parentId = new ObservableField<>("");
+    public ObservableField<String> time = new ObservableField<>("");
+    public ObservableField<String> position = new ObservableField<>("定位中...");
+    public ObservableField<Double> longitude = new ObservableField<>(0.00);
+    public ObservableField<Double> latitude = new ObservableField<>(0.00);
+    public ObservableField<String> escalation = new ObservableField<>("");
+    public ObservableField<String> webUrl = new ObservableField<>("");
+    public ObservableField<String> userName = new ObservableField<>("");
+    public ObservableField<String> userId = new ObservableField<>("");
+    public ObservableField<String> from = new ObservableField<>("");
+    public ObservableField<String> fromName = new ObservableField<>("");
+    public ObservableField<String> content = new ObservableField<>("");
+    public ObservableField<String> windDirection = new ObservableField<>("");
+    public ObservableArrayList<String> fileList = new ObservableArrayList<>();
+    public ObservableField<String> fromAddress = new ObservableField<>("");
+    public ObservableField<String> toAddress = new ObservableField<>("");
+    //public ObservableField<String> eventTypeValue = new ObservableField<>("");
+
+    public SingleLiveData<EventBean> singleLiveData = new SingleLiveData<>();
+
+    public void getData() {
+        singleLiveData.setValue(null);
+    }
+
+}

app/src/main/java/com/sjkj/appthreefloor_tsgz/login/LoginActivity.java

@@ -156,9 +156,10 @@ public class LoginActivity extends BaseLoginActivity {
 //            return;
 //        }
         Params params = new Params();
-//        params.put("loginType", "mobile");
+        params.put("loginType", "mobile");
         params.put("username", viewModel.username.get());
         params.put("password", viewModel.password2.get());
+        params.put("code", "5521");
         params.put("sessionId", viewModel.sessionId.get());
         params.put("deviceid", PushUtils.getRegistrationId());
         loginRequest.setParams(params);

app/src/main/java/com/sjkj/appthreefloor_tsgz/net/EventListRequest.java

@@ -0,0 +1,53 @@
+package com.sjkj.appthreefloor_tsgz.net;
+
+import android.content.Context;
+
+import com.sjkj.appthreefloor_tsgz.bean.EventCenterListBean;
+import com.sjkj.base_lib.entity.Params;
+import com.sjkj.base_lib.entity.ResponseBean;
+import com.sjkj.base_lib.net.RetrofitFactory;
+import com.sjkj.base_lib.net.data.exception.BusinessException;
+import com.sjkj.base_lib.net.domain.interactor.UseCase;
+import com.sjkj.base_lib.utils.AppTools;
+
+import java.util.List;
+
+import rx.Observable;
+import rx.functions.Func1;
+
+/**
+ * 事件中心
+ */
+public class EventListRequest extends UseCase {
+    private Context context;
+    private RetrofitService service;
+
+    private Params params;
+
+    public Params getParams() {
+        return params;
+    }
+
+    public void setParams(Params params) {
+        this.params = params;
+    }
+
+    public EventListRequest(Context context) {
+        this.context = context;
+        service = RetrofitFactory.getRetrofit(AppTools.getBaseUrl()).create(RetrofitService.class);
+    }
+
+    @Override
+    protected Observable buildUseCaseObservable() {
+        return service.eventCenterList(params).flatMap(new Func1<ResponseBean<List<EventCenterListBean>>, Observable<List<EventCenterListBean>>>() {
+            @Override
+            public Observable<List<EventCenterListBean>> call(ResponseBean<List<EventCenterListBean>> responseBean) {
+                if (!ResponseBean.CODE_SUCCESS.
+                        equals(responseBean.getCode())) {
+                    return Observable.error(new BusinessException(responseBean.getMsg()));
+                }
+                return Observable.just(responseBean.getData());
+            }
+        });
+    }
+}

app/src/main/java/com/sjkj/appthreefloor_tsgz/net/RetrofitService.java

@@ -1,12 +1,16 @@
 package com.sjkj.appthreefloor_tsgz.net;
 
 import com.sjkj.appthreefloor_tsgz.bean.BannerDataBean;
+import com.sjkj.appthreefloor_tsgz.bean.EventCenterListBean;
 import com.sjkj.appthreefloor_tsgz.bean.LogInRsaBean;
 import com.sjkj.appthreefloor_tsgz.bean.LoginBean;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.entity.ResponseBean;
 
+import java.util.List;
+
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.QueryMap;
 import rx.Observable;
@@ -17,7 +21,13 @@ public interface RetrofitService {
 
     @POST("AppLoginController/getPrivateKey")
     Observable<ResponseBean<LogInRsaBean>> getLoginKey();
+
     //首页轮播图
     @POST("AppMainPageController/getMainPageInfo")
     Observable<ResponseBean<BannerDataBean>> banners(@QueryMap Params params);
+
+    //事件中心-事件列表
+    @GET("AppEventController/eventFindAll")
+    Observable<ResponseBean<List<EventCenterListBean>>> eventCenterList(@QueryMap Params params);
+
 }

app/src/main/res/drawable/ic_baseline_event_note_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#6D88E9"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,10L7,10v2h10v-2zM19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,8h14v11zM14,14L7,14v2h7v-2z"/>
+</vector>

app/src/main/res/drawable/shape_background_white_5.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_white" />
+    <corners android:radius="5dp" />
+</shape>

app/src/main/res/layout/fragment_event.xml

@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:background="@color/color_white"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:padding="12dp">
+
+            <EditText
+                android:id="@+id/input_et"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_weight="1"
+                android:background="@drawable/shape_bg_gray_input"
+                android:drawableLeft="@drawable/icon_search"
+                android:drawablePadding="5dp"
+                android:ellipsize="end"
+                android:hint="@string/input_content"
+                android:lines="1"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:singleLine="true"
+                android:textColor="@color/color_black_text"
+                android:textColorHint="@color/color_gray_light_text"
+                android:textSize="12dp" />
+
+            <TextView
+                android:id="@+id/search_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:text="@string/search"
+                android:textColor="@color/main_blue_color"
+                android:textSize="14dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:background="@color/line_gray_1"
+
+            android:gravity="center_vertical">
+
+            <LinearLayout
+                android:id="@+id/ll_serch"
+                android:layout_width="0dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/shape_background_white_5"
+                android:gravity="center_vertical|center_horizontal"
+                android:orientation="horizontal">
+
+                <TextView
+
+
+                    android:id="@+id/tv_serch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+
+
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="条件筛选"
+                    android:maxEms="4"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:id="@+id/iv_s"
+                    android:layout_width="wrap_content"
+
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="5dp"
+                    android:background="@drawable/icon_arrow_right" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_time"
+
+                android:layout_width="0dp"
+                android:layout_height="30dp"
+                android:layout_marginLeft="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/shape_background_white_5"
+                android:gravity="center_vertical|center_horizontal"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/tv_startTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="时间筛选"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:id="@+id/iv_t"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="5dp"
+                    android:background="@drawable/icon_arrow_right" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_chongzhi"
+                android:layout_width="0dp"
+                android:layout_height="30dp"
+
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_weight="1"
+                android:background="@drawable/shape_background_white_5"
+                android:gravity="center_vertical|center_horizontal"
+                android:orientation="horizontal">
+
+
+                <TextView
+                    android:id="@+id/tv_chongzhi"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+
+                    android:background="@drawable/shape_background_white_5"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="重置筛选"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+
+                    android:layout_marginLeft="5dp"
+                    android:background="@drawable/icon_arrow_right" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabGravity="fill"
+            app:tabIndicatorColor="@color/main_blue_color"
+            app:tabIndicatorFullWidth="false"
+            app:tabIndicatorHeight="2dp"
+            app:tabMode="fixed"
+            app:tabRippleColor="@android:color/transparent"
+            app:tabSelectedTextColor="@color/main_blue_color"
+            app:tabTextAppearance="@style/TabLayoutStyle"
+            app:tabTextColor="@color/color_gray_text" />
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/smartRefreshLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/color_white">
+
+            <androidx.recyclerview.widget.RecyclerView android:overScrollMode="never"
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    </LinearLayout>
+
+
+</layout>

app/src/main/res/layout/item_event_list.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="model"
+            type="com.sjkj.appthreefloor_tsgz.bean.EventBean" />
+        <import type="android.view.View" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="12dp"
+        android:paddingTop="10dp"
+        android:paddingRight="12dp"
+        android:paddingBottom="10dp">
+
+        <ImageView
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="10dp"
+            android:error="@{@drawable/ic_baseline_event_note_24}"
+            android:imgUrl="@{model.img}"
+            android:placeholder="@{@drawable/ic_baseline_event_note_24}" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/title_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:text="@{model.title}"
+                    android:textColor="@color/color_black_text"
+                    android:textSize="14dp" />
+
+                <TextView
+                    android:id="@+id/type_tv"
+                    android:layout_width="77dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:lines="1"
+                    android:text="@{model.eventSource}"
+                    android:textColor="@color/main_blue_color"
+                    android:textSize="12dp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/content_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginTop="4dp"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:maxLines="3"
+                    android:text="@{model.content}"
+                    android:textColor="@color/color_gray_text"
+                    android:textSize="12dp" />
+
+                <TextView
+                    android:id="@+id/tv_cui"
+                    android:layout_width="77dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:ellipsize="end"
+                    android:gravity="right"
+                    android:lines="1"
+                    android:text="催办"
+                    android:textColor="@color/color_red"
+                    android:textSize="12dp" />
+            </LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>

base-lib/src/main/java/com/sjkj/base_lib/utils/AppTools.java

@@ -478,7 +478,8 @@ public class AppTools {
     }
 
     public static String getBaseUrl() {
-        return mmkv.decodeString("baseUrl", "http://218.27.3.115:15001/");
+       return mmkv.decodeString("baseUrl", "http://218.27.3.115:15001/");
+        //return mmkv.decodeString("baseUrl", "http://192.168.4.16:8080/");
     }
 
 //    public static final String GATEWAY_URL = "sooka-mobile";