From 8a8117875f65059c1994c260d2a55b187e79205d Mon Sep 17 00:00:00 2001 From: wds Date: Mon, 2 Aug 2021 18:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B91=E7=BA=A7=E7=9A=84=E9=83=A8?= =?UTF-8?q?=E5=88=86bug=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E6=96=B9=E5=90=91=E6=97=8B=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outdoor/activity/FragmentManagement.java | 4 +- .../outdoor/activity/PictureActivity.java | 2 +- .../outdoor/adapter/FilterAdapter.java | 2 +- .../outdoor/adapter/PoiTaskAdapter.java | 8 +- .../fragment/ChargingPileFragment.java | 2 +- .../fragment/ChargingStationFragment.java | 6 + .../outdoor/fragment/HasSubmitFragment.java | 70 ++++-- .../navinfo/outdoor/fragment/PoiFragment.java | 8 +- .../outdoor/fragment/PoiTaskFragment.java | 38 +++- .../outdoor/fragment/StaySubmitFragment.java | 2 +- .../outdoor/fragment/TreasureFragment.java | 5 +- app/src/main/res/layout/activity_login.xml | 1 + .../main/res/layout/fragment_stay_submit.xml | 211 +++++++++--------- 13 files changed, 214 insertions(+), 145 deletions(-) diff --git a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java index 6d9a613..837fb43 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/FragmentManagement.java @@ -431,7 +431,9 @@ public class FragmentManagement extends BaseActivity { break; case 31://记录-已提交-任务列表的fragment if (poiTaskFragment == null) { - poiTaskFragment =PoiTaskFragment.newInstance(new Bundle()); + Bundle bundle = new Bundle(); + bundle.putInt("type",getIntent().getIntExtra("type",0)); + poiTaskFragment =PoiTaskFragment.newInstance(bundle); fragmentTransaction.add(R.id.frame_layout, poiTaskFragment); } else { fragmentTransaction.show(poiTaskFragment); diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java index aea8f7a..0511726 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PictureActivity.java @@ -306,7 +306,7 @@ public class PictureActivity extends BaseActivity implements View.OnClickListene if (timerTask!=null){ timerTask.cancel(); }else { - Toast.makeText(PictureActivity.this, "请先拍照", Toast.LENGTH_SHORT).show(); + // Toast.makeText(PictureActivity.this, "请先拍照", Toast.LENGTH_SHORT).show(); } } }); diff --git a/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java b/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java index ab1f193..e54ef7a 100644 --- a/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java +++ b/app/src/main/java/com/navinfo/outdoor/adapter/FilterAdapter.java @@ -54,7 +54,7 @@ public class FilterAdapter extends RecyclerView.Adapter adapterType, adapterScutcheon, adapterStake; private RelativeLayout rlPanorama, rlCoding, rlEquipment, rlFacility, rlUsable, rlAvailable, rlParking, rlNumber, rlScutcheon, rlDevice; diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java index 3a5afa0..f8af21a 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/ChargingStationFragment.java @@ -438,6 +438,11 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. private void initShowPoi() { // 添加信息： showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity"); + if (showPoiEntity.getTaskStatus()==1||showPoiEntity.getTaskStatus()==5){ + tvExamine.setVisibility(View.GONE); + }else { + tvExamine.setVisibility(View.VISIBLE); + } String name = showPoiEntity.getName();//名称 if (name != null && !name.equals("")) { editNameContent.setText(name + ""); @@ -455,6 +460,7 @@ public class ChargingStationFragment extends BaseDrawerFragment implements View. latLng.setLongitude(Double.parseDouble(x)); } initPhone(); + String describe = showPoiEntity.getMemo();//任务描述 if (describe != null && !describe.equals("")) { editDescribe.setText(describe); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java index bce3747..b7a442c 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/HasSubmitFragment.java @@ -115,9 +115,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onSuccess(HasSubmitBean hasSubmitBean, int id) { dismissLoadingDialog(); HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - otherAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); - otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); - otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + if (hasSubmitBeanBody!=null){ + otherAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); + otherAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); + otherAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); } @@ -146,9 +148,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onSuccess(HasSubmitBean hasSubmitBean, int id) { dismissLoadingDialog(); HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - chargingAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); - chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); - chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + if (hasSubmitBeanBody!=null){ + chargingAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); + chargingAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); + chargingAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); } @@ -177,9 +181,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onSuccess(HasSubmitBean hasSubmitBean, int id) { dismissLoadingDialog(); HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - roadAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); - roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); - roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + if (hasSubmitBeanBody!=null){ + roadAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); + roadAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); + roadAuditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); } @@ -208,9 +214,11 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onSuccess(HasSubmitBean hasSubmitBean, int id) { dismissLoadingDialog(); HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); - poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); - poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + if (hasSubmitBeanBody!=null){ + poiVideoAuditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); + poiVideoAuditThrough.setText(hasSubmitBeanBody.getPassCount()+""); + poiVideoAuditProcessauditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + } Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); } @@ -239,10 +247,13 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onSuccess(HasSubmitBean hasSubmitBean, int id) { dismissLoadingDialog(); HasSubmitBean.BodyBean hasSubmitBeanBody = hasSubmitBean.getBody(); - auditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); - auditThrough.setText(hasSubmitBeanBody.getPassCount()+""); - auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); - Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); + if (hasSubmitBeanBody!=null){ + auditProcess.setText(hasSubmitBeanBody.getAuditedCount()+""); + auditThrough.setText(hasSubmitBeanBody.getPassCount()+""); + auditNotThrough.setText(hasSubmitBeanBody.getNotPassCount()+""); + Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); + } + } @Override @@ -263,21 +274,34 @@ public class HasSubmitFragment extends BaseFragment implements View.OnClickListe public void onClick(View v) { switch (v.getId()) { case R.id.cl_poi: - Intent hasIntent = new Intent(getContext(), FragmentManagement.class); - hasIntent.putExtra("tag", 31); - startActivity(hasIntent); + Intent poiIntent = new Intent(getContext(), FragmentManagement.class); + poiIntent.putExtra("tag", 31); + poiIntent.putExtra("type", 1); + startActivity(poiIntent); break; case R.id.cl_road: - + Intent roadIntent = new Intent(getContext(), FragmentManagement.class); + roadIntent.putExtra("tag", 31); + roadIntent.putExtra("type", 4); + startActivity(roadIntent); break; case R.id.cl_charging: - + Intent chargingIntent = new Intent(getContext(), FragmentManagement.class); + chargingIntent.putExtra("tag", 31); + chargingIntent.putExtra("type", 2); + startActivity(chargingIntent); break; case R.id.cl_other: - + Intent otherIntent = new Intent(getContext(), FragmentManagement.class); + otherIntent.putExtra("tag", 31); + otherIntent.putExtra("type", 5); + startActivity(otherIntent); break; case R.id.cl_poiVideo: - + Intent poiVideoIntent = new Intent(getContext(), FragmentManagement.class); + poiVideoIntent.putExtra("tag", 31); + poiVideoIntent.putExtra("type", 3); + startActivity(poiVideoIntent); break; } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java index d572a73..9850128 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiFragment.java @@ -325,6 +325,11 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe private void initShowPoi() { // 添加信息： showPoiEntity = (PoiEntity) getArguments().getSerializable("poiEntity"); + if (showPoiEntity.getTaskStatus()==1||showPoiEntity.getTaskStatus()==5){ + tvExamine.setVisibility(View.GONE); + }else { + tvExamine.setVisibility(View.VISIBLE); + } String name = showPoiEntity.getName();//名称 if (name != null && !name.equals("")) { editNameContent.setText(name + ""); @@ -340,8 +345,8 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe latLng.setLatitude(Double.parseDouble(y)); latLng.setLongitude(Double.parseDouble(x)); } + //得到区号 initPhone(); - String memo = showPoiEntity.getMemo();//任务描述 if (memo != null && !memo.equals("")) { editDescribe.setText(memo + ""); @@ -452,6 +457,7 @@ public class PoiFragment extends BaseDrawerFragment implements View.OnClickListe dismissLoadingDialog(); if (getPhoneBean.getCode() == 200) { String code = getPhoneBean.getBody().getCode(); + // Toast.makeText(getActivity(), code+"", Toast.LENGTH_SHORT).show(); Constant.CODE = code; } } diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java index 6177512..ddf604b 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiTaskFragment.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import android.widget.Toast; import androidx.recyclerview.widget.DividerItemDecoration; @@ -24,13 +25,17 @@ import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.OkGoBuilder; import com.umeng.commonsdk.debug.D; +import java.util.List; + /** * 记录-已提交-poi任务列表 */ public class PoiTaskFragment extends BaseFragment implements View.OnClickListener { private ImageView ivPoiTaskFinish; private XRecyclerView poiTaskXrv; - + private int type; + private PoiTaskAdapter poiTaskAdapter; + private TextView tvTaskTitle; public static PoiTaskFragment newInstance(Bundle bundle) { PoiTaskFragment fragment = new PoiTaskFragment(); @@ -46,6 +51,24 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene @Override protected void initView() { super.initView(); + tvTaskTitle = findViewById(R.id.tv_poiTask_title); + switch (type){ + case 1: + tvTaskTitle.setText("POI任务列表"); + break; + case 2: + tvTaskTitle.setText("充电站任务列表"); + break; + case 3: + tvTaskTitle.setText("POIVIDEO任务列表"); + break; + case 4: + tvTaskTitle.setText("道路任务列表"); + break; + case 5: + tvTaskTitle.setText("其他任务列表"); + break; + } ivPoiTaskFinish = (ImageView) findViewById(R.id.iv_poiTask_finish); ivPoiTaskFinish.setOnClickListener(this::onClick); poiTaskXrv = (XRecyclerView) findViewById(R.id.poiTask_xrv); @@ -56,7 +79,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene //取消上拉加载，刷新功能。 poiTaskXrv.setPullRefreshEnabled(false); poiTaskXrv.setLoadingMoreEnabled(false); - PoiTaskAdapter poiTaskAdapter = new PoiTaskAdapter(getContext()); + poiTaskAdapter = new PoiTaskAdapter(getContext()); poiTaskXrv.setAdapter(poiTaskAdapter); poiTaskXrv.getDefaultFootView().setNoMoreHint("加载完毕"); @@ -76,10 +99,12 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene @Override protected void initData() { super.initData(); - // initWork(type); + type = getArguments().getInt("type", 0); + initWork(type); } private void initWork(int type) { + showLoadingDialog(); HttpParams httpParams = new HttpParams(); httpParams.put("type", type); httpParams.put("pageSize", "10"); @@ -94,9 +119,11 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene @Override public void onSuccess(HasSubmitBean hasSubmitBean, int id) { dismissLoadingDialog(); + List list = hasSubmitBean.getBody().getList(); + if (list!=null){ + poiTaskAdapter.setListBeans(list); + } - - Log.d("TAG", "onSuccess: " + hasSubmitBean.getBody() + ""); } @Override @@ -106,6 +133,7 @@ public class PoiTaskFragment extends BaseFragment implements View.OnClickListene Toast.makeText(getContext(), "请求失败", Toast.LENGTH_SHORT).show(); } }).build(); + dismissDialog(); } @Override diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java index 5a82a51..a086bbd 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/StaySubmitFragment.java @@ -203,7 +203,7 @@ public class StaySubmitFragment extends BaseFragment implements View.OnClickList @Override public boolean onClick(BaseDialog baseDialog, View v) { staySubmitAdapter.setAllCheckedDelete(); - staySubmitAdapter.notifyDataSetChanged(); + refreshData(); return false; } }); diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java index d09515b..7103825 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java @@ -896,7 +896,10 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen setMainButtonVisiable((Integer) data.obj); } else if (data.what == Constant.MAIN_HEADER) {// 控制主界面各个header View view = (View) data.obj; - initHeader(view); + if (view!=null){ + initHeader(view); + } + } else if (data.what == Constant.MAIN_REMOVE) {//// 控制主界面各个header移除 if ((boolean) data.obj) { dragView.removeAllViews(); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 4b1c5c9..b95c239 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -6,6 +6,7 @@ android:layout_height="match_parent" app:layout_heightPercent="100%" android:background="@drawable/bg" + tools:context="activity.LoginActivity"> - - - - - - - - - - - - - - - + android:layout_height="match_parent" + > + android:layout_height="70dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + - + + + + - - - - + android:orientation="vertical" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/cl_stay_type"> - + + + + + + + - + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ll_results"> -