diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index 7630eee..2abedc0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java @@ -1,11 +1,11 @@ package com.casic.dcms.adapter; -import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -15,8 +15,11 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.callback.IAddressListener; +import java.util.ArrayList; import java.util.List; public class RecordListAdapter extends RecyclerView.Adapter { @@ -71,20 +74,31 @@ private TextView workTimeView; private TextView toiletNameView; private TextView workerPositionView; - private TextView workerNameView; + private ImageView descriptionImageView; ItemViewHolder(@NonNull View itemView) { super(itemView); workTimeView = itemView.findViewById(R.id.workTimeView); toiletNameView = itemView.findViewById(R.id.toiletNameView); workerPositionView = itemView.findViewById(R.id.workerPositionView); - workerNameView = itemView.findViewById(R.id.workerNameView); + descriptionImageView = itemView.findViewById(R.id.descriptionImageView); } - @SuppressLint("SetTextI18n") void bindView(CleanRecordBean.DataBean.RowsBean rowsBean) { - toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知-" : rowsBean.getToiletName() + "-"); - workerNameView.setText(rowsBean.getUserName().equals("") ? "未知" : rowsBean.getUserName()); + toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知" : rowsBean.getToiletName()); + if (rowsBean.getPhoto().equals("")) { + descriptionImageView.setVisibility(View.GONE); + } else { + descriptionImageView.setVisibility(View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(rowsBean.getPhoto())); + descriptionImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + OtherUtils.showBigImage(context, 0, urls); + } + }); + } String lng = rowsBean.getLng(); if (TextUtils.isEmpty(lng)) { diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index 7630eee..2abedc0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java @@ -1,11 +1,11 @@ package com.casic.dcms.adapter; -import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -15,8 +15,11 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.callback.IAddressListener; +import java.util.ArrayList; import java.util.List; public class RecordListAdapter extends RecyclerView.Adapter { @@ -71,20 +74,31 @@ private TextView workTimeView; private TextView toiletNameView; private TextView workerPositionView; - private TextView workerNameView; + private ImageView descriptionImageView; ItemViewHolder(@NonNull View itemView) { super(itemView); workTimeView = itemView.findViewById(R.id.workTimeView); toiletNameView = itemView.findViewById(R.id.toiletNameView); workerPositionView = itemView.findViewById(R.id.workerPositionView); - workerNameView = itemView.findViewById(R.id.workerNameView); + descriptionImageView = itemView.findViewById(R.id.descriptionImageView); } - @SuppressLint("SetTextI18n") void bindView(CleanRecordBean.DataBean.RowsBean rowsBean) { - toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知-" : rowsBean.getToiletName() + "-"); - workerNameView.setText(rowsBean.getUserName().equals("") ? "未知" : rowsBean.getUserName()); + toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知" : rowsBean.getToiletName()); + if (rowsBean.getPhoto().equals("")) { + descriptionImageView.setVisibility(View.GONE); + } else { + descriptionImageView.setVisibility(View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(rowsBean.getPhoto())); + descriptionImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + OtherUtils.showBigImage(context, 0, urls); + } + }); + } String lng = rowsBean.getLng(); if (TextUtils.isEmpty(lng)) { diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index aa9fa10..cae17df 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -150,8 +150,8 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 0) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); + //部件点图层 (ID: 2) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().add(pointLayer); diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index 7630eee..2abedc0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java @@ -1,11 +1,11 @@ package com.casic.dcms.adapter; -import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -15,8 +15,11 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.callback.IAddressListener; +import java.util.ArrayList; import java.util.List; public class RecordListAdapter extends RecyclerView.Adapter { @@ -71,20 +74,31 @@ private TextView workTimeView; private TextView toiletNameView; private TextView workerPositionView; - private TextView workerNameView; + private ImageView descriptionImageView; ItemViewHolder(@NonNull View itemView) { super(itemView); workTimeView = itemView.findViewById(R.id.workTimeView); toiletNameView = itemView.findViewById(R.id.toiletNameView); workerPositionView = itemView.findViewById(R.id.workerPositionView); - workerNameView = itemView.findViewById(R.id.workerNameView); + descriptionImageView = itemView.findViewById(R.id.descriptionImageView); } - @SuppressLint("SetTextI18n") void bindView(CleanRecordBean.DataBean.RowsBean rowsBean) { - toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知-" : rowsBean.getToiletName() + "-"); - workerNameView.setText(rowsBean.getUserName().equals("") ? "未知" : rowsBean.getUserName()); + toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知" : rowsBean.getToiletName()); + if (rowsBean.getPhoto().equals("")) { + descriptionImageView.setVisibility(View.GONE); + } else { + descriptionImageView.setVisibility(View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(rowsBean.getPhoto())); + descriptionImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + OtherUtils.showBigImage(context, 0, urls); + } + }); + } String lng = rowsBean.getLng(); if (TextUtils.isEmpty(lng)) { diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index aa9fa10..cae17df 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -150,8 +150,8 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 0) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); + //部件点图层 (ID: 2) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().add(pointLayer); diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index d371d17..da49f36 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -203,8 +203,6 @@ return; } intent.putExtra("lat", Double.parseDouble(dataLat)); -// intent.putExtra("lng", Constant.DEFAULT_LNG); -// intent.putExtra("lat", Constant.DEFAULT_LAT); resultActivity.startActivity(intent); } }); diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index 7630eee..2abedc0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java @@ -1,11 +1,11 @@ package com.casic.dcms.adapter; -import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -15,8 +15,11 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.callback.IAddressListener; +import java.util.ArrayList; import java.util.List; public class RecordListAdapter extends RecyclerView.Adapter { @@ -71,20 +74,31 @@ private TextView workTimeView; private TextView toiletNameView; private TextView workerPositionView; - private TextView workerNameView; + private ImageView descriptionImageView; ItemViewHolder(@NonNull View itemView) { super(itemView); workTimeView = itemView.findViewById(R.id.workTimeView); toiletNameView = itemView.findViewById(R.id.toiletNameView); workerPositionView = itemView.findViewById(R.id.workerPositionView); - workerNameView = itemView.findViewById(R.id.workerNameView); + descriptionImageView = itemView.findViewById(R.id.descriptionImageView); } - @SuppressLint("SetTextI18n") void bindView(CleanRecordBean.DataBean.RowsBean rowsBean) { - toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知-" : rowsBean.getToiletName() + "-"); - workerNameView.setText(rowsBean.getUserName().equals("") ? "未知" : rowsBean.getUserName()); + toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知" : rowsBean.getToiletName()); + if (rowsBean.getPhoto().equals("")) { + descriptionImageView.setVisibility(View.GONE); + } else { + descriptionImageView.setVisibility(View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(rowsBean.getPhoto())); + descriptionImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + OtherUtils.showBigImage(context, 0, urls); + } + }); + } String lng = rowsBean.getLng(); if (TextUtils.isEmpty(lng)) { diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index aa9fa10..cae17df 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -150,8 +150,8 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 0) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); + //部件点图层 (ID: 2) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().add(pointLayer); diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index d371d17..da49f36 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -203,8 +203,6 @@ return; } intent.putExtra("lat", Double.parseDouble(dataLat)); -// intent.putExtra("lng", Constant.DEFAULT_LNG); -// intent.putExtra("lat", Constant.DEFAULT_LAT); resultActivity.startActivity(intent); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7c58e30..979c6cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -384,10 +384,7 @@ showPictureView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(context, BigImageActivity.class); - intent.putExtra("index", 0); - intent.putStringArrayListExtra("images", urls); - startActivity(intent); + OtherUtils.showBigImage(context, 0, urls); } }); } diff --git a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java index 7630eee..2abedc0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/RecordListAdapter.java @@ -1,11 +1,11 @@ package com.casic.dcms.adapter; -import android.annotation.SuppressLint; import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; @@ -15,8 +15,11 @@ import com.casic.dcms.R; import com.casic.dcms.bean.CleanRecordBean; import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.OtherUtils; +import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.callback.IAddressListener; +import java.util.ArrayList; import java.util.List; public class RecordListAdapter extends RecyclerView.Adapter { @@ -71,20 +74,31 @@ private TextView workTimeView; private TextView toiletNameView; private TextView workerPositionView; - private TextView workerNameView; + private ImageView descriptionImageView; ItemViewHolder(@NonNull View itemView) { super(itemView); workTimeView = itemView.findViewById(R.id.workTimeView); toiletNameView = itemView.findViewById(R.id.toiletNameView); workerPositionView = itemView.findViewById(R.id.workerPositionView); - workerNameView = itemView.findViewById(R.id.workerNameView); + descriptionImageView = itemView.findViewById(R.id.descriptionImageView); } - @SuppressLint("SetTextI18n") void bindView(CleanRecordBean.DataBean.RowsBean rowsBean) { - toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知-" : rowsBean.getToiletName() + "-"); - workerNameView.setText(rowsBean.getUserName().equals("") ? "未知" : rowsBean.getUserName()); + toiletNameView.setText(rowsBean.getToiletName().equals("") ? "未知" : rowsBean.getToiletName()); + if (rowsBean.getPhoto().equals("")) { + descriptionImageView.setVisibility(View.GONE); + } else { + descriptionImageView.setVisibility(View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(rowsBean.getPhoto())); + descriptionImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + OtherUtils.showBigImage(context, 0, urls); + } + }); + } String lng = rowsBean.getLng(); if (TextUtils.isEmpty(lng)) { diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index aa9fa10..cae17df 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -150,8 +150,8 @@ * */ switch (caseType) { case "部件": - //部件点图层 (ID: 0) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); + //部件点图层 (ID: 2) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/2"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().add(pointLayer); diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index d371d17..da49f36 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -203,8 +203,6 @@ return; } intent.putExtra("lat", Double.parseDouble(dataLat)); -// intent.putExtra("lng", Constant.DEFAULT_LNG); -// intent.putExtra("lat", Constant.DEFAULT_LAT); resultActivity.startActivity(intent); } }); diff --git a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java index 7c58e30..979c6cb 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -384,10 +384,7 @@ showPictureView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(context, BigImageActivity.class); - intent.putExtra("index", 0); - intent.putStringArrayListExtra("images", urls); - startActivity(intent); + OtherUtils.showBigImage(context, 0, urls); } }); } diff --git a/app/src/main/res/layout/item_record_recycleview.xml b/app/src/main/res/layout/item_record_recycleview.xml index c6ed343..1d2de39 100644 --- a/app/src/main/res/layout/item_record_recycleview.xml +++ b/app/src/main/res/layout/item_record_recycleview.xml @@ -4,32 +4,37 @@ android:layout_height="wrap_content" android:padding="@dimen/padding_10dp"> - + android:layout_height="wrap_content"> - + + + + \ No newline at end of file