事件详情

OneBottomNavigationBar/src/main/java/cn/onestravel/one/navigation/androidx/OneBottomNavigationBarX.kt

@@ -515,7 +515,6 @@ class OneBottomNavigationBar : View {
                 ta.getDimension(R.styleable.One_StyleBottomLayout_oneItemIconHeight, 0f).toInt()
             itemPadding =
                 ta.getDimension(R.styleable.One_StyleBottomLayout_oneItemPadding, 0f).toInt()
-            Log.d("zhr111", itemPadding.toString())
             itemFloatingPadding =
                 ta.getDimension(R.styleable.One_StyleBottomLayout_oneFloatingPadding, 0f).toInt()
             val xmlRes = ta.getResourceId(R.styleable.One_StyleBottomLayout_oneMenu, 0)

app/build.gradle

@@ -79,6 +79,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.5.30'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'org.greenrobot:eventbus:3.2.0'
 
 
 }

app/src/main/AndroidManifest.xml

@@ -138,6 +138,9 @@
             android:name="com.sjkj.appthreefloor_tsgz.activity.MyVideoPlayerActivity"
             android:screenOrientation="portrait" />
         <activity
+            android:name="com.sjkj.appthreefloor_tsgz.activity.ResourceDetailsActivity"
+            android:screenOrientation="portrait" />
+        <activity
             android:name="com.sjkj.appthreefloor_tsgz.activity.ExoPlayerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="unspecified" />

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

@@ -1,7 +1,6 @@
 package com.sjkj.appthreefloor_tsgz.activity;
 
 import android.graphics.drawable.Drawable;
-import android.util.Log;
 
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -105,6 +104,10 @@ public class EventDetailsActivity extends BaseActivity {
         });
     }
 
+
+    public void getMessage(){
+
+    }
     @Override
     public void initView() {
         super.initView();
@@ -117,7 +120,6 @@ public class EventDetailsActivity extends BaseActivity {
 
         // viewModel.eventCode.set(getIntent().getStringExtra("eventCode"));
         viewModel.eventId.set(getIntent().getStringExtra("id"));
-        Log.d("zhr111id=", viewModel.eventId.get());
         getTitleView().setText("事件详情");
         getTitleView().setTextColor(getResources().getColor(R.color.black));
         int drawableLeft = R.drawable.icon_back; // 替换为你的drawable资源ID

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

@@ -714,7 +714,6 @@ public class NewEventActivity extends BaseActivity {
                         createMediaFile(TYPE_VIDEO));
 
                 takeVideoIntent.putExtra(MediaStore.EXTRA_OUTPUT, capturedUri);
-                Log.d("zhrrr", "VideoUri: " + capturedUri.toString());
                 startActivityForResult(takeVideoIntent, 200);
             } catch (IOException e) {
                 e.printStackTrace();
@@ -744,7 +743,6 @@ public class NewEventActivity extends BaseActivity {
 
         // Get the path of the file created
         mCurrentPhotoPath = file.getAbsolutePath();
-        Log.d("zhr1111", "mCurrentPhotoPath: " + mCurrentPhotoPath);
         return file;
     }
 

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

@@ -0,0 +1,10 @@
+package com.sjkj.appthreefloor_tsgz.activity;
+
+import com.sjkj.base_lib.view.BaseActivity;
+
+public class ResourceDetailsActivity extends BaseActivity {
+    @Override
+    protected int initLayout() {
+        return 0;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.sjkj.appthreefloor_tsgz.adapter;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import com.sjkj.appthreefloor_tsgz.R;
+import com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean;
+import com.sjkj.appthreefloor_tsgz.databinding.ItemDetailsListBinding;
+import com.sjkj.base_lib.adapter.BaseRecAdapter;
+
+import java.util.List;
+
+public class EventDetailsAdapter extends BaseRecAdapter<EventDetailsBean.DeptsBean, ItemDetailsListBinding> {
+
+    public EventDetailsAdapter(Context context) {
+        super(context);
+    }
+
+    public EventDetailsAdapter(Context context, List<EventDetailsBean.DeptsBean> list) {
+        super(context, list);
+    }
+
+    @Override
+    protected int getLayoutResId(int viewType) {
+        return R.layout.item_details_list;
+    }
+
+    @Override
+    protected void onBindItem(ItemDetailsListBinding binding, EventDetailsBean.DeptsBean bean, int position) {
+        binding.setModel(bean);
+        binding.executePendingBindings();
+        if (position % 2 == 0) {
+            binding.llTitleBackground.setBackgroundColor(Color.parseColor("#FFFFFF"));
+        } else {
+            binding.llTitleBackground.setBackgroundColor(Color.parseColor("#F7F7F7"));
+        }
+        if (bean.getStatus().equals("20")) {
+            //待签收
+            binding.tvStatus.setTextColor(Color.parseColor("#04BF60"));
+            binding.tvStatus.setText("待签收");
+        } else if (bean.getStatus().equals("30")) {
+            //处理中
+            binding.tvStatus.setText("处理中");
+        } else if (bean.getStatus().equals("40")) {
+            //已完成
+            binding.tvStatus.setText("已完成");
+        } else if (bean.getStatus().equals("50")) {
+            //归档
+            binding.tvStatus.setText("归档");
+        }
+
+    }
+
+
+}

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

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.bean.ResourcesListBean;
+import com.sjkj.base_lib.utils.ToastUtils;
 
 import java.util.List;
 
@@ -20,7 +21,13 @@ public class RecycleviewLeftAdapter extends RecyclerView.Adapter<RecycleviewLeft
     private List<ResourcesListBean> mDatas;
     private Context mContext;
     private LayoutInflater inflater;
-
+    public void refreshList(List<ResourcesListBean> list) {
+        this.mDatas = list;
+        notifyDataSetChanged();
+        if (this.mDatas == null || this.mDatas.size() <= 0) {
+            ToastUtils.show("暂无更多数据");
+        }
+    }
     private int selectedPosition = 0;
 
     private OnItemClickListener mOnItemClickListener = null;

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

@@ -82,11 +82,13 @@ public class RecycleviewRightAdapter extends RecyclerView.Adapter<RecyclerView.V
         if (holder instanceof MyViewHolder) {
 
             MyViewHolder myViewHolder = ((MyViewHolder) holder);
-            myViewHolder.txt_tit.setText(mDatas.get(position).getName());
+            myViewHolder.txt_tit.setText(mDatas.get(position).getName() + "km");
             if (position == checkedPosition) {
                 ((MyViewHolder) holder).iv_checkbox.setVisibility(View.VISIBLE);
+                ((MyViewHolder) holder).txt_tit.setTextColor(mContext.getResources().getColor(R.color.event_color));
             } else {
                 ((MyViewHolder) holder).iv_checkbox.setVisibility(View.GONE);
+                ((MyViewHolder) holder).txt_tit.setTextColor(mContext.getResources().getColor(R.color.recyclerview_lefttext_select));
             }
             myViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                 @Override

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

@@ -0,0 +1,235 @@
+package com.sjkj.appthreefloor_tsgz.bean;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * EventDetailsBean class
+ * Generated by JSON to JavaBean converter
+ */
+public class EventDetailsBean {
+
+    private Object createBy;
+
+    private Object createName;
+
+    private String createTime;
+
+    private Object updateBy;
+
+    private Object updateName;
+
+    private Object updateTime;
+
+    private String remark;
+
+    private String id;
+
+    private String eventName;
+
+    private String eventType;
+
+    private Object eventTypeName;
+
+    private Object eventSource;
+
+    private String longitude;
+
+    private String latitude;
+
+    private String address;
+
+    private String status;
+
+    private Object reportTime;
+
+    private String url;
+
+    private List<DeptsBean> depts;
+
+    public List<DeptsBean> getDepts() {
+        return depts;
+    }
+
+    public void setDepts(List<DeptsBean> depts) {
+        this.depts = depts;
+    }
+
+    public Object getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Object createBy) {
+        this.createBy = createBy;
+    }
+
+    public Object getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(Object createName) {
+        this.createName = createName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public Object getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Object updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Object getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(Object updateName) {
+        this.updateName = updateName;
+    }
+
+    public Object getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Object updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    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 Object getEventTypeName() {
+        return eventTypeName;
+    }
+
+    public void setEventTypeName(Object eventTypeName) {
+        this.eventTypeName = eventTypeName;
+    }
+
+    public Object getEventSource() {
+        return eventSource;
+    }
+
+    public void setEventSource(Object eventSource) {
+        this.eventSource = eventSource;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public Object getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Object getReportTime() {
+        return reportTime;
+    }
+
+    public void setReportTime(Object reportTime) {
+        this.reportTime = reportTime;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+
+    public class DeptsBean{
+        private String createTime;
+        private String deptName;
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public String getDeptName() {
+            return deptName;
+        }
+
+        public void setDeptName(String deptName) {
+            this.deptName = deptName;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+
+        public void setStatus(String status) {
+            this.status = status;
+        }
+
+        private String status;
+
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.sjkj.appthreefloor_tsgz.bean;
+
+public class MessageEvent {
+    private String eventName;
+    private String eventType;
+    private String longitude;
+
+    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 getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    private String latitude;
+}

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

@@ -4,11 +4,7 @@ public class ResourcesListBean {
     private String name;
     private String value;
 
-    public ResourcesListBean(String name, String value) {
-        this.name = name;
-        this.value = value;
 
-    }
 
     public String getName() {
         return name;

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

@@ -10,23 +10,26 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.sjkj.appthreefloor_tsgz.R;
-import com.sjkj.appthreefloor_tsgz.adapter.EventCenterAdapter;
+import com.sjkj.appthreefloor_tsgz.adapter.EventDetailsAdapter;
 import com.sjkj.appthreefloor_tsgz.app.App;
-import com.sjkj.appthreefloor_tsgz.bean.NoticeListBean;
+import com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean;
+import com.sjkj.appthreefloor_tsgz.bean.MessageEvent;
 import com.sjkj.appthreefloor_tsgz.databinding.FragmentEventDetailsBinding;
 import com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel;
+import com.sjkj.appthreefloor_tsgz.net.EventChooseStatusRequest;
 import com.sjkj.appthreefloor_tsgz.net.EventDetailsRequest;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
+import com.sjkj.base_lib.utils.ToastUtils;
 import com.sjkj.base_lib.view.BaseFragment;
-
-import java.util.List;
+import com.sjkj.base_lib.weight.LoadingDialog;
 
 public class EventDetailsFragment extends BaseFragment {
     private FragmentEventDetailsBinding binding;
     private EventFargmentViewModel viewModel;
-    private EventCenterAdapter adapter;
+    private EventDetailsAdapter adapter;
     EventDetailsRequest eventDetailsRequest = new EventDetailsRequest(App.getInstance());
+    EventChooseStatusRequest chooseStatusRequest = new EventChooseStatusRequest(App.getInstance());
 
     @Override
     protected int initLayout() {
@@ -47,6 +50,8 @@ public class EventDetailsFragment extends BaseFragment {
         LinearLayoutManager manager = new LinearLayoutManager(getActivity());
         manager.setOrientation(RecyclerView.VERTICAL);
         binding.recyclerView.setLayoutManager(manager);
+        adapter = new EventDetailsAdapter(getActivity());
+        binding.recyclerView.setAdapter(adapter);
         viewModel.eventId.set(getActivity().getIntent().getStringExtra("id"));
 
 
@@ -55,23 +60,95 @@ public class EventDetailsFragment extends BaseFragment {
     @Override
     public void initListener() {
 
+        binding.tvCompleted.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ChangeStatus("30");
+            }
+        });
+        binding.tvFinish.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ChangeStatus("50");
+            }
+        });
+        binding.tvRefuse.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ChangeStatus("40");
+            }
+        });
+    }
+
+    private void ChangeStatus(String status) {
+        showLoadingDialog();
+        Params params = new Params();
+        params.put("eventId", viewModel.eventId.get());
+        params.put("id", getActivity().getIntent().getStringExtra("eventCode"));
+        params.put("status", status);
+        chooseStatusRequest.setParams(params);
+        chooseStatusRequest.execute(new ProcessErrorSubscriber() {
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                hideLoadingDialog(LoadingDialog.LOADING_FAILED);
+                if (e != null) {
+                    ToastUtils.show(e.getMessage());
+                }
+            }
+
+            @Override
+            public void onNext(Object o) {
+                super.onNext(o);
+                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
+                ToastUtils.show("操作成功");
+                getActivity().setResult(1000);
+                getActivity().finish();
+            }
+        });
+
+
     }
 
     @Override
     public void loadData() {
+        showLoadingDialog();
         Params params = new Params();
         params.put("id", viewModel.eventId.get());
 
         eventDetailsRequest.setParams(params);
-        eventDetailsRequest.execute(new ProcessErrorSubscriber<List<NoticeListBean>>() {
+        eventDetailsRequest.execute(new ProcessErrorSubscriber<EventDetailsBean>() {
             @Override
             public void onError(Throwable e) {
                 super.onError(e);
+                hideLoadingDialog(LoadingDialog.LOADING_FAILED);
+
             }
 
             @Override
-            public void onNext(List<NoticeListBean> list) {
-                super.onNext(list);
+            public void onNext(EventDetailsBean bean) {
+                super.onNext(bean);
+                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
+                if (bean != null && bean.getDepts().size() > 0) {
+                    viewModel.title.set(bean.getEventName());
+                    viewModel.time.set(bean.getCreateTime());
+                    viewModel.remark.set(bean.getRemark());
+                    MessageEvent event = new MessageEvent();
+                    event.setEventType(bean.getEventType());
+                    event.setEventName(bean.getEventName());
+                    event.setLatitude(bean.getLatitude());
+                    event.setLongitude(bean.getLongitude());
+                    viewModel.setMessage(event);
+                    adapter.refreshList(bean.getDepts());
+                    if (bean.getStatus().equals("20")) {
+                        //待签收
+                        binding.tvCompleted.setVisibility(View.VISIBLE);
+                        binding.tvRefuse.setVisibility(View.VISIBLE);
+                    } else if (bean.getStatus().equals("30")) {
+                        //处理中
+                        binding.tvFinish.setVisibility(View.VISIBLE);
+                    }
+                }
             }
         });
     }

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

@@ -2,24 +2,18 @@ package com.sjkj.appthreefloor_tsgz.fragment;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -46,7 +40,6 @@ import com.sjkj.appthreefloor_tsgz.databinding.FragmentEventBinding;
 import com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel;
 import com.sjkj.appthreefloor_tsgz.header.MyClassicsHeader;
 import com.sjkj.appthreefloor_tsgz.net.EventListRequest;
-import com.sjkj.appthreefloor_tsgz.utils.StatusBarUtil;
 import com.sjkj.base_lib.adapter.BaseRecAdapter;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
@@ -118,6 +111,7 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
             public void onItemClick(EventBean bean, int position) {
                 Intent intent = new Intent(getActivity(), EventDetailsActivity.class);
                 intent.putExtra("id", bean.getId());
+                intent.putExtra("eventCode", bean.getEventCode());
                 startActivityForResult(intent, 1000);
             }
         });
@@ -212,7 +206,7 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
                         String time = eventCenter.getCreateTime();
                         String type = eventCenter.getEventType();
                         String eventSource = eventCenter.getEventSource();
-                        String eventCode = eventCenter.getId();
+                        String eventCode = bean.getRows().get(i).getId();
 
 
                         EventBean eventBean = new EventBean(id, title, content, time, type, "", "", "", "", eventCode, eventSource);
@@ -398,4 +392,11 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
     }
 
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode==1000&&resultCode==1000){
+            requestListRefresh();
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.sjkj.appthreefloor_tsgz.fragment;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,28 +14,32 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.amap.api.maps.CameraUpdate;
 import com.amap.api.maps.CameraUpdateFactory;
+import com.amap.api.maps.model.BitmapDescriptorFactory;
 import com.amap.api.maps.model.CameraPosition;
 import com.amap.api.maps.model.LatLng;
+import com.amap.api.maps.model.MarkerOptions;
 import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
 import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.adapter.RecycleviewLeftAdapter;
 import com.sjkj.appthreefloor_tsgz.adapter.RecycleviewRightAdapter;
+import com.sjkj.appthreefloor_tsgz.app.App;
 import com.sjkj.appthreefloor_tsgz.bean.CommonDateBean;
 import com.sjkj.appthreefloor_tsgz.bean.ResourcesListBean;
 import com.sjkj.appthreefloor_tsgz.databinding.FragmentEventNearbyBinding;
 import com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel;
-import com.sjkj.appthreefloor_tsgz.utils.JsonUtil;
+import com.sjkj.appthreefloor_tsgz.net.EventDetailsResourcesListRequest;
+import com.sjkj.appthreefloor_tsgz.net.EventResourcesListRequest;
 import com.sjkj.base_lib.app.AppManager;
-import com.sjkj.base_lib.utils.Constants;
+import com.sjkj.base_lib.entity.Params;
+import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
+import com.sjkj.base_lib.utils.CommonUtils;
+import com.sjkj.base_lib.utils.LocationUtils;
+import com.sjkj.base_lib.utils.MapUtils;
 import com.sjkj.base_lib.utils.ToastUtils;
 import com.sjkj.base_lib.view.BaseFragment;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,7 +53,13 @@ public class EventNearByFragment extends BaseFragment {
     private List<CommonDateBean> resourceSelectList = new ArrayList<>();
     ResourcesListBean resourcesListBean;
     CommonDateBean commonDateBean;
-    private List<String> distance = new ArrayList<>();
+    private List<String> distanceList = new ArrayList<>();
+    private EventDetailsResourcesListRequest ResourcesListRequest = new EventDetailsResourcesListRequest(App.getInstance());
+    private EventResourcesListRequest eventResourcesListRequest = new EventResourcesListRequest(App.getInstance());
+    List<CommonDateBean> DistancelistChoose = new ArrayList<>();
+    private Handler handler = new Handler();
+    private String tagVale = "";
+    private String tagValeText = "";
 
     @Override
     protected int initLayout() {
@@ -68,10 +79,57 @@ public class EventNearByFragment extends BaseFragment {
         binding.mapView.getMap().getUiSettings().setZoomControlsEnabled(true);
         binding.mapView.getMap().getUiSettings().setMyLocationButtonEnabled(false);
         //binding.mapView.getMap().moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(43.911535, 125.324667), zoomValue));
-        changeCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition(new LatLng(Constants.DEFAULT_LOCATION_LAT, Constants.DEFAULT_LOCATION_LNG, true), 10, 30, 30)));
+        viewModel.getMessage().observe(getViewLifecycleOwner(), message -> {
+            // 处理消息
+            binding.tvTitle.setText(message.getEventName());
+            viewModel.eventType.set(message.getEventType());
+
+            viewModel.latitude.set(Double.parseDouble(message.getLatitude()));
+            viewModel.longitude.set(Double.parseDouble(message.getLongitude()));
+            changeCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition(new LatLng(Double.parseDouble(message.getLatitude()), Double.parseDouble(message.getLongitude()), true), 10, 30, 30)));
+            LoadListData(message.getEventType(), viewModel.latitude.get(), viewModel.longitude.get());
+        });
+
         return binding.getRoot();
     }
 
+    private void LoadListData(String eventType, Double lat, Double log) {
+
+        Params params = new Params();
+        params.put("typeId", eventType);
+        ResourcesListRequest.setParams(params);
+        ResourcesListRequest.execute(new ProcessErrorSubscriber<List<ResourcesListBean>>() {
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+            }
+
+            @Override
+            public void onNext(List<ResourcesListBean> list) {
+                super.onNext(list);
+                if (list != null && list.size() > 0) {
+                    //多加一条
+                    ResourcesListBean bean = new ResourcesListBean();
+                    bean.setName("范围选择");
+                    bean.setValue("zidingyi");
+                    resourceSelectTextList.add(bean);
+
+                    for (int i = 0; i < list.size(); i++) {
+                        resourcesListBean = new ResourcesListBean();
+                        resourcesListBean.setValue(list.get(i).getValue());
+                        resourcesListBean.setName(list.get(i).getName());
+                        resourceSelectTextList.add(resourcesListBean);
+
+                    }
+                    leftAdapter.refreshList(resourceSelectTextList);
+
+                    // Log.d("zhr1121", resourceSelectTextList.get(1).getName());
+                    LoadRightList(true, resourceSelectTextList.get(1).getValue(), resourceSelectTextList.get(1).getName(), lat, log, DistancelistChoose.get(rightAdapter.getCheckedPosition()).getName());
+                }
+            }
+        });
+    }
+
     /**
      * 根据动画按钮状态，调用函数animateCamera或moveCamera来改变可视区域
      */
@@ -118,64 +176,24 @@ public class EventNearByFragment extends BaseFragment {
     @Override
     public void initView() {
         requestPermissionsLocation();
-        distance.add("5km");
-        distance.add("10km");
-        distance.add("15km");
-        distance.add("20km");
-        distance.add("25km");
-        distance.add("30km");
-        distance.add("35km");
-        distance.add("40km");
-        distance.add("45km");
-        distance.add("50km");
-        //多加一条
-        resourceSelectTextList.add(new ResourcesListBean("范围选择", "zidingyi"));
-        JSONArray jsonArray = new JSONArray();
-        String jsonString = JsonUtil.loadJSONFromAsset(getActivity(), "json_list.json");
-        try {
-            JSONObject jsonObject = new JSONObject(jsonString);
-            jsonArray = jsonObject.getJSONArray("data");
-            // 从这里你可以访问你的JSON数据，例如：jsonObject.getString("key");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        for (int i = 0; i < jsonArray.length(); i++) {
-
-            try {
-                JSONObject obj = jsonArray.getJSONObject(i);
-                resourcesListBean = new ResourcesListBean(obj.getString("name"), obj.getString("value"));
-                resourceSelectTextList.add(resourcesListBean);
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        }
-
-//        //资源列表
-
-        JSONArray jsonArray2 = new JSONArray();
-        String jsonString2 = JsonUtil.loadJSONFromAsset(getActivity(), "json_list2.json");
-        try {
-            JSONObject jsonObject2 = new JSONObject(jsonString2);
-            jsonArray2 = jsonObject2.getJSONArray("data");
-        } catch (JSONException e) {
-            e.printStackTrace();
+        distanceList.add("5");
+        distanceList.add("10");
+        distanceList.add("15");
+        distanceList.add("20");
+        distanceList.add("25");
+        distanceList.add("30");
+        distanceList.add("35");
+        distanceList.add("40");
+        distanceList.add("45");
+        distanceList.add("50");
+
+        for (int i = 0; i < distanceList.size(); i++) {
+            commonDateBean = new CommonDateBean();
+            commonDateBean.setType(1);
+            commonDateBean.setName(distanceList.get(i));
+            DistancelistChoose.add(commonDateBean);
         }
-        for (int i = 0; i < jsonArray2.length(); i++) {
 
-            try {
-                JSONObject obj = jsonArray2.getJSONObject(i);
-                commonDateBean = new CommonDateBean();
-                commonDateBean.setDistance(obj.getString("distance"));
-                commonDateBean.setId(obj.getString("id"));
-                commonDateBean.setLatitude(obj.getString("latitude"));
-                commonDateBean.setLongitude(obj.getString("longitude"));
-                commonDateBean.setName(obj.getString("name"));
-                commonDateBean.setType(2);
-                resourceSelectList.add(commonDateBean);
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
-        }
 
         //左边recyclerview
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
@@ -188,15 +206,8 @@ public class EventNearByFragment extends BaseFragment {
         binding.recyclerViewRight.smoothScrollToPosition(0);
         LinearLayoutManager layoutManagerRight = new LinearLayoutManager(getActivity());
         binding.recyclerViewRight.setLayoutManager(layoutManagerRight);
-        List<CommonDateBean> list = new ArrayList<>();
-        for (int i = 0; i < distance.size(); i++) {
-            commonDateBean = new CommonDateBean();
-            commonDateBean.setType(1);
-            commonDateBean.setName(distance.get(i));
-            list.add(commonDateBean);
 
-        }
-        rightAdapter = new RecycleviewRightAdapter(getActivity(), list);
+        rightAdapter = new RecycleviewRightAdapter(getActivity(), DistancelistChoose);
         binding.recyclerViewRight.setAdapter(rightAdapter);
         rightAdapter.setCheckedPosition(0);
         rightAdapter.setOnItemClickListener(new RecycleviewRightAdapter.OnItemClickListener() {
@@ -205,7 +216,7 @@ public class EventNearByFragment extends BaseFragment {
                 if (type == rightAdapter.TYPE_ITEM_ONE) {
                     rightAdapter.setCheckedPosition(position);
                 } else {
-                    Log.d("zhr1111", bean.getName());
+                    Log.d("zhr1111", bean.getName() + "===" + bean.getId() + tagVale + tagValeText);
                 }
 
             }
@@ -230,30 +241,154 @@ public class EventNearByFragment extends BaseFragment {
     private void LoadZiYuanData(ResourcesListBean resourcesListBean) {
         if (resourcesListBean.getValue().equals("zidingyi")) {
             List<CommonDateBean> list = new ArrayList<>();
-            for (int i = 0; i < distance.size(); i++) {
+            for (int i = 0; i < distanceList.size(); i++) {
                 commonDateBean = new CommonDateBean();
                 commonDateBean.setType(1);
-                commonDateBean.setName(distance.get(i));
+                commonDateBean.setName(distanceList.get(i));
                 list.add(commonDateBean);
 
             }
             rightAdapter.refush(list);
         } else {
-            rightAdapter.refush(resourceSelectList);
+
+            //根据左侧选中  加载右侧数据
+            LoadRightList(false, resourcesListBean.getValue(), resourcesListBean.getName(), viewModel.latitude.get(), viewModel.longitude.get(), DistancelistChoose.get(rightAdapter.getCheckedPosition()).getName());
+        }
+
+
+    }
+
+    private void LoadRightList(boolean isFirst, String tag, String tagText, Double latitude, Double longitude, String distance) {
+        tagVale = tag;
+        tagValeText = tagText;
+        if (isFirst) {
+            DistancelistChoose.clear();
+            for (int i = 0; i < distanceList.size(); i++) {
+                commonDateBean = new CommonDateBean();
+                commonDateBean.setType(1);
+                commonDateBean.setName(distanceList.get(i));
+                DistancelistChoose.add(commonDateBean);
+            }
+
         }
+        clear();//清除上一个图层
+        resourceSelectList.clear();
+        Params params = new Params();
+        params.put("tag", tag);
+        params.put("longitude", longitude);
+        params.put("latitude", latitude);
+        params.put("distance", distance);
+        eventResourcesListRequest.setParams(params);
+        eventResourcesListRequest.execute(new ProcessErrorSubscriber<List<CommonDateBean>>() {
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+            }
+
+            @Override
+            public void onNext(List<CommonDateBean> list) {
+                super.onNext(list);
+                if (list != null && list.size() > 0) {
+
+                    for (int i = 0; i < list.size(); i++) {
+
+                        commonDateBean = new CommonDateBean();
+                        commonDateBean.setDistance(list.get(i).getDistance());
+                        commonDateBean.setId(list.get(i).getId());
+                        commonDateBean.setLatitude(list.get(i).getLatitude());
+                        commonDateBean.setLongitude(list.get(i).getLongitude());
+                        commonDateBean.setName(list.get(i).getName());
+                        commonDateBean.setType(2);
+                        resourceSelectList.add(commonDateBean);
+                    }
+                    if (isFirst) {
+                        rightAdapter.refush(DistancelistChoose);
+                    } else {
+                        rightAdapter.refush(resourceSelectList);
+                    }
 
-        rightAdapter.notifyDataSetChanged();
+                    rightAdapter.notifyDataSetChanged();
+
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            handler.post(new Runnable() {
+                                @Override
+                                public void run() {
+                                    try {
+                                        for (CommonDateBean newList : list) {
+                                            if (CommonUtils.checkLongitudeLatitude(newList.getLongitude(), newList.getLatitude())) {
+                                                MapUtils.GPS gps = MapUtils.gps84_To_Gcj02(Double.parseDouble(newList.getLatitude()), Double.parseDouble(newList.getLongitude()));
+                                                if (gps != null) {
+                                                    setLocationIcon(gps, newList.getId(), newList.getName() + "", newList);
+                                                }
+                                            }
+                                        }
+                                    } catch (NumberFormatException e) {
+                                        e.printStackTrace();
+                                    }
+                                    try {
+                                        changeCamera(CameraUpdateFactory.newCameraPosition(new CameraPosition(new LatLng(Double.parseDouble(list.get(list.size() - 1).getLatitude()), Double.parseDouble(list.get(list.size() - 1).getLongitude()), true), 10, 30, 30)));
+                                    } catch (NumberFormatException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            });
+                        }
+                    }).start();
+                } else {
+                    //Log.d("zhr112", (leftAdapter.getSelectedPosition() == 0) + "");
+                    if (leftAdapter.getSelectedPosition() == 0) {
+                        rightAdapter.refush(DistancelistChoose);
+                    } else {
+                        rightAdapter.refush(new ArrayList<CommonDateBean>());
+                    }
+
+                    ToastUtils.show("暂无数据");
+                }
+            }
+        });
     }
 
     @Override
     public void initListener() {
 
+        binding.ivEventLocation.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                binding.ivLocation.setBackground(getResources().getDrawable(R.drawable.icon_current));
+                binding.ivEventLocation.setBackground(getResources().getDrawable(R.drawable.icon_event_current_select));
+                //根据事件的经纬度
+                LoadRightList(leftAdapter.getSelectedPosition() == 0, tagVale, tagValeText, viewModel.latitude.get(), viewModel.longitude.get(), DistancelistChoose.get(rightAdapter.getCheckedPosition()).getName());
+            }
+        });
+        binding.ivLocation.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                binding.ivLocation.setBackground(getResources().getDrawable(R.drawable.icon_current_select));
+                binding.ivEventLocation.setBackground(getResources().getDrawable(R.drawable.icon_event_current));
+                LocationUtils.getInstance().startLocation(true, new LocationUtils.OnLocationListener() {
+                    @Override
+                    public void onLocationChanged(double lat, double lng, String address, int code) {
+
+                        if (CommonUtils.checkLongitudeLatitude(lng + "", lat + "")) {
+                            //根据当前经纬度
+                            LoadRightList(leftAdapter.getSelectedPosition() == 0, tagVale, tagValeText, lat, lng, DistancelistChoose.get(rightAdapter.getCheckedPosition()).getName());
+
+                        } else {
+                            ToastUtils.show("定位失败，请检查定位权限或者稍后重试");
+                        }
+                    }
+
+
+                });
+            }
+        });
 
     }
 
     @Override
     public void loadData() {
-
     }
 
     @Override
@@ -284,6 +419,25 @@ public class EventNearByFragment extends BaseFragment {
     public void onDestroyView() {
         super.onDestroyView();
         binding.mapView.onDestroy();
+        handler.removeCallbacksAndMessages(null);
+
     }
 
+    private void clear() {
+        if (binding.mapView.getMap() != null)
+            binding.mapView.getMap().clear();
+    }
+
+    private void setLocationIcon(MapUtils.GPS gps, String id, String type, CommonDateBean bean) {
+        MarkerOptions options = new MarkerOptions();
+        options.position(new LatLng(gps.getLat(), gps.getLon()));
+        options.visible(true);
+        options.snippet(id);
+        options.infoWindowEnable(false);
+        //options.title(bean.getName());
+        options.icon(BitmapDescriptorFactory.fromResource(R.drawable.icon_agriculture_cooperatives));//设置图标
+        binding.mapView.getMap().addMarker(options);
+
+
+    }
 }

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

@@ -1,35 +1,22 @@
 package com.sjkj.appthreefloor_tsgz.fragment;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.ColorUtils;
 import androidx.lifecycle.ViewModelProvider;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.bumptech.glide.request.RequestOptions;
-import com.gyf.immersionbar.ImmersionBar;
 import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.activity.ExoPlayerActivity;
 import com.sjkj.appthreefloor_tsgz.activity.MonitoringCenterActivity;
 import com.sjkj.appthreefloor_tsgz.activity.MyVideoPlayerActivity;
 import com.sjkj.appthreefloor_tsgz.activity.WaterCraneResourcesActivity;
 import com.sjkj.appthreefloor_tsgz.app.App;
-import com.sjkj.appthreefloor_tsgz.bean.BannerDataBean;
-import com.sjkj.appthreefloor_tsgz.bean.EventCenterListBean;
 import com.sjkj.appthreefloor_tsgz.bean.NoticeListBean;
 import com.sjkj.appthreefloor_tsgz.databinding.FragmentMainBinding;
-import com.sjkj.appthreefloor_tsgz.net.BannerRequest;
 import com.sjkj.appthreefloor_tsgz.net.HomeNoticeListRequest;
-import com.sjkj.appthreefloor_tsgz.utils.StatusBarUtil;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
 import com.sjkj.base_lib.utils.CommonUtils;
@@ -46,7 +33,7 @@ import java.util.List;
 public class MainFragment extends BaseFragment {
     private FragmentMainBinding binding;
     private MainViewModel viewModel;
-    private BannerRequest bannerRequest = new BannerRequest(App.getInstance());
+    //private BannerRequest bannerRequest = new BannerRequest(App.getInstance());
     private HomeNoticeListRequest homeNoticeListRequest = new HomeNoticeListRequest(App.getInstance());
 
     private List<String> banners;
@@ -126,53 +113,67 @@ public class MainFragment extends BaseFragment {
     @Override
     public void loadData() {
         getNoticelist();
-        bannerRequest.setParams(new Params());
-        bannerRequest.execute(new ProcessErrorSubscriber<BannerDataBean>() {
+        ArrayList imgs = new ArrayList();
+        imgs.add(R.drawable.icon_banner1);
+        imgs.add(R.drawable.icon_banner2);
+
+        binding.banner.setLoopTime(1500);
+        binding.banner.setIndicator(new CircleIndicator(getActivity()));
+        //binding.banner.setBannerGalleryEffect(50, 10);
+        binding.banner.setAdapter(new BannerImageAdapter<Integer>(imgs) {
             @Override
-            public void onError(Throwable e) {
-                super.onError(e);
+            public void onBindView(BannerImageHolder holder, Integer data, int position, int size) {
+                holder.imageView.setImageResource((Integer) imgs.get(position));
             }
-
-            @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) {
-                            imgs.add("https://photo.tuchong.com/250829/f/31548923.jpg");
-                            imgs.add("https://photo.tuchong.com/46728/f/20138526.jpg");
-                            imgs.add("https://photo.tuchong.com/392724/f/16858773.jpg");
-                            imgs.add("https://photo.tuchong.com/408963/f/18401047.jpg");
-
-                            binding.banner.setAdapter(new BannerImageAdapter<String>(imgs) {
-                                @Override
-                                public void onBindView(BannerImageHolder holder, String data, int position, int size) {
-                                    //图片加载自己实现
-                                    Glide.with(holder.itemView)
-                                            .load(data)
-                                            .apply(RequestOptions.bitmapTransform(new RoundedCorners(30)))
-                                            .into(holder.imageView);
-                                }
-                            });
-                            binding.banner.setLoopTime(1500);
-                            binding.banner.setIndicator(new CircleIndicator(getActivity()));
-                            //binding.banner.setIndicator(new CircleIndicator(getActivity()));
-                            //添加画廊效果
-                            //binding.banner.setBannerGalleryEffect(50, 10);
-                            //binding.banner.setBannerGalleryMZ(20);
-                        }
-                    }
-
-                }
-            }
-        });
+        }).start();
+
+//        bannerRequest.setParams(new Params());
+//        bannerRequest.execute(new ProcessErrorSubscriber<BannerDataBean>() {
+//            @Override
+//            public void onError(Throwable e) {
+//                super.onError(e);
+//            }
+//
+//            @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) {
+//                            imgs.add("https://photo.tuchong.com/250829/f/31548923.jpg");
+//                            imgs.add("https://photo.tuchong.com/46728/f/20138526.jpg");
+//                            imgs.add("https://photo.tuchong.com/392724/f/16858773.jpg");
+//                            imgs.add("https://photo.tuchong.com/408963/f/18401047.jpg");
+//
+//                            binding.banner.setAdapter(new BannerImageAdapter<String>(imgs) {
+//                                @Override
+//                                public void onBindView(BannerImageHolder holder, String data, int position, int size) {
+//                                    //图片加载自己实现
+//                                    Glide.with(holder.itemView)
+//                                            .load(data)
+//                                            .apply(RequestOptions.bitmapTransform(new RoundedCorners(30)))
+//                                            .into(holder.imageView);
+//                                }
+//                            });
+//                            binding.banner.setLoopTime(1500);
+//                            binding.banner.setIndicator(new CircleIndicator(getActivity()));
+//                            //binding.banner.setIndicator(new CircleIndicator(getActivity()));
+//                            //添加画廊效果
+//                            //binding.banner.setBannerGalleryEffect(50, 10);
+//                            //binding.banner.setBannerGalleryMZ(20);
+//                        }
+//                    }
+//
+//                }
+//            }
+//        });
     }
 
     private void getNoticelist() {

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

@@ -3,56 +3,39 @@ package com.sjkj.appthreefloor_tsgz.fragment.viewModel;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
 import androidx.databinding.ObservableInt;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 
 import com.sjkj.appthreefloor_tsgz.bean.EventBean;
+import com.sjkj.appthreefloor_tsgz.bean.MessageEvent;
 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> eventType = new ObservableField<>("");
+    public ObservableField<String> remark = 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<>();
 
@@ -60,4 +43,14 @@ public class EventFargmentViewModel extends BaseViewModel {
         singleLiveData.setValue(null);
     }
 
+    private MutableLiveData<MessageEvent> message = new MutableLiveData<>();
+
+    public LiveData<MessageEvent> getMessage() {
+        return message;
+    }
+
+    public void setMessage(MessageEvent message) {
+        this.message.setValue(message);
+    }
+
 }

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

@@ -166,7 +166,6 @@ public class LoginActivity extends BaseLoginActivity {
             public void onError(Throwable e) {
                 super.onError(e);
                 hideLoadingDialog(LoadingDialog.LOADING_FAILED);
-                Log.d("zhr111",e.getMessage());
                 Intent intent = new Intent(AppManager.getAppManager().currentActivity(), MainActivity.class);
                 AppManager.getAppManager().currentActivity().startActivity(intent);
                 hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);

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

@@ -0,0 +1,50 @@
+package com.sjkj.appthreefloor_tsgz.net;
+
+import android.content.Context;
+
+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 rx.Observable;
+import rx.functions.Func1;
+
+/**
+ * 改变事件状态
+ */
+public class EventChooseStatusRequest 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 EventChooseStatusRequest(Context context) {
+        this.context = context;
+        service = RetrofitFactory.getRetrofit(AppTools.getBaseUrl()).create(RetrofitService.class);
+    }
+
+    @Override
+    protected Observable buildUseCaseObservable() {
+        return service.EventEdit(params).flatMap(new Func1<ResponseBean<Object>, Observable<Object>>() {
+            @Override
+            public Observable<Object> call(ResponseBean<Object> 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/EventDetailsRequest.java

@@ -2,7 +2,7 @@ package com.sjkj.appthreefloor_tsgz.net;
 
 import android.content.Context;
 
-import com.sjkj.appthreefloor_tsgz.bean.NoticeListBean;
+import com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.entity.ResponseBean;
 import com.sjkj.base_lib.net.RetrofitFactory;
@@ -39,9 +39,9 @@ public class EventDetailsRequest extends UseCase {
 
     @Override
     protected Observable buildUseCaseObservable() {
-        return service.eventDetails(params).flatMap(new Func1<ResponseBean<List<NoticeListBean>>, Observable<List<NoticeListBean>>>() {
+        return service.eventDetails(params).flatMap(new Func1<ResponseBean<EventDetailsBean>, Observable<EventDetailsBean>>() {
             @Override
-            public Observable<List<NoticeListBean>> call(ResponseBean<List<NoticeListBean>> responseBean) {
+            public Observable<EventDetailsBean> call(ResponseBean<EventDetailsBean> responseBean) {
                 if (!ResponseBean.CODE_SUCCESS.
                         equals(responseBean.getCode())) {
                     return Observable.error(new BusinessException(responseBean.getMsg()));

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

@@ -0,0 +1,53 @@
+package com.sjkj.appthreefloor_tsgz.net;
+
+import android.content.Context;
+
+import com.sjkj.appthreefloor_tsgz.bean.ResourcesListBean;
+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 EventDetailsResourcesListRequest 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 EventDetailsResourcesListRequest(Context context) {
+        this.context = context;
+        service = RetrofitFactory.getRetrofit(AppTools.getBaseUrl()).create(RetrofitService.class);
+    }
+
+    @Override
+    protected Observable buildUseCaseObservable() {
+        return service.eventDetailsResourcesList(params).flatMap(new Func1<ResponseBean<List<ResourcesListBean>>, Observable<List<ResourcesListBean>>>() {
+            @Override
+            public Observable<List<ResourcesListBean>> call(ResponseBean<List<ResourcesListBean>> 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/EventResourcesListRequest.java

@@ -0,0 +1,53 @@
+package com.sjkj.appthreefloor_tsgz.net;
+
+import android.content.Context;
+
+import com.sjkj.appthreefloor_tsgz.bean.CommonDateBean;
+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;
+
+/**
+ * 事件详情中资源列表-带name
+ */
+public class EventResourcesListRequest 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 EventResourcesListRequest(Context context) {
+        this.context = context;
+        service = RetrofitFactory.getRetrofit(AppTools.getBaseUrl()).create(RetrofitService.class);
+    }
+
+    @Override
+    protected Observable buildUseCaseObservable() {
+        return service.resourceList(params).flatMap(new Func1<ResponseBean<List<CommonDateBean>>, Observable<List<CommonDateBean>>>() {
+            @Override
+            public Observable<List<CommonDateBean>> call(ResponseBean<List<CommonDateBean>> 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

@@ -3,12 +3,15 @@ package com.sjkj.appthreefloor_tsgz.net;
 import com.sjkj.appthreefloor_tsgz.bean.AppEventBean;
 import com.sjkj.appthreefloor_tsgz.bean.AppEventThreeBean;
 import com.sjkj.appthreefloor_tsgz.bean.BannerDataBean;
+import com.sjkj.appthreefloor_tsgz.bean.CommonDateBean;
 import com.sjkj.appthreefloor_tsgz.bean.DailyBean;
 import com.sjkj.appthreefloor_tsgz.bean.EventCenterListBean;
+import com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean;
 import com.sjkj.appthreefloor_tsgz.bean.FileBean;
 import com.sjkj.appthreefloor_tsgz.bean.LogInRsaBean;
 import com.sjkj.appthreefloor_tsgz.bean.NoticeListBean;
 import com.sjkj.appthreefloor_tsgz.bean.ResourceVisualizationBean;
+import com.sjkj.appthreefloor_tsgz.bean.ResourcesListBean;
 import com.sjkj.appthreefloor_tsgz.bean.VersionBean;
 import com.sjkj.base_lib.camera.dh.bean.CameraBean;
 import com.sjkj.base_lib.entity.Params;
@@ -30,9 +33,21 @@ public interface RetrofitService {
     @POST("app/login")
     Observable<ResponseBean<Object>> login(@Body Params params);
 
+    //事件详情中资源列表
+    @GET("data/list")
+    Observable<ResponseBean<List<ResourcesListBean>>> eventDetailsResourcesList(@QueryMap Params params);
+
+    //事件详情中资源列表--带name
+    @GET("data/resourceList")
+    Observable<ResponseBean<List<CommonDateBean>>> resourceList(@QueryMap Params params);
+
+    //事件详情-改变事件状态
+    @POST("event/eventFlow")
+    Observable<ResponseBean<Object>> EventEdit(@Body Params params);
+
     //事件详情
-    @GET("event/getEventById")
-    Observable<ResponseBean<List<NoticeListBean>>> eventDetails(@QueryMap Params params);
+    @GET("event/getEventByEventId")
+    Observable<ResponseBean<EventDetailsBean>> eventDetails(@QueryMap Params params);
 
     //首页-通知公告
     @GET("app/noticeList")

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#F8F8F8"/> <!-- 背景颜色 -->
+    <solid android:color="@color/white"/> <!-- 背景颜色 -->
     <corners
         android:topLeftRadius="0dp"
         android:topRightRadius="0dp"

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

@@ -43,6 +43,7 @@
                         android:ellipsize="end"
                         android:lineSpacingExtra="2dp"
                         android:maxLines="2"
+                        android:text="@{viewModel.title}"
                         android:textColor="@color/black"
                         android:textSize="17dp" />
 
@@ -56,6 +57,7 @@
                         android:gravity="center_vertical">
 
                         <TextView
+                            android:visibility="gone"
                             android:id="@+id/tv_completed"
                             android:layout_width="70dp"
                             android:layout_height="30dp"
@@ -68,30 +70,33 @@
                         </TextView>
 
                         <TextView
+                            android:visibility="gone"
                             android:id="@+id/tv_refuse"
                             android:layout_width="70dp"
                             android:layout_height="30dp"
                             android:layout_marginRight="10dp"
                             android:background="@drawable/bg_event_refuse"
                             android:gravity="center_horizontal|center_vertical"
-                            android:text="签收"
+                            android:text="拒签"
                             android:textColor="#FD6350">
 
                         </TextView>
 
                         <TextView
+                            android:visibility="gone"
                             android:id="@+id/tv_finish"
                             android:layout_width="70dp"
                             android:layout_height="30dp"
                             android:background="@drawable/bg_event_finish"
                             android:gravity="center_horizontal|center_vertical"
-                            android:text="签收"
+                            android:text="办结"
                             android:textColor="#EDAC00">
 
                         </TextView>
 
                         <TextView
                             android:layout_width="match_parent"
+                            android:text="@{viewModel.time}"
                             android:layout_height="30dp"
                             android:gravity="right|center_vertical"
                             android:textColor="@color/coler_evnet" />
@@ -163,6 +168,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/ll_conten"
+                    android:minHeight="120dp"
                     android:layout_marginLeft="15dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="15dp"
@@ -170,6 +176,7 @@
 
                     <TextView
 
+                        android:text="@{viewModel.remark}"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:lineSpacingExtra="2dp"

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

@@ -33,7 +33,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
                 android:layout_margin="15dp"
-                android:background="@drawable/icon_event_current_select" />
+                android:background="@drawable/icon_current" />
         </FrameLayout>
 
         <LinearLayout
@@ -71,33 +71,36 @@
                     android:layout_height="100dp">
 
                     <TextView
+                        android:id="@+id/tv_title"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_centerInParent="true"
                         android:layout_marginLeft="15dp"
                         android:layout_marginTop="15dp"
                         android:layout_marginBottom="15dp"
-                        android:layout_toLeftOf="@+id/ic_event_location"
+                        android:layout_toLeftOf="@+id/iv_event_location"
                         android:ellipsize="end"
                         android:gravity="center_vertical"
                         android:lineSpacingExtra="1dp"
                         android:maxLines="2"
-                        android:text="林区火险等级三维监测与预警响应林区火险等级"
                         android:textColor="@color/black"
                         android:textSize="17dp">
 
                     </TextView>
 
                     <ImageView
-                        android:id="@+id/ic_event_location"
+                        android:id="@+id/iv_event_location"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_alignParentBottom="true"
                         android:layout_centerVertical="true"
-                        android:layout_margin="15dp"
-                        android:background="@drawable/icon_event_current" />
+                        android:layout_marginStart="15dp"
+                        android:layout_marginTop="15dp"
+                        android:layout_marginEnd="15dp"
+                        android:layout_marginBottom="15dp"
+                        android:background="@drawable/icon_event_current_select" />
                 </RelativeLayout>
 
 
@@ -115,8 +118,9 @@
                     <com.sjkj.appthreefloor_tsgz.weight.CustomRecycleView
                         android:id="@+id/recyclerView_left"
                         android:layout_width="0dp"
+                        android:background="#F7F7F7"
                         android:layout_height="match_parent"
-                        android:layout_weight="1"
+                        android:layout_weight="1.2"
                         android:isScrollContainer="false"
                         android:tag="ScrollController" />
 
@@ -125,7 +129,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="5dp"
-                        android:layout_weight="3"
+                        android:layout_weight="2.8"
                         android:background="@color/white"
                         android:scrollbars="vertical" />
                 </LinearLayout>

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

@@ -21,7 +21,7 @@
             android:maxLines="1"
             android:text=""
             android:textColor="#4D4D4D"
-            android:textSize="16dp" />
+            android:textSize="14dp" />
 
         <ImageView
             android:id="@+id/iv_checkbox"

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

@@ -3,6 +3,8 @@
     android:layout_height="wrap_content">
 
     <RelativeLayout
+        android:background="@color/white"
+        android:layout_marginTop="5dp"
         android:id="@+id/item_layout"
         android:layout_width="match_parent"
         android:layout_height="55dp">
@@ -26,7 +28,7 @@
                 android:gravity="left|bottom"
                 android:maxLines="1"
                 android:textColor="#4D4D4D"
-                android:textSize="16dp" />
+                android:textSize="14dp" />
 
             <TextView
 
@@ -40,7 +42,7 @@
                 android:gravity="left|top"
                 android:maxLines="1"
                 android:textColor="#4D4D4D"
-                android:textSize="14dp" />
+                android:textSize="12dp" />
         </LinearLayout>
 
 

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/classsify_tv"
-    android:layout_width="100dp"
+    android:layout_width="match_parent"
     android:layout_height="44dp"
     android:gravity="center"
     android:paddingTop="5dp"
     android:paddingBottom="5dp"
     android:text="林业"
-    android:textSize="16dp" />
+    android:textSize="14dp" />

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

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="model"
+            type="com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean.DeptsBean" />
+
+        <import type="android.view.View" />
+    </data>
+
+    <LinearLayout
+        android:id="@+id/ll_title_background"
+        android:layout_width="match_parent"
+        android:gravity="center_vertical"
+        android:layout_height="44dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:text="@{model.deptName}"
+            android:textColor="#181818"
+            android:textSize="14dp">
+
+        </TextView>
+
+        <TextView
+            android:id="@+id/tv_status"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textSize="14dp"
+            android:gravity="center_horizontal">
+
+        </TextView>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:text="@{model.createTime}"
+            android:textColor="#181818"
+            android:textSize="14dp">
+
+        </TextView>
+    </LinearLayout>
+
+</layout>

base-lib/src/main/java/com/sjkj/base_lib/map/ChooseMapActivity.java

@@ -271,7 +271,6 @@ public class ChooseMapActivity extends BaseActivity implements GeoFenceListener,
                 address = amapLocation.getAddress();
             } else {
                 String errText1 = "定位失败," + amapLocation.getErrorCode() + ": " + amapLocation.getErrorInfo();
-                Log.d("ZHR1231", errText1);
                 String errText = "定位失败，请重试";
                 ToastUtils.show(errText);
                 //   tvResult.setVisibility(View.VISIBLE);

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

@@ -478,7 +478,7 @@ public class AppTools {
     }
 
     public static String getBaseUrl() {
-       return mmkv.decodeString("baseUrl", "http://192.168.4.16:8080/api/");
+       return mmkv.decodeString("baseUrl", "http://192.168.4.82:8080/api/");
         //return mmkv.decodeString("baseUrl", "http://192.168.4.16:8080/");
     }